Commit Graph

2035 Commits

Author SHA1 Message Date
Damyon Wiese cbd91e23e9 Merge branch 'wip-MDL-40931-m26' of git://github.com/samhemelryk/moodle
Conflicts:
	version.php
2013-08-27 15:29:49 +08:00
Ankit Agarwal ac43f96306 MDL-40052 events: Code style fixes 2013-08-27 15:26:38 +08:00
Ankit Agarwal 589748316d MDL-40052 events: Add a base class for content view 2013-08-27 15:22:28 +08:00
Damyon Wiese dc7092f7b3 Merge branch 'wip-MDL-41081-m26' of git://github.com/samhemelryk/moodle 2013-08-27 14:11:03 +08:00
Damyon Wiese 92058753ac Merge branch 'MDL-40877-master' of git://github.com/FMCorz/moodle 2013-08-27 12:46:23 +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
Sam Hemelryk 4d5c7cb0d8 MDL-41081 navigation: added unit tests for navbar::prepend 2013-08-26 08:52:35 +12: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
Petr Škoda 037d673ea9 MDL-39474 add set_debugging() tests 2013-08-21 15:41:35 +02: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
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
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
Damyon Wiese 89959d9ad1 Merge branch 'wip-MDL-40931-m26' of git://github.com/samhemelryk/moodle 2013-08-20 16:45:33 +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 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
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
Frederic Massart aa87fe80b3 MDL-40877 core_text: Added UTF-8 safe strrchr method 2013-08-16 10:58:22 +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
Sam Hemelryk af62237d0e 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-16 09:02:01 +12:00
Sam Hemelryk 2a1ebf25de MDL-41057 csslib: CSS optimiser improvements.
This commit makes the following changes:
* Tidies up coding style.
* Tidies up phpdocs.
* Improve CSS optimiser unit tests to cover browser hacks.
* Improve backgound style consolidation.
* Improve border style consolidation.
* Fixed optimiser to handle browser hacks like *zoom.
* Improved @ rule unit tests.
* Fixed @rule breakages caused by OS specific rules.
* Added more unit tests to cover a bit more CSS3.

I am pretty sure this patch will now enable to optimsier to
work on bootstrap based themes should developers not wish
to compress thier compiled less CSS.
2013-08-16 08:57:20 +12:00
sam marshall c290ac5510 MDL-39876 update_course_record function to update global COURSE 2013-08-15 11:31:21 +01:00
sam marshall ab7632b74c MDL-39876 Change get_record('course') calls to get_course 2013-08-15 11:31:20 +01:00
Sam Hemelryk 969de2a200 Merge branch 'wip-mdl-39955' of git://github.com/rajeshtaneja/moodle 2013-08-13 14:13:13 +12:00
Rajesh Taneja 1cb1e5fe32 MDL-39955 completion: Added unittest for course_completed event 2013-08-13 09:43:38 +08:00
Sam Hemelryk 90fb4f39fd Merge branch 'MDL-41100-master' of git://github.com/FMCorz/moodle
Conflicts:
	version.php
2013-08-13 09:37:02 +12:00
Sam Hemelryk 41b0597855 Merge branch 'MDL-40852_master' of git://github.com/dmonllao/moodle 2013-08-13 09:10:28 +12:00
Sam Hemelryk cd0103fa60 Merge branch 'MDL-40673_master' of git://github.com/dmonllao/moodle 2013-08-13 09:03:45 +12:00
Petr Škoda 96f81ea385 MDL-39474 introduce $CFG->debugdeveloper and cleanup $CFG init 2013-08-12 13:01:47 +02:00
Dan Poltawski 7064ef523b Merge branch 'wip-mdl-40044' of git://github.com/rajeshtaneja/moodle 2013-08-12 14:27:35 +08:00
Rajesh Taneja 35e4eb42c0 MDL-40044 Roles: Updated role_assigned and role_unassigned event to remove add_to_log 2013-08-09 18:02:02 +08:00
Rajesh Taneja 1613ffa55f MDL-40044 Roles: Added role_allow_*_updated events to replace add_to_log on role allow page
Added events:
1. role_allow_assign_updated
2. role_allow_override_updated
3. role_allow_switch_updated
2013-08-09 17:59:54 +08:00
Rajesh Taneja 82ddcad0a3 MDL-40044 Roles: Added role_capabilites_updated event and replaced related add_to_log 2013-08-09 17:59:54 +08:00
Rajesh Taneja a7524e354b MDL-40044 Roles: Added role_deleted event and replaced related add_to_log 2013-08-09 17:59:54 +08:00
Rajesh Taneja cdc541990e MDL-39955 completion: Added unittest for course_module_completion_updated event 2013-08-09 17:06:12 +08:00
Frederic Massart d26ec8a598 MDL-41100 libraries: Moved get_plugin_list_with_file to core_component 2013-08-09 11:56:48 +08:00
Petr Škoda 99a9d8d937 MDL-41019 refactor string managers to new core_ classes 2013-08-08 09:10:25 +02:00
Petr Škoda 3130c1a71f MDL-40952 skip only the opcache requirement in environment test
Please note we need other optional extensions and settings because otherwise some tests fail without explanation.
2013-08-08 09:02:40 +02:00
Petr Škoda 2f1e464a88 MDL-40438 migrate all collatorlib:: and textlib:: uses 2013-08-06 21:04:35 +02:00
David Monllao 81cd8572ba MDL-40673 behat: Data generator for permission overrides 2013-08-06 15:04:48 +08:00
Ankit Agarwal 320aee339c MDL-40935 phpunit: Remove assertLegacyEventName() since get_legacy_eventname() is public now 2013-08-06 14:58:30 +08:00
Ankit Agarwal 2244600337 MDL-40935 events: get_legacy_eventname() should be public and static 2013-08-06 14:25:37 +08:00
David Monllao 95b43d6b90 MDL-40852 behat: Wrong URLs detection 2013-08-06 13:23:07 +08:00
Sam Hemelryk e145762b17 Merge branch 'MDL-40934-master' of git://github.com/FMCorz/moodle
Conflicts:
	auth/tests/auth_test.php
2013-08-06 14:37:43 +12:00
Sam Hemelryk 3550fc28fb NOBUG: fixed whitespace 2013-08-06 14:03:54 +12:00
Sam Hemelryk 471dd4ff67 Merge branch 'MDL-40963-master' of git://github.com/ankitagarwal/moodle 2013-08-06 13:59:23 +12:00