moodle/moodle
3
0
Fork 0
mirror of https://github.com/moodle/moodle.git synced 2025-08-06 17:36:38 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions
54435 commits 37 branches 540 tags 1.3 GiB
Commit graph

54435 commits

This branch
This branch
All branches
Author SHA1 Message Date
Dan Poltawski
c1ac8fa189 Merge branch 'MDL-33821-master-1' of git://git.luns.net.uk/moodle 2012-06-19 13:27:07 +08:00
Dan Poltawski
a2e6088c7f MDL-33469 repository_picasa: oops, wrong pluginname in string 2012-06-19 11:56:45 +08:00
Eloy Lafuente (stronk7)
f18ad1b781 Merge branch 'MDL-33523_master' of git://github.com/dmiletic/moodle 2012-06-19 03:09:30 +02:00
Eloy Lafuente (stronk7)
926b08ca4b Merge branch 'MDL-33623' of git://github.com/danpoltawski/moodle 2012-06-19 03:05:52 +02:00
Eloy Lafuente (stronk7)
25c94edb27 Merge branch 'MDL-33469' of git://github.com/danpoltawski/moodle 2012-06-19 03:01:30 +02:00
Eloy Lafuente (stronk7)
f98973c2ff Merge branch 'MDL-33294' of git://github.com/danpoltawski/moodle 2012-06-19 02:59:46 +02:00
Eloy Lafuente (stronk7)
f2904fe243 Merge branch 'MDL-33724' of git://github.com/danpoltawski/moodle 2012-06-19 02:56:19 +02:00
Eloy Lafuente (stronk7)
e165512d3a Merge branch 'MDL-33778' of git://github.com/timhunt/moodle 2012-06-19 00:54:39 +02:00
Andrew Robert Nicols
48e6de1c34 MDL-33821 Fix SQL syntax for recent glossary activity 2012-06-18 16:02:02 +01:00
Tim Hunt
72f2e13d04 MDL-33778 quiz statistics: part and class ids can be strings, not just ints. 2012-06-18 14:39:21 +01:00
Dan Poltawski
07384ecc8b Merge branch 'MDL-33818' of git://github.com/timhunt/moodle 2012-06-18 21:33:26 +08:00
Tim Hunt
584ae11a52 MDL-33818 quiz restore: quiz_attempt.state not restoring old MBZ 
This field was new in 2.3, so we need to set it when restoring backups
from 2.2 or before, using the same logic as in upgrade.
 2012-06-18 14:09:06 +01:00
Eloy Lafuente (stronk7)
e04a0e32c7 Merge branch 'MDL-33552' of git://github.com/danpoltawski/moodle 2012-06-18 12:31:37 +02:00
Dan Poltawski
6855fec7fd Merge branch 'MDL-33136_dndfilemanager_replace_file' of git://github.com/davosmith/moodle 2012-06-18 17:36:03 +08:00
Aparup Banerjee
44b836d629 Merge branch 'MDL-33175' of git://github.com/danpoltawski/moodle 2012-06-18 17:14:11 +08:00
Eloy Lafuente (stronk7)
f4a9bf65da Moodle release 2.3beta 2012-06-18 10:36:52 +02:00
Eloy Lafuente (stronk7)
b18066df83 Merge branch 'install_master' of git://github.com/amosbot/moodle 2012-06-18 10:29:12 +02:00
Dan Poltawski
3248a1e1e4 Merge branch 'MDL-33794' of git://github.com/stronk7/moodle 
Conflicts:
	mod/assign/version.php
 2012-06-18 16:08:39 +08:00
Aparup Banerjee
341d989d63 Merge branch 'MDL-30337_no_risk' of git://github.com/nebgor/moodle 2012-06-18 16:03:08 +08:00
Aparup Banerjee
751fe70671 MDL-30337 theme : cleanup after conflict. 2012-06-18 16:02:34 +08:00
Davo Smith
b8a22d22fe MDL-33136 Dndupload filemanager - moved 'overwrite all' and 'rename all' buttons onto new line 2012-06-18 08:56:39 +01:00
Davo Smith
d0b2d44528 MDL-33136 Dndupload filemanager - user asked to rename/overwrite file when droping file with existing name 2012-06-18 08:55:41 +01:00
Dan Poltawski
f715dc3fd5 Merge branch 'MDL-33573-master-1' of git://git.luns.net.uk/moodle 2012-06-18 15:35:05 +08:00
Dan Poltawski
e73c1cafa1 Merge branch 'MDL-33775-master-integration' of git://github.com/FMCorz/moodle 2012-06-18 15:18:02 +08:00
Frederic Massart
a41b1d96b6 MDL-33775 Course: fix redirect to course/section in paged mode 2012-06-18 15:10:33 +08:00
Dan Poltawski
584c219edf Merge branch 'wip-MDL-33603-master-v2' of git://github.com/abgreeve/moodle 2012-06-18 15:07:10 +08:00
Dan Poltawski
f418c54875 Merge branch 'wip-mdl-33607' of git://github.com/rajeshtaneja/moodle 2012-06-18 14:34:35 +08:00
Dan Poltawski
2b5f4dbbca Merge branch 'MDL-33699' of git://github.com/netspotau/moodle-mod_assign 2012-06-18 13:49:16 +08:00
Dan Poltawski
1eab24d1a4 Merge branch 'MDL-33779' of git://github.com/timhunt/moodle 2012-06-18 13:43:36 +08:00
Dan Poltawski
53db3251da Merge branch 'MDL-33793' of git://github.com/netspotau/moodle-mod_assign 2012-06-18 13:28:07 +08:00
Dan Poltawski
728aee9767 Merge branch 'MDL-33697' of git://github.com/netspotau/moodle-mod_assign 2012-06-18 13:12:56 +08:00
Dan Poltawski
8a7b0be111 Merge branch 'MDL-33327-2' of git://github.com/netspotau/moodle-mod_assign 2012-06-18 12:17:49 +08:00
Nadav Kavalerchik
6abbcf194e MDL - RTL Theme fixes for Moodle 2 (theme/canvas) 
Right align Forms in Report pages (when in RTL mode)
 2012-06-18 11:34:51 +08:00
