Commit graph

16689 commits

Author SHA1 Message Date
Petr Škoda
9d6d32b6f0 MDL-41022 cleanup core_dml_testcase 2013-08-24 16:18:02 +02:00
Petr Škoda
d5ded4e72d MDL-41022 cleanup core_ddl_testcase 2013-08-24 16:14:25 +02:00
Damyon Wiese
aff220edd9 MDL-36002 dragdrop: Implement keyboard dragdrop for blocks
This is for the NEW block drag and drop code - not the other one :)
All it does it add proper drag handles.
2013-08-22 16:37:49 +08:00
Damyon Wiese
9ead041cdb Revert "MDL-40931 useragent: separated user agent functionality into a lib"
This reverts commit af62237d0e.
This reverts commit 87a4194fdc.
This reverts commit b2c66eb60c.

Conflicts:

	version.php
2013-08-22 13:31:25 +08:00
Damyon Wiese
50cb89177e Merge branch 'wip-MDL-41196-m26' of git://github.com/samhemelryk/moodle 2013-08-22 11:19:55 +08:00
Dan Poltawski
52ef7502d6 Merge branch 'MDL-30839-master' of git://github.com/phalacee/moodle 2013-08-22 11:17:49 +08:00
Jason Fowler
72d08bd153 MDL-30839 Accessibility - Focusing on error on submit 2013-08-22 10:54:19 +08:00
Sam Hemelryk
ba214fa54c MDL-41196 phpmailer: fixed unit test detection 2013-08-22 14:46:26 +12:00
Dan Poltawski
c44ff50cbc Merge branch 'debugdeveloperbitwisemess' of git://github.com/skodak/moodle 2013-08-22 10:40:47 +08:00
Dan Poltawski
695969987a Merge branch 'MDL-30839-master' of git://github.com/phalacee/moodle 2013-08-22 10:14:21 +08:00
Jason Fowler
5df7412899 MDL-30839 Fixing extra line breaks in error msg 2013-08-22 09:04:30 +08:00
Petr Škoda
037d673ea9 MDL-39474 add set_debugging() tests 2013-08-21 15:41:35 +02:00
Petr Škoda
ce7b06bcd7 MDL-39474 fix incorrect bitwise ops when setting $CFG->debugdeveloper 2013-08-21 13:38:33 +02:00
Dan Poltawski
046514b7a2 Merge branch 'MDL-30839-master' of git://github.com/phalacee/moodle 2013-08-21 15:17:44 +08:00
Jason Fowler
f8a4f2c10e MDL-30839 Fixing extra line breaks in error msg 2013-08-21 14:58:50 +08:00
Damyon Wiese
1f1bee6fbf Merge branch 'wip-MDL-41057-m26' of git://github.com/samhemelryk/moodle 2013-08-21 14:05:13 +08:00
Damyon Wiese
74df2951d1 Revert "MDL-39876 Change get_record('course') calls to get_course"
This reverts commit ab7632b74c.
2013-08-21 13:42:30 +08:00
Dan Poltawski
2af95c4b51 Merge branch 'MDL-41040-master' of git://github.com/FMCorz/moodle 2013-08-21 13:36:02 +08:00
Dan Poltawski
d99a300563 Merge branch 'wip-MDL-36690-master' of git://github.com/marinaglancy/moodle 2013-08-21 11:35:27 +08:00
Sam Hemelryk
487caf6b65 Revert "MDL-39876 update_course_record function to update global COURSE"
This reverts commit c290ac5510.

Conflicts:
	course/lib.php
2013-08-21 15:21:06 +12:00
Dan Poltawski
c3f5f4ab37 Merge branch 'wip-MDL-32191-m26' of git://github.com/samhemelryk/moodle 2013-08-21 10:44:04 +08:00
Marina Glancy
4fcdb0123c MDL-36690 Do not cache objects inside course.modinfo as they may fail to serialize
convert moodle_url (all other fields are numbers or strings) to string before caching and then back to moodle_url when restoring.
Otherwise serialized modinfo can contain \0 byte which cause problems in Postgres DB
2013-08-21 12:30:38 +10:00
Frederic Massart
38d6fbfa87 MDL-41040 event: Level property uses defined event constants 2013-08-21 10:04:02 +08:00
Sam Hemelryk
6eee89bc8f Merge branch 'MDL-39876-master' of git://github.com/sammarshallou/moodle
Conflicts:
	course/lib.php
