Eloy Lafuente (stronk7)
94dc3c7d1e
MDL-24419 (5): Coding style cleanup
2012-05-17 00:51:50 +02:00
Eloy Lafuente (stronk7)
dd420abadf
Merge branch 'MDL-24419-master' of git://github.com/sammarshallou/moodle
...
Conflicts:
lib/db/upgrade.php
lib/phpunit/lib.php
version.php
Fixed:
lib/db/upgrade.php - duplicate course->sectioncache add code
lib/db/install.xml - cleanup needed because xmldb editor was not used
lib/phpunit/classes/util.php - cleanup $GROUPLIB_CACHE on test reset
2012-05-16 23:53:47 +02:00
Eloy Lafuente (stronk7)
0c408f5a3d
NOBUG: Minibump to get latest WS installed
2012-05-16 16:28:59 +02:00
Eloy Lafuente (stronk7)
ea01d3c601
Merge branch 'MDL-32233-core_course_duplicate_course-usersdata' of git://github.com/jleyva/moodle
2012-05-16 16:23:00 +02:00
Juan Leyva
d7f465d497
MDL-32233 core_course_duplicate_course: Forcing backup and restore in MODE_SAMESITE always as suggested by Eloy.
2012-05-16 16:10:47 +02:00
Juan Leyva
6c7d3e3100
MDL-32233 core_course_duplicate_course: Fixed integrator review details described here http://tracker.moodle.org/browse/MDL-32233?focusedCommentId=157707&page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel#comment-157707
2012-05-16 12:10:09 +02:00
Eloy Lafuente (stronk7)
6b4769bc8b
Merge branch 'MDL-32662-core_course_groups_xxx_groupings' of git://github.com/jleyva/moodle
2012-05-16 11:41:48 +02:00
Juan Leyva
2c8ad38eff
MDL-32662 core_group_xxx_groupings: Fixed integrator review potential problem detected in update_groupings. More info: http://tracker.moodle.org/browse/MDL-32662?focusedCommentId=157706&page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel#comment-157706
2012-05-16 10:45:40 +02:00
Aparup Banerjee
485e67982c
Merge branch 'MDL-32633' of git://github.com/timhunt/moodle
2012-05-16 15:59:07 +08:00
Aparup Banerjee
9e66e96049
Merge branch 'MDL-31657' of git://github.com/scriby/moodle
2012-05-16 14:32:51 +08:00
Aparup Banerjee
7585ac89bd
Merge branch 'MDL-32988-master' of git://github.com/sammarshallou/moodle
2012-05-16 14:03:56 +08:00
Aparup Banerjee
ca91bdcdf7
MDL-32921 lti : reused a moodle_url.
2012-05-16 13:49:32 +08:00
Aparup Banerjee
184287f0ce
Merge branch 'MDL-32921' of git://github.com/scriby/moodle
2012-05-16 13:48:42 +08:00
Aparup Banerjee
e7ebfb8058
Merge branch 'MDL-32005-master-10' of git://git.luns.net.uk/moodle
...
- fixed up comments (was phpdoc blocks)
2012-05-16 10:39:48 +08:00
Sam Hemelryk
19d1525f6b
Merge branch 'MDL-32641-master-1' of git://git.luns.net.uk/moodle
2012-05-16 13:14:59 +12:00
Sam Hemelryk
ba94f1d503
Merge branch 'MDL-32889-master' of https://github.com/mackensen/moodle
2012-05-16 13:09:32 +12:00
Sam Hemelryk
a5bf3c520f
Merge branch 'MDL-31215-master-11' of git://git.luns.net.uk/moodle
...
Conflicts:
course/lib.php
2012-05-16 09:59:45 +12:00
Sam Hemelryk
fdbd219b33
Merge branch 'MDL-30434_debug_exception' of git://github.com/andyjdavis/moodle
2012-05-16 09:51:48 +12:00
Sam Hemelryk
3cb5b9ccf6
Merge branch 'MDL-31458' of git://github.com/danpoltawski/moodle
2012-05-16 09:12:17 +12:00
Eloy Lafuente (stronk7)
3e632cf4e6
Merge branch 'MDL-32998' of git://github.com/mouneyrac/moodle
2012-05-15 13:14:13 +02:00
Eloy Lafuente (stronk7)
5b0800d30e
MDL-32949 ws: minor comments cleanup
2012-05-15 13:10:50 +02:00
sam marshall
a7d09b7008
MDL-32988 Lib: Course delete does availability/completion in wrong order
...
When deleting modules that failed to delete using normal method, it deleted
the course-modules table first and then the availability/completion,
which depend on the entries in course-modules table. This commit switches
the order.
2012-05-15 12:02:00 +01:00
Eloy Lafuente (stronk7)
4617939723
Merge branch 'MDL-32949' of git://github.com/mouneyrac/moodle
2012-05-15 12:59:18 +02:00
Jerome Mouneyrac
50f9449faa
MDL-32998 add warnings structure
2012-05-15 18:40:06 +08:00
Jerome Mouneyrac
506df9acbf
MDL-32949 return exception errorcode from the REST/SOAP/XMLRPC servers
2012-05-15 18:23:43 +08:00
Aparup Banerjee
154128a50f
Merge branch 'wip-mdl-32770' of git://github.com/rajeshtaneja/moodle
2012-05-15 16:41:54 +08:00
Andrew Robert Nicols
74b714df7e
MDL-32005 Add idnumber field to groups and groupings
2012-05-15 09:38:51 +01:00
Dan Poltawski
61bb4184a7
Merge branch 'w20_MDL-25197_m23_innodb' of git://github.com/skodak/moodle
2012-05-15 15:41:46 +08:00
Dan Poltawski
b60b839d31
Merge branch 'MDL-32869_master' of git://github.com/kordan/moodle
2012-05-15 15:32:03 +08:00
Dan Poltawski
0a6202232c
Merge branch 'MDL-32321_master' of git://github.com/kordan/moodle
2012-05-15 15:30:28 +08:00
Dan Poltawski
1e1931a797
Merge branch 'MDL-32978-master-integration' of git://github.com/FMCorz/moodle
2012-05-15 14:43:31 +08:00
Yang
03d38b9207
MDL-32998 add warnings structure
2012-05-15 13:40:58 +08:00
Aparup Banerjee
c459e91789
Merge branch 'MDL-25695-master' of https://github.com/mackensen/moodle
2012-05-15 11:03:07 +08:00
Andrew Robert Nicols
7a9a07d24a
MDL-31215 Add the ability to change activity titles using AJAX calls
2012-05-14 14:22:02 +01:00
Dan Poltawski
7a76aad7b7
Merge branch 'MDL-32930' of git://github.com/tmuras/moodle
2012-05-14 20:57:14 +08:00
Dan Poltawski
095de3cee6
Merge branch 'MDL-32863' of git://github.com/jonof/moodle
2012-05-14 20:49:05 +08:00
Dan Poltawski
eca95b639d
Merge branch 'MDL-32375' of git://github.com/timhunt/moodle
2012-05-14 20:42:12 +08:00
sam marshall
ce4dfd2703
MDL-24419 (4): Add conditional availability support to sections; section cache
...
Credit: original version done by Kirill Astashov of NetSpot (netspot.com.au),
finished and tweaked by sam.
This change adds conditional availability support for sections analagous to
that already available for activities. (Backend, UI, backup/restore.)
In order that this feature does not reduce performance, section cacheing has
also been added using a new course 'sectioncache' field analagous to modinfo.
The new feature integrates with activity availability so that activities
inside sections which are not available are automatically not available
themselves (meaning it works to restrict access).
2012-05-14 11:19:25 +01:00
sam marshall
637da99edb
MDL-24419 (3): Add new parameter to format_float for shorter display
2012-05-14 11:15:16 +01:00
sam marshall
ae3fbf7b06
MDL-24419 (2): Moved groupings cache to get_all_groupings function
...
There was a static cache inside course/lib.php. I need to access this
information in other places, so to avoid making two queries, I am
moving the cache into the groups_get_all_groupings function instead.
2012-05-14 11:15:15 +01:00
sam marshall
1cf121e1d2
MDL-24419 (1): Core restore steps should have after_restore function
...
At present core restore steps cannot have an after_restore function,
even though plugin restore steps can. Technically it would be possible
to just override the launch_after_restore_methods function but this
is not very neat. Instead, I added code to call after_restore function
(exactly the same way after_execute works).
2012-05-14 11:15:14 +01:00
Dan Poltawski
bdd773d565
Merge branch 'MDL-30291' of git://github.com/rwijaya/moodle
2012-05-14 18:08:30 +08:00
Dan Poltawski
36e686a07e
MDL-32923 phpunit: make copy/paste easier
2012-05-14 17:38:58 +08:00
Dan Poltawski
225097f75a
Merge branch 'MDL-31719_master' of git://github.com/lazydaisy/moodle
2012-05-14 15:53:19 +08:00
Dan Poltawski
7e86180956
MDL-32923 phpunit: be a bit more verbose about re-run cmmand
2012-05-14 15:48:26 +08:00
Dan Poltawski
a5fefe0bbd
Merge branch 'w20_MDL-32923_m23_phpunithint' of git://github.com/skodak/moodle
2012-05-14 15:46:23 +08:00
Dan Poltawski
cf037ba049
Merge branch 'w20_MDL-26901_m23_tinymceoptions' of git://github.com/skodak/moodle
2012-05-14 14:44:04 +08:00
Dan Poltawski
bf9b08dd5e
Merge branch 'wip-mdl-31941' of git://github.com/rajeshtaneja/moodle
2012-05-14 14:26:29 +08:00
Dan Poltawski
ec3f19bddb
Merge branch 'MDL-31951' of git://github.com/rwijaya/moodle
2012-05-14 14:23:41 +08:00
Dan Poltawski
8715472b1d
Merge branch 'MDL-32742-master-1' of git://git.luns.net.uk/moodle
2012-05-14 14:21:57 +08:00