mirror_php/moodle
1
0
Fork 0
mirror of https://github.com/moodle/moodle.git synced 2025-03-15 21:20:02 +01:00
Code Issues Projects Releases Wiki Activity
63,309 Commits 36 Branches 527 Tags
Commit Graph

63309 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Dan Poltawski
72c2c0bb09 MDL-41191 add more test data to trigger duplicate course records 2013-08-21 14:17:12 +08:00
Frederic Massart
e5f9659b79 MDL-40877 repository_url: Use core_text functions instead of mb_strlen() 2013-08-21 14:13:46 +08:00
Damyon Wiese
36719d4ade MDL-41057 csslib: Adding a version bump to clear css caches 2013-08-21 14:05:43 +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 ab7632b74c331540c90229bf03d13aa2e6bdd9be.
 2013-08-21 13:42:30 +08:00
Dan Poltawski
a101c7f011 Merge branch 'MDL-41143-master' of git://github.com/FMCorz/moodle 2013-08-21 13:40:23 +08:00
Dan Poltawski
2af95c4b51 Merge branch 'MDL-41040-master' of git://github.com/FMCorz/moodle 2013-08-21 13:36:02 +08:00
Frederic Massart
30905b5bcb MDL-41143 course: Missing formslib required for constant use 2013-08-21 13:31:59 +08:00
Damyon Wiese
90a5a4b620 Merge branch 'master_MDL-35380' of git://github.com/danmarsden/moodle 2013-08-21 11:38:37 +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
c1613ed53a Merge branch 'wip-MDL-40830-master' of git://github.com/marinaglancy/moodle 2013-08-21 13:17:37 +12:00
Marina Glancy
ac6fb0ad17 Merge branch 'MDL-32324' of git://github.com/timhunt/moodle 2013-08-21 10:28:47 +10:00
Sam Hemelryk
2968602ccb Merge branch 'MDL-41162' of git://github.com/timhunt/moodle 2013-08-21 12:13:34 +12: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
Mary Evans
cef25b2ac2 MDL-41321 theme_boostrapbase: Add styling to groupinfobox in less/moodle/user.less. 2013-08-21 00:08:20 +01:00
Sam Hemelryk
f79f3c00f8 Revert "MDL-41258 Forum: Add additional unit tests for forum digest settings" 
This reverts commit 0ef6f6860debcc2a5b67fecaeb57256377436b6b.
 2013-08-21 11:03:35 +12:00
Sam Hemelryk
1ef7722cba Merge branch 'master_MDL-41144' of git://github.com/danmarsden/moodle 2013-08-21 11:01:51 +12: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
b89fbc4615 Merge branch 'MDL-41159-master' of git://github.com/damyon/moodle 
Conflicts:
	theme/bootstrapbase/style/moodle.css
 2013-08-21 10:56:00 +12:00
Sam Hemelryk
ead9cce340 Merge branch 'MDL-41157-master' of git://github.com/danpoltawski/moodle 2013-08-21 10:48:02 +12:00
Sam Hemelryk
cc76e82d58 Merge branch 'MDL-41210-master' of git://github.com/FMCorz/moodle 2013-08-21 10:21:04 +12:00
Sam Hemelryk
0eb65affd2 Merge branch 'MDL-41209-master' of git://github.com/FMCorz/moodle 2013-08-21 10:09:08 +12:00
Sam Hemelryk
c5bba2fc2d Merge branch 'MDL-41258-m' of git://github.com/andrewnicols/moodle 2013-08-21 09:59:19 +12: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
c161e4687c Merge branch 'MDL-41143-master' of git://github.com/FMCorz/moodle 
Conflicts:
	version.php
 2013-08-20 18:21:17 +08:00
Dan Poltawski
144f35d9a2 Merge branch 'MDL-41136-master' of git://github.com/FMCorz/moodle 2013-08-20 17:51:18 +08:00
Frederic Massart
2ecd284779 MDL-41143 mod_forum: Prevent unnessary loading of formslib 2013-08-20 17:50:07 +08:00
Dan Poltawski
43964b852a Merge branch 'MDL-41125-master' of git://github.com/FMCorz/moodle 2013-08-20 17:10:05 +08: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
Dan Poltawski
6bbcf832c4 Merge branch 'MDL-41211-master' of git://github.com/FMCorz/moodle 2013-08-20 16:44:09 +08:00
Dan Poltawski
beccd9d4ff Merge branch 'MDL-39770_chat' of https://github.com/andyjdavis/moodle 2013-08-20 16:34:18 +08:00
Damyon Wiese
e2f36a71a8 Merge branch 'MDL-41191-master' of git://github.com/danpoltawski/moodle 2013-08-20 16:13:55 +08:00
Damyon Wiese
93e2c2a567 Merge branch 'MDL-40709-master' of git://github.com/danpoltawski/moodle 2013-08-20 16:10:49 +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
Rossiani Wijaya
8f0767f10c MDL-40732 choice: improve heading levels and styling 2013-08-20 16:05:01 +08:00
Damyon Wiese
a446d62d97 Merge branch 'MDL-41071-master' of git://github.com/FMCorz/moodle 2013-08-20 16:01:12 +08:00
Mark Nelson
9e2d9135f6 MDL-39957 course: added missing assertions for events 
This occurred when an add_to_log call, with no associated legacy event,
was replaced with a new event. We should still call assertEventLegacyData
even though there is no legacy event data to compare with, simply ensure
that the expected data was passed.
 2013-08-20 15:59:11 +08:00
Damyon Wiese
3d262be88d MDL-40038 files: Removed commented code from unit test 2013-08-20 15:52:11 +08:00
Damyon Wiese
57cef30e42 Merge branch 'wip-MDL-40038-master' of git://github.com/abgreeve/moodle 
Conflicts:
	files/tests/externallib_test.php
 2013-08-20 15:51:57 +08:00
Adrian Greeve
506c8d59ee MDL-41307 - tags: Update of the user object for fullname function. 2013-08-20 15:39:40 +08:00
Damyon Wiese
531110c890 Merge branch 'w33_MDL-41112_m26_cachedist' of https://github.com/skodak/moodle 2013-08-20 15:22:34 +08:00
Dan Poltawski
7d7e0292cb Merge branch 'wip-MDL-40974-m26' of git://github.com/samhemelryk/moodle 2013-08-20 15:13:02 +08:00