c2551ed593
Merge branch 'w41_MDL-29602_m22_accesslib' of git://github.com/skodak/moodle
2011-10-18 13:15:13 +02:00
36903cece3
Merge branch 'wip-MDL-29496-master' of git://github.com/phalacee/moodle
2011-10-18 11:00:04 +02:00
fc0aebb595
MDL-29496 unittests - verify COALESCE() cross-db compatibility
2011-10-18 15:58:56 +08:00
77c3e9d0c6
MDL-29768 Language : fixed installation undefined debugstringids notice
2011-10-18 11:19:43 +08:00
065d6d80a2
Merge branch 'MDL-29627' of git://github.com/timhunt/moodle
2011-10-18 01:44:58 +02:00
c78238f151
Merge branch 'MDL-28614' of git://github.com/timhunt/moodle
2011-10-18 00:58:09 +02:00
6fd1995d3b
MDL-28614 questions: remove another obsolete editing_head_contributions fn.
2011-10-17 23:53:53 +01:00
cb284e953c
Merge branch 'w41_MDL-29785_m22_tinymce' of git://github.com/skodak/moodle
2011-10-17 21:24:39 +02:00
22ca3e49e0
NOBUG - whitespace fixes (MDL-19488, MDL-27242, MDL-29435)
2011-10-17 10:19:59 +02:00
5f6de5dc6b
Merge branch 'MDL-29435' of git://github.com/mouneyrac/moodle
2011-10-17 17:31:52 +13:00
d97505d2a3
Merge branch 'MDL-27242-master' of git://github.com/sammarshallou/moodle
2011-10-17 17:28:32 +13:00
92fe97f922
Merged branch 'MDL-29277' of git://github.com/mouneyrac/moodle.git with improvements
2011-10-17 13:18:30 +13:00
998085c9f7
Dropping the uq_rater_per_item from the table grading_instances
...
It was realized that we may need multiple instances per one rater/item
to be able to 1) implement a draft instance and 2) eventually keep the
history of advanced grading.
2011-10-16 19:40:34 +02:00
3452a2db90
Merge branch 'MDL-28436' of git://github.com/nebgor/moodle
2011-10-16 19:13:00 +02:00
f3c34143f9
Merge branch 'MDL-29768-master' of git://github.com/sammarshallou/moodle
2011-10-16 17:46:18 +02:00
626509d478
MDL-29785 enable TinyMCE on iOS 5 devices
2011-10-16 17:37:12 +02:00
29fb2bcc39
Merge branch 'MDL-29788-langpack_version' of git://github.com/mudrd8mz/moodle
2011-10-16 17:23:35 +02:00
9ef8d17ab2
MDL-29785 import latest TinyMCE 3.4.6
...
using https://github.com/moodle/custom-tinymce/tree/MOODLE_22_3.4.6 and https://github.com/moodle/custom-tinymce_spellchecker_php/tree/MOODLE_22_2.0.6 customised branches
2011-10-16 17:14:33 +02:00
e922fe23b6
MDL-29602 accesslib improvements
...
Refactoring and improvements of the accesslib.php library including prevention of access for not-logged-in users when forcelogin enabled, improved context caching, OOP refactoring of contexts, fixed context loading, deduplication of role definitions in user sessions, installation improvements, decoupling of enrolment checking from capability loading, added detection of deleted and non-existent users in has_capability(), new function accesslib test, auth and enrol upgrade notes.
More details are available in tracker subtasks.
2011-10-16 14:05:18 +02:00
f3a99ef8f7
MDL-29788 Fixed the version of installed language packs
2011-10-15 00:01:44 +02:00
260c4a5b09
MDL-29773 prevent negative unix timestamps in the files table
2011-10-14 15:52:49 +02:00
694f3b74c7
MDL-29773 use db debuginfo when file record insertion fails
2011-10-14 15:30:54 +02:00
7ece4a0798
Merge branch 'rubric' of github.com:mudrd8mz/moodle into rubric
2011-10-13 22:45:30 +02:00
20c207ab21
Merge branch 'master' into rubric
...
Conflicts:
lib/db/upgrade.php
2011-10-13 22:42:47 +02:00
2e98ae02ec
MDL-29768 debugstringids option did not do anything
2011-10-13 12:57:55 +01:00
c999d841b4
MDL-29627 add quizaccess plugins to standard_plugins_list.
2011-10-13 11:13:26 +01:00
6282381d05
MDL-27242 Conditional availability dates should support time as well as day
...
Change also adds minor feature to date-time selector so you can specify the time it uses as default when the value is 0 (disabled).
Credit: This feature was developed collaboratively by Charles Fulton, Neill Magill, and me.
2011-10-13 10:23:23 +01:00
f6f2bebd0c
MDL-28436 webservice : fixed missing field in query
2011-10-13 09:54:25 +08:00
6798c63e20
Added form element grading and integrated it with grading_controller
2011-10-12 15:01:53 +08:00
f6e1809608
Merge branch 'MDL-29625' of git://github.com/timhunt/moodle
2011-10-11 12:10:51 +02:00
e4e0020ed6
MDL-29625 new helper function get_plugin_list_with_class.
...
Based on the existing get_plugin_list_with_function. As part
of implementing this, I refactored out a
get_plugin_list_with_file function, which may also be useful.
2011-10-11 10:46:23 +01:00
fc09870e0e
Merge branch 'wip-MDL-27058-master' of git://github.com/samhemelryk/moodle.git (solved conflict)
2011-10-11 13:37:34 +08:00
bdfb2b71b7
Merge branch 'wip-MDL-28549-master' of git://github.com/samhemelryk/moodle
2011-10-11 09:46:16 +08:00
71e1a1f820
MDL-20306 Add course_category idnumber field: version bump and fix missing add_field() call
2011-10-10 23:54:40 +02:00
83cd9b163a
MDL-20306 Add course_category idnumber field
2011-10-10 23:54:30 +02:00
aabf13c240
Merge branch 'wip-MDL-29224-master' of git://github.com/samhemelryk/moodle
2011-10-10 23:14:05 +08:00
b438bce949
MDL-29496 Search, Course - Code applied from patch to allow courses with a blank summary to be found in searchs - Thanks to Andrew Nicols for the patch
2011-10-10 11:35:42 +08:00
e0daa8499a
MDL-29661 - lib/googleapi.php - Switch to SSL urls
...
I am not sure why I did not use these in the first instance, I don't
think Google supported SSL in the first versions of their API.
They do now, and it seems that this week they stopped supporting non-ssl
requests.
2011-10-10 16:27:53 +13:00
77b93da537
Merge branch 'MDL-29668' of git://github.com/stronk7/moodle
2011-10-10 12:09:34 +13:00
356a6de351
MDL-27058 navigation: Added a setting to control whether user forum links are added
2011-10-10 10:57:02 +13:00
e7f9b7abc8
MDL-28549 navigation: Added a missing login check when adding the calendar link to the navigation
2011-10-10 10:30:22 +13:00
617a9bb4c3
MDL-29668 xmldb editor - fix PHP generation for foreign-unique keys
2011-10-08 21:49:56 +02:00
b7a6bb9ba8
MDL-29480 Adding new fields into grading_definitions
2011-10-07 22:43:02 +02:00
2c86d85daf
MDL-29480 Making the upgrade.php in sync with recent install.xml
2011-10-07 22:07:55 +02:00
e8004aadc8
Merge remote branch 'origin/master' into rubric
...
Conflicts:
lib/db/install.xml
lib/db/upgrade.php
version.php
2011-10-07 22:01:38 +02:00
9360256937
MDL-29277 when validate externallib function parameters or return values, build the path to the error into the debuginfo. This patch also revert the exception to the original invalid_parameter_exception and invalid_response_exception
2011-10-07 16:06:19 +08:00
2c28fa7643
MDL-29435 SOAP/XMLRPC server return debuginfo into the exception message when DEBUG >= NORMAL
2011-10-07 14:21:41 +08:00
a7f99cf02e
MDL-29677 unit tests - missing global was causing tons of incorrect debugging info
2011-10-07 01:24:18 +02:00
943c662d62
fix permissions
2011-10-07 00:07:15 +02:00
dee1a0fd7a
MDL-29224 navigation: Navigation now respects a modules onclick event when preparing navigation nodes
2011-10-06 19:32:27 +13:00
Eloy Lafuente (stronk7)