mirror_php/moodle
1
0
Fork 0
mirror of https://github.com/moodle/moodle.git synced 2025-01-19 06:18:28 +01:00
Code Issues Projects Releases Wiki Activity
63,120 Commits 36 Branches 519 Tags
Commit Graph

63120 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Sam Hemelryk
87a4194fdc MDL-40931 useragent: converted useragent calls in ajaxenabled 2013-08-21 09:48:31 +10: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
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
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
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
Dan Poltawski
faa2e68bb5 MDL-38197 tool_generator: fix use of raw LIKE sql 2013-08-20 14:55:14 +08:00
Dan Poltawski
1dae651584 Merge branch 'MDL-38197-master' of git://github.com/sammarshallou/moodle 2013-08-20 14:55:07 +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
Jenny Gray
740c4ada36 MDL-39800 tags: moved cloud sorting to print function 2013-08-20 14:26:21 +08:00
Jenny Gray
5ea6ac9802 MDL-39800 tags: Applied weight and ordering fix on all more page options 
Also:
Fixed weight and ordering on more page show=all
Fixed weight and ordering on more page show=my
rationalised tag_print_cloud lines now identical
 2013-08-20 14:26:20 +08:00
Jenny Gray
df428badaf MDL-39800 tags: resolved weighting in block content 2013-08-20 14:26:20 +08:00
Dan Poltawski
d5b076a2ca Merge branch 'wip-MDL-37674-m26' of git://github.com/samhemelryk/moodle 2013-08-20 14:21:38 +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
Damyon Wiese
eedb6aae3f Merge branch 'MDL-27595-2' of https://github.com/bostelm/moodle 2013-08-20 13:31:16 +08:00
Damyon Wiese
43cc62ed13 Merge branch 'MDL-41036' of git://github.com/timhunt/moodle 2013-08-20 12:55:31 +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
8ab325fb00 Merge branch 'MDL-38203' of git://github.com/timhunt/moodle 2013-08-20 11:28:39 +08:00
Dan Poltawski
57cb5f5afa Merge branch 'WIP-MDL-36044-master' of git://github.com/nadavkav/moodle 2013-08-20 11:07:53 +08:00
Dan Poltawski
54a868d3be Merge branch 'MDL-39236-master' of git://github.com/nadavkav/moodle 2013-08-20 10:59:31 +08:00
Dan Poltawski
9d66c2bb5b Merge branch 'MDL-39980' of git://github.com/timhunt/moodle 2013-08-20 10:47:45 +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