Commit graph

64929 commits

Author SHA1 Message Date
Marina Glancy
d61d3163af MDL-42318 coursecat: show correct courses count
courses count should exclude courses that are not visible to the current user
2013-10-29 10:26:56 +11:00
Marina Glancy
9d88b492b1 MDL-42318 coursecat: do not allow to sort if there are invisible children 2013-10-29 10:26:56 +11:00
Matteo Scaramuccia
bc242bbda5 MDL-39810 Files: IE doesn't recognize JSON MIME Type (RFC4627).
Affected versions:
- IE 8+, under Compatibility View.
2013-10-28 23:34:35 +01:00
Rajesh Taneja
e21ae3ebdc MDL-42281 Behat: Automated test for MDLQA-510
MDLQA-510: A teacher can set grade conditions to restrict availability
of an activity
2013-10-28 16:48:19 +08:00
Rajesh Taneja
abedc1a84c MDL-42556 Events: passing modified user info to user_deleted event
Deleting user modifies few fields and leave rest as un-modified
So passing modified data to event, to keep it small
2013-10-28 16:37:56 +08:00
Dan Poltawski
4daa024fd4 Merge branch 'MDL-22669-master' of git://github.com/FMCorz/moodle 2013-10-28 16:31:17 +08:00
Rajesh Taneja
0d22c24829 MDL-42557 Events: added idnumber to course_deleted event data 2013-10-28 16:16:25 +08:00
Ankit Agarwal
a48dcbf604 MDL-42574 blocks: Fix strict standards warning in community block 2013-10-28 15:41:29 +08:00
Dan Poltawski
b1a6c9dc52 Merge branch 'wip-mdl-41811' of git://github.com/rajeshtaneja/moodle
Conflicts:
	login/change_password.php
