319d937602
Revert "Merge branch 'wip-MDL-31750-master' of git://github.com/abgreeve/moodle"
...
This reverts commit 8361f557a12b9e957a27fae51910bf
2013-01-10 11:17:33 +08:00
8361f557a1
Merge branch 'wip-MDL-31750-master' of git://github.com/abgreeve/moodle
...
Conflicts:
course/tests/courselib_test.php
2013-01-09 01:31:50 +01:00
f44e7d0a77
Merge branch 'MDL-36357' of git://github.com/danpoltawski/moodle
...
Conflicts:
user/view.php
2013-01-09 09:34:22 +13:00
fd1d829500
MDL-35991 - use PARAM_LOCALURL for local urls
2013-01-07 10:09:20 +08:00
f27cbf0790
Merge branch 'MDL-35887_dnd_completion' of git://github.com/davosmith/moodle
2013-01-07 11:06:41 +13:00
1b5c5e5788
Merge branch 'wip-MDL-37290-m25' of git://github.com/samhemelryk/moodle
2012-12-24 10:54:51 +08:00
3330e65354
MDL-37290 course: fixed up navbar when editing categories
2012-12-24 13:05:56 +13:00
486c53f25c
Merge branch 'wip-mdl-37015' of git://github.com/rajeshtaneja/moodle
2012-12-24 10:55:31 +13:00
e5ad278a94
MDL-37015 Resource: link in onclick should not contain html special char
2012-12-20 10:21:36 +08:00
c7e61fba0a
MDL-35887 course dndupload - correct default used for completion tracking when resources created by drag and drop
2012-12-18 20:46:26 +00:00
22898af76f
MDL-36259 - change case of table alias to match definition
2012-12-18 14:27:46 +08:00
3ab43c0502
Merge branch 'MDL-36259' of git://github.com/timhunt/moodle
2012-12-18 14:25:52 +08:00
3280819b20
Merge branch 'MDL-30899_master' of git://github.com/dmonllao/moodle
2012-12-18 09:10:42 +08:00
7039c823dc
Merge branch 'w50_MDL-37171_m25_outdatedexcel' of git://github.com/skodak/moodle
2012-12-18 00:13:45 +01:00
c8d1e4aa8c
MDL-35056 - Backup/Restore - Converting the 'Unmet Dependencies' Message to be a Developer Debug message to make moodle less confusing to the average user
2012-12-18 09:58:53 +13:00
8ca70aff14
Merge branch 'wip-mdl-36736' of git://github.com/rajeshtaneja/moodle
2012-12-17 12:08:57 +08:00
6a1273cbc7
MDL-25928 course: Fixed course info on the combo list to be a popup
2012-12-17 16:03:06 +13:00
75427a824c
MDL-37171 fix multiple spreadsheet related PHP4isms
2012-12-15 12:36:40 +01:00
31f4086460
MDL-36259 course short names: ensure it displays when enabled in admin
...
Fixed 5 Moodle pages that does not display the course short name even if "Display extended course names" setting is on. In fixing this, search.php also included related minor code to change to minimise DB calls to improve performance.
2012-12-15 10:44:34 +00:00
4cc8e8cbb1
Merge branch 'MDL-34791-master' of git://git.luns.net.uk/moodle
2012-12-11 13:22:42 +08:00
358414748c
Merge branch 'MDL-36808-master' of git://github.com/sammarshallou/moodle
2012-12-11 12:18:12 +08:00
595282dfcc
Merge branch 'wip-MDL-35884-master' of git://github.com/phalacee/moodle
2012-12-11 11:17:29 +08:00
a71d9a9414
MDL-34791 AJAX Update a graded activity's title in the gradebook on rename
2012-12-10 14:14:28 +00:00
845774bf33
Merge branch 'MDL-30961-master' of git://github.com/mouneyrac/moodle
2012-12-10 14:59:42 +13:00
e893c6d442
MDL-36607: Improve block drag and drop
...
* Adding support for subpage
* Adding support for regions that do not start with "side-"
2012-12-10 14:12:57 +13:00
a429049ce5
Merge branch 'MDL-36778' of git://github.com/danpoltawski/moodle
2012-12-10 11:51:38 +13:00
533469cba4
Merge branch 'MDL-36640-master' of git://git.luns.net.uk/moodle
2012-12-10 11:42:57 +13:00
e275e8c3cd
MDL-36918 Decode HTML entities on ajax update title
2012-12-10 11:15:50 +13:00
ceb3551726
MDL-35884 - Course - Remove text from ALT attribute for activity chooser
2012-12-07 13:50:08 +08:00
7d1c3abe88
Merge branch 'MDL-36883-master' of git://github.com/FMCorz/moodle
2012-12-03 14:08:25 +08:00
11d819364e
MDL-30961 get_course_contents: returned activity name should not be check against PARAM_TEXT, it could be anything
2012-11-30 14:22:16 +08:00
7b48acebaf
MDL-36778 course - prevent undefined index warnings
...
When logged in as a guest the mform didn't set userid.
2012-11-30 12:27:09 +08:00
663dbbc2e6
MDL-36933 Bump everything to 2012112900
...
(versions, requires and dependencies)
2012-11-30 03:30:09 +01:00
eacc63ab57
MDL-36883 course: Fixed HTML differences with drag & drop
2012-11-29 11:14:05 +08:00
ad47d02595
MDL-36878 course: fixed issue with module metadata cache
...
Credit goes to Sam Chaffee.
2012-11-29 12:56:55 +13:00
da6076f1cc
MDL-36808 Completion: Incorrect escaping for activity name in completion tickbox
2012-11-27 13:00:59 +00:00
4bcbdb3e88
MDL-30899 moodle-core-notification Adding close button title for accessibility
2012-11-27 14:41:42 +08:00
736a655135
MDL-36302 course: Set correct URL on settings page for navigation.
2012-11-27 14:02:39 +08:00
981f72be5e
Merge branch 'MDL-36623-master-int' of git://github.com/FMCorz/moodle
2012-11-27 10:40:24 +08:00
2c59d2ca8c
Merge branch 'MDL-36550-master' of git://github.com/FMCorz/moodle
2012-11-27 10:36:59 +08:00
a28e3a6007
Merge branch 'wip-MDL-36795-master' of git://github.com/abgreeve/moodle
2012-11-27 11:22:08 +13:00
e40bd74620
MDL-36550 usability: CSS updates on course page
2012-11-26 17:00:29 +08:00
341bfedf90
MDL-36795 - lib / administration: maxsections now limits the default setting for numsections.
...
In the default course settings, setting the maximum number topics / weeks to 0 would not
change the default number of sections on the same page as any other number would.
A more appropriate check has been put in place.
This also incorporates a fix for MDL-28584. The course edit screen now also checks to see
if maxsections is set or numeric. If it is not set or numeric then it defaults to 52.
2012-11-26 14:41:50 +08:00
4d9e8469e1
Merge branch 'MDL-35569-master' of git://git.luns.net.uk/moodle
2012-11-26 14:46:25 +13:00
93e490613e
Merge branch 'MDL-36763-master' of git://git.luns.net.uk/moodle
2012-11-26 11:42:28 +13:00
120d7ed3c1
MDL-36763 Remove onclick event when creating activity left indent link
...
The left indent onclick is now handled by a Y.delegate so there is no need
for a seperate event handler.
2012-11-22 10:47:51 +00:00
65edd8ad6d
MDL-36623 usability: CSS adjustments for new course and courses access icons
2012-11-22 17:26:09 +08:00
588b94ac65
MDL-36736 course: Availability information should not be visible for hidden modules
...
If user is viewing hidden module, availability information should only be visible to
user when editing and module is visible. If editing and module is hidden, then hide
availablilty information as it's invalid.
When user is not editing and activity is hidden then don't add availability information.
2012-11-22 15:11:26 +08:00
7b4737de26
MDL-36736 course: Availability information will use hide class for hidding
2012-11-22 15:11:25 +08:00
7266bd3e59
MDL-35569 AJAX Move auto-submitting selects to separate YUI module
2012-11-21 08:23:01 +00:00
Dan Poltawski