Dan Poltawski
eab9fa0ef1
Merge branch 'MDL-41198-master' of https://github.com/mr-russ/moodle
2013-12-18 14:40:18 +08:00
Rajesh Taneja
fc832a4882
MDL-43437 wiki: Fixed unit test for page_version_deleted event
2013-12-18 13:56:44 +08:00
Russell Smith
33766d3361
MDL-41198 lib: Add comment about the changes to srand on adodb
2013-12-18 16:48:41 +11:00
Russell Smith
038f546777
MDL-41198 lib: Allow PHP to generate random seed on script start
...
Most srand instances are removed to allow PHP to do the work.
srand was left for group randomization due to the method used.
2013-12-18 16:45:34 +11:00
Russell Smith
ce2add5c90
MDL-41198 lib: Allow PHP to generate random seed on script start
...
All mt_srand instances are removed to allow PHP to do the work.
2013-12-18 16:45:33 +11:00
Andrew Nicols
af4d19abfb
MDL-43410 JavaScript: Stop event propagation when opening the action menu
...
In certain situations, the click event is propagated through to the
hideIfOutside and immediately closes the menu.
This happens when blocks are dock for example.
2013-12-18 11:44:43 +08:00
Sam Hemelryk
2415e85716
Merge branch 'MDL-43241-master' of git://github.com/andrewnicols/moodle
2013-12-18 16:26:35 +13:00
Andrew Nicols
a4582a51a4
MDL-43241 JavaScript: Deprecate findChildNodes
2013-12-18 10:53:52 +08:00
Eloy Lafuente (stronk7)
f77233dfaa
Merge branch 'MDL-43404_master' of git://github.com/dmonllao/moodle
2013-12-18 02:24:08 +01:00
Eloy Lafuente (stronk7)
bb0746c985
Merge branch 'MDL-41292-master' of git://github.com/mr-russ/moodle
2013-12-18 02:23:08 +01:00
Eloy Lafuente (stronk7)
5d2667fa07
Merge branch 'MDL-40920_master' of https://github.com/markn86/moodle
2013-12-18 00:13:15 +01:00
Sam Hemelryk
272e440090
Merge branch 'MDL-43235_master' of git://github.com/dmonllao/moodle
2013-12-18 11:19:34 +13:00
Eloy Lafuente (stronk7)
1f71f7685a
Merge branch 'MDL-43025-master' of git://github.com/damyon/moodle
2013-12-17 22:58:51 +01:00
Sam Hemelryk
2df83c2ea8
Merge branch 'MDL-43355_master' of git://github.com/dmonllao/moodle
2013-12-18 10:52:41 +13:00
Eloy Lafuente (stronk7)
438e799f42
Merge branch 'wip-mdl-43311' of https://github.com/rajeshtaneja/moodle
2013-12-17 22:33:51 +01:00
Sam Hemelryk
adfcdcb027
Merge branch 'w51_MDL-43213_m27_simplebehat' of https://github.com/skodak/moodle
2013-12-18 10:30:30 +13:00
Sam Hemelryk
37f59a68bd
Merge branch 'MDL-41359-master' of https://github.com/mr-russ/moodle
2013-12-18 10:08:33 +13:00
Sam Hemelryk
9b4c44c8e6
Merge branch 'MDL-43074-master' of git://github.com/damyon/moodle
2013-12-18 09:59:05 +13:00
Sam Hemelryk
04102046ef
Merge branch 'MDL-43272-master' of git://github.com/andrewnicols/moodle
2013-12-18 09:55:04 +13:00
Sam Hemelryk
bf6529bbd4
Merge branch 'MDL-43234-master' of git://github.com/andrewnicols/moodle
...
Conflicts:
lib/yui/build/moodle-core-notification-dialogue/moodle-core-notification-dialogue-min.js
2013-12-18 09:53:02 +13:00
Sam Hemelryk
5be3d8d329
Merge branch 'MDL-38698-master' of git://github.com/FMCorz/moodle
2013-12-18 09:21:50 +13:00
David Monllao
4415b667a4
MDL-43404 behat: Form change checker disabled when running behat
2013-12-17 18:39:31 +08:00
Eloy Lafuente (stronk7)
0fb4218dad
Merge branch 'MDL-43306-master' of git://github.com/danpoltawski/moodle
2013-12-17 10:29:25 +01:00
David Monllao
db3ecbd02a
MDL-43404 behat: Removing auto accept_alert
2013-12-17 16:29:56 +08:00
Frederic Massart
850db41832
MDL-38698 filter_urltolink: Remove performance test in Unit Test
2013-12-17 07:03:02 +01:00
Frederic Massart
e15878798a
MDL-38698 filter_urltolink: Do not link the URL property of CSS
2013-12-17 06:58:22 +01:00
Marina Glancy
2280ad064d
Merge branch 'MDL-37679-master' of git://github.com/phalacee/moodle
2013-12-17 16:37:19 +11:00
Marina Glancy
9cba0f8981
Merge branch 'wip-MDL-43295-master' of git://github.com/abgreeve/moodle
2013-12-17 16:35:31 +11:00
Jason Fowler
761c5fc274
MDL-37679 Course: Adding section name to page title
2013-12-17 11:42:01 +08:00
Sam Hemelryk
233e6b985b
Merge branch 'MDL-43259-master' of git://github.com/andrewnicols/moodle
...
Conflicts:
lib/upgrade.txt
2013-12-17 16:32:35 +13:00
Sam Hemelryk
ca3b2c9bcc
Merge branch 'MDL-38832-master' of git://github.com/danpoltawski/moodle
2013-12-17 16:20:34 +13:00
Adrian Greeve
fb59d5352a
MDL-43295 mod_assign: Removed wrongly used format_text call in online text submission.
2013-12-17 10:42:20 +08:00
Marina Glancy
f3de94d340
Merge branch 'MDL-41075-master-3' of git://github.com/mouneyrac/moodle
2013-12-17 11:23:43 +11:00
Sam Hemelryk
9d771f9529
Merge branch 'MDL-39725_analyze' of https://github.com/mr-russ/moodle
...
Conflicts:
lib/dml/moodle_database.php
2013-12-17 09:31:19 +13:00
Sam Hemelryk
2b88fa0c90
Merge branch 'MDL-25473-master' of git://github.com/phalacee/moodle
2013-12-17 08:54:33 +13:00
Sam Hemelryk
bb4551334f
Merge branch 'MDL-34321-master' of git://github.com/phalacee/moodle
2013-12-17 08:48:08 +13:00
Sam Hemelryk
2b08f90aca
Merge branch 'MDL-36984-master' of git://github.com/phalacee/moodle
2013-12-17 08:45:05 +13:00
Sam Hemelryk
0359fe71e2
Merge branch 'w51_MDL-43268_m27_filternotice' of https://github.com/skodak/moodle
2013-12-17 08:25:08 +13:00
Frederic Massart
4c29120354
MDL-30195 portfolio_googledocs: Allow export of rich HTML
2013-12-16 11:02:10 +01:00
Andrew Nicols
052d64a478
MDL-43322 JavaScript: Correct cache-base entry in base rollup
2013-12-16 16:59:11 +08:00
Jerome Mouneyrac
8e4b9a45b1
MDL-43399 Badge: the Choose... option can still be selected once a role is choosen.
2013-12-16 14:33:02 +08:00
Frederic Massart
545b310c84
MDL-42212 mod_lesson: Use autoloading for mod_lesson_file_info
2013-12-16 07:03:46 +01:00
Frederic Massart
89133afae6
MDL-42212 mod_lesson: Localise area names
2013-12-16 06:49:05 +01:00
Frederic Massart
b47dc5ffea
MDL-42212 mod_lesson: Fix callbacks retrieving activity files
2013-12-16 06:49:05 +01:00
Jerome Mouneyrac
97b659a13f
MDL-41075 Remove "Choose..." option from participants page.
2013-12-16 12:07:33 +08:00
Andrew Nicols
9a45ac14f0
MDL-43322 JavaScript: Include moodle-core-popuphelp in the mcore rollup
...
moodle-core-popuphelp is used on every page in Moodle, so it should be
included in the rollup by default to save a request each time.
2013-12-16 16:14:26 +13:00
Sam Hemelryk
21ad9a7921
Merge branch 'MDL-43240-master' of git://github.com/andrewnicols/moodle
2013-12-16 16:03:09 +13:00
Damyon Wiese
f268fb5d20
MDL-43250 Assign: separate groups mode fix
...
When in separate groups mode, only get graders in a group that is in the course module grouping.
2013-12-16 10:54:38 +08:00
Sam Hemelryk
9f5b319345
Merge branch 'MDL-34432-master' of git://github.com/damyon/moodle
2013-12-16 15:46:56 +13:00
Sam Hemelryk
d431ff1f51
Merge branch 'wip-mdl-21180' of https://github.com/rajeshtaneja/moodle
2013-12-16 15:44:15 +13:00