2013-10-28 15:37:05 +08:00
Dan Poltawski
10ac20830b Merge branch 'wip-mdl-42283' of git://github.com/rajeshtaneja/moodle 2013-10-28 14:53:21 +08:00
Frederic Massart
be99db5b96 MDL-22669 course: Display section number for orphaned activities 2013-10-28 14:44:08 +08:00
Dan Poltawski
ff1ec8b50f Merge branch 'MDL-42285-master' of git://github.com/phalacee/moodle 2013-10-28 14:15:27 +08:00
Marina Glancy
5ea6d66e9f Merge branch 'MDL-42028-master-4' of git://github.com/mouneyrac/moodle 2013-10-28 16:56:45 +11:00
Jerome Mouneyrac
aa3e4bdec7 MDL-42028 EditPDF: replace the loading icon by a progress bar 2013-10-28 13:48:22 +08:00
Rajesh Taneja
726a3be81a MDL-42557 Events: Removed timemodified hack from course_deleted event 2013-10-28 13:01:14 +08:00
Damyon Wiese
9a84376d4b Merge branch 'w44_MDL-42110_m26_addoninstaller' of https://github.com/skodak/moodle 2013-10-28 12:39:30 +08:00
Dan Poltawski
f76bd72234 Merge branch 'MDL-38419' of https://github.com/moodlerooms/moodle 2013-10-28 12:33:39 +08:00
Mark Nelson
5311f38215 MDL-35146 mod_wiki: fixed variable typo and altered code to conform to Moodle guidelines 2013-10-28 12:28:03 +08:00
Anton Fletcher
19b2d3fa9c MDL-35146 mod_wiki: fixed issue where pages for deleted groups caused an error on restore 2013-10-28 12:28:03 +08:00
Damyon Wiese
3a33578926 Merge branch 'wip-mdl-30812' of git://github.com/rajeshtaneja/moodle 2013-10-28 12:11:34 +08:00
Ankit Agarwal
a993b0b93a MDL-42558 events: Enrollment actions are administration not teaching 2013-10-28 11:51:39 +08:00
Dan Poltawski
bdbca0949f Merge branch 'MDL-42538_master' of git://github.com/dmonllao/moodle 2013-10-28 11:35:54 +08:00
Dan Poltawski
96d0198b8a Merge branch 'wip-mdl-42491-master' of git://github.com/deraadt/moodle 2013-10-28 11:21:26 +08:00
Dan Poltawski
4baf482daa Merge branch 'MDL-41504-master' of git://github.com/andrewnicols/moodle 2013-10-28 11:10:43 +08:00
Andrew Nicols
79ad49af63 MDL-41504 Theme: Remove duplicate width/height which seems to cause issues for WebKit 2013-10-28 11:07:37 +08:00
Andrew Nicols
3fcf3d2e78 MDL-41504 ActionMenu: Adjust position of icons 2013-10-28 11:06:51 +08:00
Andrew Nicols
a65a8f2535 MDL-41504 ActionMenu: Fix block icon sizes 2013-10-28 11:06:51 +08:00
Andrew Nicols
3148fdf0f5 MDL-41504 actionmenu: Only show course actionmenu if enabled 2013-10-28 11:06:51 +08:00
Andrew Nicols
1ecde7e2ac MDL-41504 ActionMenu: Only modify margins if an actionmenu is in use 2013-10-28 11:06:51 +08:00
Sam Hemelryk
ee2d09e430 MDL-41504 course: fixed action icon spacing with JS disabled 2013-10-28 11:06:50 +08:00
Sam Hemelryk
a4f01fe443 MDL-41504 completion: fixed display of completion icon
This entailed applying a right spacing to the action menu on
the standard theme to accomodate the completion icon when it
is present.
On the clean them I had to apply a trick. The completion icon
is floated right however no other content is floated.
To ensure the completion icon moved in relation to the action
menu I had to reduce its container size to 0 and rely on
natural overflow. I had to counter this my applying spacing
to the activity container in order to accommodate the actual
size of the icon.
2013-10-28 11:06:49 +08:00
Rajesh Taneja
045d913d11 MDL-42560 Events: Removed use of role->name
role->name is usually empty or localized, so should not be used in events
2013-10-28 11:06:47 +08:00
Prateek Sachan
3266d14bbe MDL-38850: Fixed Horizontal bar issue in lesson 2013-10-28 11:03:17 +08:00
Damyon Wiese
042e6a47fd Merge branch 'MDL-42481-master' of git://github.com/andrewnicols/moodle 2013-10-28 10:52:41 +08:00
Dan Poltawski
92fbc0de26 Merge branch 'MDL-42534-master-int' of git://github.com/FMCorz/moodle 2013-10-28 10:51:44 +08:00
Dan Poltawski
c713639b65 Merge branch 'MDL-42511-master' of git://github.com/FMCorz/moodle 2013-10-28 10:43:07 +08:00
Frederic Massart
fe1361fc9c MDL-42511 portfolio: Debugging from deprecated function in cron 2013-10-28 10:28:10 +08:00
Ankit Agarwal
932f54e996 MDL-42489 backup: use correct exception class in automated backups 2013-10-28 09:58:56 +08:00
Adrian Greeve
222e0a0045 MDL-42379 behat: Automated test for approving and disapproving glossary entries.
Automate MDLQA-34 - A teacher can set that glossary entries require approval before being viewable be everyone.
2013-10-28 09:29:37 +08:00
Adrian Greeve
c00252fbed MDL-40683 administration: Include alternate name fields in CSV user import.
Removal of firstname and lastname from STD_FIELDS
2013-10-28 09:14:44 +08:00
Adrian Greeve
6f4ece9f57 MDL-40683 libraries: Include alternate name fields in CSV user import. 2013-10-28 09:08:48 +08:00
AMOS bot
0ba69bc1f6 Automatically generated installer lang files 2013-10-28 00:46:40 +00:00
Petr Škoda
6ec361c6bc MDL-42485 add session lock acquire timeout to memcached session driver
Credit goes to Eric Merrill, thanks!
2013-10-27 16:05:12 +01:00
Eloy Lafuente (stronk7)
714c4119cd MDL-42551 timezone info: updated to 2013h 2013-10-26 17:14:09 +02:00
Andrew Davis
0bc72fcda6 MDL-42284 core_message: adding behat tests for viewing message history MDLQA-135 2013-10-26 17:27:55 +07:00
Marina Glancy
c24b3f66f1 MDL-42400 generator: unittest for module generator 2013-10-26 14:00:27 +11:00
Marina Glancy
3bbbb3c902 MDL-42400 mod_workshop: data generator for workshop 2013-10-26 14:00:27 +11:00
Marina Glancy
20dff4b97e MDL-42400 mod_wiki: data generator for wiki 2013-10-26 14:00:27 +11:00
Marina Glancy
7b22ba41b7 MDL-42400 mod_url: data generator for url 2013-10-26 14:00:26 +11:00
Marina Glancy
e426f55059 MDL-42400 mod_survey: data generator for survey 2013-10-26 14:00:26 +11:00