Nadav Kavalerchik
409c12f21a MDL-32479 - RTL Theme fixes for Moodle 2 (theme/base) 
Right align Fields in forms (when in RTL mode)

Conflicts:

	theme/base/style/course.css
 2012-06-18 11:31:33 +08:00
Dan Poltawski
8b5039361a MDL-33469 google plugins - string update 
Improved strings to try and ensure maximum support for users during
upgrade.
 2012-06-18 11:28:27 +08:00
Nadav Kavalerchik
0a1617e23f MDL-32479 - RTL Theme fixes for Moodle 2 (theme/base) 
Right align item's content (when viewing a Glossary activity in RTL mode)

Conflicts:

	mod/glossary/styles.css
 2012-06-18 11:26:07 +08:00
Nadav Kavalerchik
4d488c25b6 MDL-32479 - RTL Theme fixes for Moodle 2 (theme/base) 
Right align content (when viewing a Lesson activity in RTL mode)
 2012-06-18 11:24:50 +08:00
Nadav Kavalerchik
d180d19a83 MDL-32479 - RTL Theme fixes for Moodle 2 (theme/base) 
Support for blocks columns switch when in rtl mode:
theme/base/layout/frontpage.php
theme/base/layout/general.php

Right align course completion checkbox to the right side of the activities and resources, when in RTL mode
theme/base/style/course.css

Right align DOCK bar, when in RTL mode
theme/base/style/dock.css

First-name and Last-name Initials (filter) bar (on every users list) letters spacing (usability issue, NOT RTL issue)
theme/base/style/core.css

Conflicts:

	theme/base/style/core.css
	theme/base/style/course.css
 2012-06-18 11:24:04 +08:00
Adrian Greeve
db79db63ed MDL-33603 - data - added another sql query to allow links to records to work. 2012-06-18 10:21:38 +08:00
Rajesh Taneja
6947c57a06 MDl-33607 wiki-2: check subwiki before fetching it from db 2012-06-18 10:20:29 +08:00
Eloy Lafuente (stronk7)
c5e783e512 MDL-33794 version.php: Bump all versions, requires and dependencies to 2012061700 2012-06-18 02:37:00 +02:00
Eloy Lafuente (stronk7)
798c9100d8 MDL-33794 assign: fix some incorrect function names 2012-06-18 02:17:03 +02:00
Eloy Lafuente (stronk7)
130aed6e7e MDL-33794 version.php: Fix some missing bits before bump. 2012-06-17 19:29:44 +02:00
Damyon Wiese
8b2cfdc1c6 MDL-33793: Add conditions to the assignment upgrade code to prevent overwriting grade items. 2012-06-17 22:41:59 +08:00
Dan Poltawski
15ea1c9105 MDL-33294 - block_blog_recent: fix E_STRICT error 
Default object from empty value
 2012-06-16 12:46:07 +08:00
Dan Poltawski
7f3b68a892 MDL-33294 - block_blog_tags: fix E_STRICT error 
Default object from empty value
 2012-06-16 12:45:41 +08:00
AMOS bot
0187c8637c Automatically generated installer lang files 2012-06-16 00:31:27 +00:00
Eloy Lafuente (stronk7)
85c4758c5a on-demand release 2.3dev 2012-06-15 20:29:04 +02:00
Eloy Lafuente (stronk7)
a4b9f21e45 MDL-27156 maxfilesize: Comment out new cap use + return -1 as temp fix 
With the capability check and the return -1 commented
it has been checked here that it's possible to upload
and pick from filesystem repository files normally, so
I'm introducing this temp commit to allow people to
use those repos "normallly" until a proper fix arrives
supporting the new cap.
 2012-06-15 20:05:46 +02:00
Tim Hunt
ba6425ab3d MDL-33779 question: code clean-up 2012-06-15 14:02:15 +01:00