Commit graph

62993 commits

Author SHA1 Message Date
Sam Hemelryk
49c7794dcf Merge branch 'MDL-41082-master' of git://github.com/FMCorz/moodle 2013-08-13 10:16:14 +12:00
Sam Hemelryk
717d68544d Merge branch 'MDL-41004-master' of git://github.com/sammarshallou/moodle 2013-08-13 09:46:17 +12:00
Sam Hemelryk
acf6a06d5e Merge branch 'master_MDL-40773' of git://github.com/danmarsden/moodle 2013-08-13 09:45:03 +12:00
Sam Hemelryk
0ade13532b Merge branch 'MDL-39691' of git://github.com/jmvedrine/moodle 2013-08-13 09:41:27 +12:00
Sam Hemelryk
defb89c30c Merge branch 'MDL-41091' of git://github.com/timhunt/moodle 2013-08-13 09:38:40 +12: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
6648f17384 Merge branch 'wip-MDL-41114-master' of git://github.com/marinaglancy/moodle 2013-08-13 09:32:48 +12:00
Sam Hemelryk
bbf434b639 Merge branch 'MDL-41050-master' of git://github.com/sammarshallou/moodle 2013-08-13 09:27:50 +12:00
Sam Hemelryk
23b7f1dfcf Merge branch 'MDL-41033' of git://github.com/rwijaya/moodle 2013-08-13 09:24:12 +12:00
Sam Hemelryk
61f2c458d5 Merge branch 'MDL-40711-master' of git://github.com/ankitagarwal/moodle 2013-08-13 09:12:24 +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
761b48df59 Merge branch 'MDL-40996' of git://github.com/timhunt/moodle 2013-08-13 09:08:15 +12:00
Sam Hemelryk
cd0103fa60 Merge branch 'MDL-40673_master' of git://github.com/dmonllao/moodle 2013-08-13 09:03:45 +12:00
Sam Hemelryk
f37d53296d Merge branch 'wip-MDL-40871-master' of git://github.com/abgreeve/moodle 2013-08-13 08:57:15 +12:00
Sam Hemelryk
1e6ac6957e Merge branch 'MDL-30895-master' of https://github.com/mouneyrac/moodle 2013-08-13 08:45:43 +12:00
Sam Hemelryk
3ad7a71e1f NOBUG: fixed whitespace 2013-08-13 08:41:09 +12:00
Sam Hemelryk
8fa5ad6212 Merge branch 'MDL-35931-master' of git://github.com/phalacee/moodle 2013-08-13 08:38:33 +12:00
Sam Hemelryk
97907a85f1 Merge branch 'MDL-35919-master' of git://github.com/phalacee/moodle 2013-08-13 08:36:01 +12:00
Sam Hemelryk
8e9709f8bf Merge branch 'MDL-35934' of git://github.com/rwijaya/moodle 2013-08-13 08:33:12 +12:00
Frederic Massart
0528361cc1 MDL-39954 event: Changing get_legacy_eventname to public static 2013-08-12 17:35:30 +08:00
Frederic Massart
3785358d47 MDL-39954 event: Delocalise get_description 2013-08-12 17:35:30 +08:00
Frederic Massart
b3fbd91805 MDL-39954 assignment_upload: Replacing old-style event_trigger 2013-08-12 17:35:29 +08:00
Frederic Massart
523698dc4c MDL-39954 assignment_online: Replacing old-style event_trigger 2013-08-12 17:35:29 +08:00
Frederic Massart
cbf4b0e6f6 MDL-39954 mod_workshop: Log method can return array of parameters 2013-08-12 17:35:29 +08:00
Frederic Massart
62b3b99784 MDL-39954 mod_forum: Replacing old-style events_trigger 2013-08-12 17:35:29 +08:00
Frederic Massart
7dceb50057 MDL-39954 assignsubmission_onlinetext: Replacing old-style events_trigger 2013-08-12 17:35:28 +08:00
Frederic Massart
e3d2d06480 MDL-39954 assignsubmission_file: Replacing old-style events_trigger 2013-08-12 17:35:28 +08:00
Tim Hunt
e2b388c1a4 MDL-39507 questions: fix pluginfile URLs before format_text.
This commit build's on Jean-Michel's work, tidying up a few lose ends.
2013-08-12 10:32:02 +01:00
Dan Poltawski
88ce8a1cb0 Merge branch 'MDL-27655' of git://github.com/timhunt/moodle 2013-08-12 16:41:29 +08:00
Frederic Massart
a04cbf61c8 MDL-39954 mod_assign: Replace old-style event assessable_submitted 2013-08-12 16:26:41 +08:00
Frederic Massart
caa06f4b45 MDL-39954 mod_assign: add_to_log can return an array of parameters 2013-08-12 16:26:41 +08:00
Frederic Massart
e185f72d58 MDL-39954 core: Abstract event assessable_submitted & assessable_uploaded 2013-08-12 16:26:41 +08:00
Dan Poltawski
e64f5d367a Merge branch 'MDL-30001' of git://github.com/jmvedrine/moodle 2013-08-12 15:54:53 +08:00
Dan Poltawski
7064ef523b Merge branch 'wip-mdl-40044' of git://github.com/rajeshtaneja/moodle 2013-08-12 14:27:35 +08:00
Dan Poltawski
cb1268b109 Merge branch 'MDL-41068' of https://github.com/mr-russ/moodle 2013-08-12 13:42:41 +08:00
Dan Poltawski
df8cd014be Merge branch 'w33_MDL-41019_m26_langcaches' of https://github.com/skodak/moodle 2013-08-12 13:29:17 +08:00
Dan Poltawski
f8f6dbc37d Merge branch 'MDL-22236-master' of git://github.com/damyon/moodle 2013-08-12 13:27:50 +08:00
Jason Fowler
baffb422e6 MDL-35919 - Activity Chooser - Adding Aria attributes to improve accessibility 2013-08-12 13:18:57 +08:00
Marina Glancy
a7a04f6d62 MDL-41114 Avoid unnecessary retrieving of coursecat from DB
- course category depth can be estimated in make_categories_options() by the number of separators
2013-08-12 15:07:46 +10:00
Rossiani Wijaya
1b25169215 MDL-35934 Filemanager: change the set attribute to use setAttribute() instead of YUI set(). 2013-08-12 12:28:03 +08:00
Dan Poltawski
f2b45ad65f Merge branch 'MDL-36002-master' of git://github.com/damyon/moodle
Conflicts:
	theme/base/style/core.css
	theme/bootstrapbase/style/moodle.css