2013-08-21 12:08:46 +12:00
Marina Glancy
e542bc26d9 Merge branch 'wip-mdl-40042' of git://github.com/rajeshtaneja/moodle 2013-08-21 10:02:41 +10:00
Sam Hemelryk
87a4194fdc MDL-40931 useragent: converted useragent calls in ajaxenabled 2013-08-21 09:48:31 +10:00
Sam Hemelryk
93564564e4 Merge branch 'MDL-41196-m' of git://github.com/andrewnicols/moodle 2013-08-21 09:56:16 +12:00
Dan Poltawski
d5f8b7edc4 Merge branch 'w33_MDL-41094_m26_purgecleanup' of https://github.com/skodak/moodle 2013-08-20 17:03:47 +08:00
Damyon Wiese
b2c66eb60c MDL-40931 useragentlib: Removed unused class variable + version fix 2013-08-20 16:48:18 +08:00
Damyon Wiese
89959d9ad1 Merge branch 'wip-MDL-40931-m26' of git://github.com/samhemelryk/moodle 2013-08-20 16:45:33 +08:00
Damyon Wiese
e2f36a71a8 Merge branch 'MDL-41191-master' of git://github.com/danpoltawski/moodle 2013-08-20 16:13:55 +08:00
Dan Poltawski
51bfad5c91 Merge branch 'w33_MDL-40952_m26_opcacheunit' of https://github.com/skodak/moodle 2013-08-20 16:07:12 +08:00
Damyon Wiese
a446d62d97 Merge branch 'MDL-41071-master' of git://github.com/FMCorz/moodle 2013-08-20 16:01:12 +08:00
Damyon Wiese
6f81158a7e Merge branch 'MDL-40162_master' of https://github.com/totara/openbadges 2013-08-20 14:45:34 +08:00
Damyon Wiese
5a10d2a7ae Merge branch 'wip-mdl-40043' of git://github.com/rajeshtaneja/moodle
Conflicts:
	course/tests/courselib_test.php
	lang/en/moodle.php
2013-08-20 14:40:42 +08:00
Rajesh Taneja
71298fea03 MDL-40043 Events API: Added user_loggedinas event to replace add_to_log 2013-08-20 14:07:35 +08:00
Rajesh Taneja
ed29bf0f66 MDL-40043 Events API: Added course_section_updated event to replace add_to_log 2013-08-20 14:07:35 +08:00
Dan Poltawski
91a888df34 Merge branch 'MDL-39957_master' of https://github.com/markn86/moodle 2013-08-20 12:38:08 +08:00
Damyon Wiese
5a2356be38 Merge branch 'MDL-41122_master' of git://github.com/kastashov/moodle 2013-08-20 12:28:00 +08:00
Damyon Wiese
b277230aad Merge branch 'MDL-39956-master' of git://github.com/FMCorz/moodle 2013-08-20 12:21:04 +08:00
Dan Poltawski
bfa4c3f358 Merge branch 'MDL-36002-master' of git://github.com/damyon/moodle
Conflicts:
	theme/bootstrapbase/style/moodle.css
2013-08-20 12:17:16 +08:00
Dan Poltawski
6f44a73369 Merge branch 'w33_MDL-39474_m26_debugdeveloper' of https://github.com/skodak/moodle
Conflicts:
	lib/upgrade.txt
2013-08-20 11:42:03 +08:00
Dan Poltawski
599d7d9bdf Merge branch 'MDL-30839-master' of git://github.com/phalacee/moodle 2013-08-19 17:40:37 +08:00
Damyon Wiese
ea8c248c96 MDL-36002 keyboard drag drop: Hidden activities and labels
Get the correct title for hidden activities and labels.
2013-08-19 16:18:23 +08:00
Damyon Wiese
e5cb7f8b7b Merge branch 'master_MDL-39572' of https://github.com/totara/moodle 2013-08-19 15:42:17 +08:00
Jason Fowler
0c99005a9a MDL-30839 Accessibility, Forms - Improve accessibility or error messages 2013-08-19 09:54:41 +08:00
Rajesh Taneja
135dde74ed MDL-40042 Completion: added course_completion_updated event to remove related add_to_log 2013-08-16 09:34:23 +08:00
Simon Coggins
be8c6d7bc8 MDL-39572: Fix sql_order_by_text() to use length argument correctly 2013-08-16 11:26:54 +12:00
Simon Coggins
be4bf53d6d MDL-39572: Fix existing tests and add more to demonstrate issue with sql_order_by_text() 2013-08-16 11:26:54 +12:00
Yuliya Bozhko
b143259ee0 MDL-40162 badges: Image url breaks when slashargumets is not supported 2013-08-16 11:12:12 +12:00