moodle/moodle
3
0
Fork 0
mirror of https://github.com/moodle/moodle.git synced 2025-08-06 01:16:44 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions
63837 commits 37 branches 540 tags 1.3 GiB
Commit graph

63837 commits

This branch
This branch
All branches
Author SHA1 Message Date
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
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
Adrian Greeve
db22e31b1e MDL-41231 - mod_data: Export to portfolio and delete selected now work together. 2013-08-20 11:28:09 +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
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
AMOS bot
943db9d438 Automatically generated installer lang files 2013-08-20 00:42:25 +00:00
Marina Glancy
5a3204d05b MDL-41222 Remove unnecessary course cache rebuild 2013-08-20 10:27:15 +10:00
Russell Smith
90048725b0 MDL-41291 cache: Use fread to avoid race conditions 2013-08-19 20:18:57 +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
Damyon Wiese
26ae471585 Merge branch 'MDL-40896' of git://github.com/timhunt/moodle 
Conflicts:
	theme/bootstrapbase/style/moodle.css
 2013-08-19 15:38:23 +08:00
Damyon Wiese
5ebe37fb27 Revert "MDL-41106 cache: several fixes for the session cache." 
This reverts commit 89182546a0.
This reverts commit 170b05362a.
This reverts commit 2e9d5a534e.
 2013-08-19 15:32:08 +08:00
Dan Poltawski
c3b087ccc3 Merge branch 'MDL-40893-master' of https://github.com/mr-russ/moodle 2013-08-19 14:50:01 +08:00
Damyon Wiese
3415e1ca59 Merge branch 'wip-MDL-41106-m26' of git://github.com/samhemelryk/moodle 2013-08-19 13:50:46 +08:00
Damyon Wiese
d51f9d5fd0 Merge branch 'wip-MDL-36789-master' of git://github.com/marinaglancy/moodle 2013-08-19 13:29:55 +08:00
Dan Poltawski
bee137b65a Merge branch 'MDL-39703_master' of https://github.com/nadavkav/moodle 2013-08-19 13:08:10 +08:00
Dan Poltawski
a945d48127 Merge branch 'master_MDL-37393' of github.com:danmarsden/moodle 2013-08-19 12:57:34 +08:00