Commit graph

16864 commits

Author SHA1 Message Date
Dan Poltawski
6c416558da Merge branch 'w35_MDL-41022_m26_unittests3' of https://github.com/skodak/moodle 2013-08-26 12:23:16 +08:00
Sam Hemelryk
c3d2fbf9cd MDL-40931 useragent: separated user agent functionality into a lib
This commit moves user agent related functionality out of several
core libraries and combines it into a more manageable class.
All core uses are converted and functions deprecated in favor
of the new class.
2013-08-26 13:59:19 +12:00
Damyon Wiese
3cb75dd1fb MDL-36803 tinymce: Version bump for js changes 2013-08-26 09:29:06 +08:00
Damyon Wiese
8920b2e288 Merge branch 'MDL-36803-m' of https://github.com/andrewnicols/moodle 2013-08-26 09:27:57 +08:00
Sam Hemelryk
4d5c7cb0d8 MDL-41081 navigation: added unit tests for navbar::prepend 2013-08-26 08:52:35 +12:00
Sam Hemelryk
c16b882bcd MDL-41081 navigation: added means to prepend to the navbar. 2013-08-26 08:52:35 +12:00
Petr Škoda
686d4ec921 MDL-41022 cleanup core_grade_scale_testcase 2013-08-24 16:21:09 +02:00
Petr Škoda
c952e0911d MDL-41022 cleanup core_grade_item_testcase 2013-08-24 16:21:01 +02:00
Petr Škoda
78953f03fd MDL-41022 cleanup core_grade_grade_testcase 2013-08-24 16:20:53 +02:00
Petr Škoda
59c50aff20 MDL-41022 cleanup core_grade_category_testcase 2013-08-24 16:19:25 +02:00
Petr Škoda
401c82d7a7 MDL-41022 cleanup core_test_generator_testcase 2013-08-24 16:18:19 +02:00
Petr Škoda
f52f2c9597 MDL-41022 cleanup core_phpunit_basic_testcase 2013-08-24 16:18:19 +02:00
Petr Škoda
3405d82c91 MDL-41022 cleanup core_phpunit_advanced_testcase 2013-08-24 16:18:19 +02:00
Petr Škoda
1eb135568a MDL-41022 cleanup form tests 2013-08-24 16:18:18 +02:00
Petr Škoda
5f15f7c9aa MDL-41022 cleanup core_files_zip_packer_testcase 2013-08-24 16:18:18 +02:00
Petr Škoda
4c34571b76 MDL-41022 cleanup core_files_file_storage_testcase 2013-08-24 16:18:18 +02:00
Petr Škoda
5d071be68e MDL-41022 cleanup core_external_testcase 2013-08-24 16:18:18 +02:00
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
Petr Škoda
82b1cf00b0 MDL-41245 fix multiple install, upgrade and uninstallation issues
Includes rework of cache parameter detection on admin/index.php.

Another problem is that uninstall does not leave system in consistent state,
we need to force users to go through upgrade after any type of uninstall.

This fixes also add-on installation redirect and other issues.
2013-08-24 16:08:11 +02:00
Mark Nelson
6d8627cb6b MDL-36126 backup: changed the message column in the table backup_logs to a text field to prevent DB errors 2013-08-23 11:40:36 +08: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
Tim Hunt
f9c1c2e5b8 MDL-41364 fix apostrophe in debug message. 2013-08-21 12:21:31 +01:00
Dan Marsden
3d1808c6e2 MDL-40122 SCORM: replace SCORM course format with singleactivity 2013-08-21 20:26:06 +12: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
Andrew Nicols
be94c6d88d MDL-36803 TinyMCE: Fix TinyMCE following touch events on iOS browsers 2013-08-20 23:58:59 +01: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