mirror_php/moodle
1
0
Fork 0
mirror of https://github.com/moodle/moodle.git synced 2025-03-05 00:22:43 +01:00
Code Issues Projects Releases Wiki Activity
63,429 Commits 36 Branches 523 Tags
Commit Graph

16776 Commits

Author SHA1 Message Date
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 c290ac5510ca06b3eae557c2165c2f106dde46aa.

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
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
Tim Lock
6b718780c6 MDL-41304: Hide and handle LDAP error when user not in context being checked 2013-08-20 10:34:16 +09:30
Marina Glancy
5a3204d05b MDL-41222 Remove unnecessary course cache rebuild 2013-08-20 10:27:15 +10: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
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
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
Jonathon Fowler
072c52bbc0 MDL-32191 navigation: Add keys to module and block settings nav nodes 
Conflicts:
	lib/navigationlib.php
 2013-08-16 09:18:42 +12: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
Andrew Nicols
1aba6b2b4d MDL-41196 Unit Tests: Add a phpmailer message sink 2013-08-15 13:58:51 +01:00
Marina Glancy
676fa06af3 MDL-36789 Quick course cache integrity check for deleted modules 2013-08-15 21:48:24 +10: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
Mark Nelson
2bf2f3599e MDL-39957 course: altered the handling of legacy log data for the course_updated event 2013-08-15 18:14:08 +08:00
Mark Nelson
a4003c733a MDL-39957 course: replaced the course_restored legacy event 2013-08-15 18:14:08 +08:00
Mark Nelson
f326c5b4f4 MDL-39957 course: replaced the course_category_deleted legacy event 2013-08-15 18:14:08 +08:00
Mark Nelson
db53f7fe28 MDL-39957 course: replaced the course_content_deleted legacy event 2013-08-15 18:14:08 +08:00
Mark Nelson
c347241ac8 MDL-39957 course: replaced the course_deleted legacy event 2013-08-15 18:14:07 +08:00
Mark Nelson
53a8e678bf MDL-39957 course: replaced the course_updated legacy event 2013-08-15 18:14:07 +08:00