2013-08-12 11:56:37 +08:00
Damyon Wiese
873482fe9b MDL-22236 webservice upload files: Update unit tests 2013-08-12 10:38:30 +08:00
Sam Hemelryk
d3fb29877e Merge branch 'w33_MDL-41086_m26_upgradecheck' of https://github.com/skodak/moodle 2013-08-12 14:23:10 +12:00
Sam Hemelryk
63106eae7f Merge branch 'w33_MDL-41073_m26_needsupgrade' of https://github.com/skodak/moodle 2013-08-12 14:03:30 +12:00
Sam Hemelryk
8b7378cff0 Merge branch 'MDL-22236-master' of git://github.com/damyon/moodle
Conflicts:
	version.php
2013-08-12 12:11:07 +12:00
Sam Hemelryk
61bec33f53 Merge branch 'MDL-31487' of git://github.com/timhunt/moodle 2013-08-12 11:02:48 +12:00
Sam Hemelryk
45f133884e Merge branch 'MDL-36005-master' of git://github.com/damyon/moodle
Conflicts:
	version.php
2013-08-12 10:38:06 +12:00
Sam Hemelryk
1f0608ed34 MDL-31836 moodlelib: removed legacy encryptkey support 2013-08-12 10:26:01 +12:00
Marina Glancy
e4008e9db5 MDL-41114 Speeding up course listings on large sites
- function coursecat::make_categories_list() does not use retrieved contexts and has to query them again.
- /course/manage.php uses field coursecat:: that was not fetched when retrieving the course category children.
2013-08-11 21:58:12 +10:00
Petr Škoda
598a82c950 MDL-41019 improve language caching
Includes:
* no more hacky reloads, everything is written only once and kept until cache reset
* lang menu list is now cached in MUC
* both string and lang menu caches are compatible with local caches on cluster nodes
* config-dist.php cleanup
2013-08-11 09:52:34 +02:00