65985 Commits

Author SHA1 Message Date
Gareth J Barnard
ce65578510 MDL-41788 theme_bootstrapbase: Custom menus - sub-menus breaking. 2013-12-19 12:08:50 +00:00
David Monllao
f49cede794 MDL-43404 behat: Avoid failures at framework level as much as possible
- Move them to i_look_for_exceptions() so they will be
  thrown at a step (scenario) level.
- Accept alerts only when they are detected to avoid
  all the following scenarios to be failing; they would
  continue executing, but they will all fail if the alert
  is still there
- Add a step to avoid add_scorm.feature to fail
- Refine the UnknownError catch
2013-12-19 15:48:03 +08:00
Frederic Massart
19c70231f9 MDL-43454 mod_assignment: Use of undefined constants FILE_* 2013-12-19 07:21:04 +01:00
David Monllao
f46e869ddf MDL-43213 behat: Moving permissions setting before any use of them 2013-12-19 13:47:46 +08:00
Petr Skoda
9bb80d2005 MDL-43213 fix init regression and remove $checkphp parameter 2013-12-19 13:11:25 +08:00
Sam Hemelryk
a0e1168751 Merge branch 'MDL-42965_master' of https://github.com/totara/openbadges 2013-12-19 16:12:46 +13:00
Dan Poltawski
70f1ddba87 Merge branch 'wip-mdl-43437' of https://github.com/rajeshtaneja/moodle 2013-12-19 10:56:41 +08:00
Damyon Wiese
76dc48cb6a MDL-34432 Assign: Set up the commentinline form element properly. 2013-12-19 09:40:14 +08:00
Eloy Lafuente (stronk7)
f03671d87e Revert "MDL-43306 restore: fix grade item sortorder restoration"
This reverts commit e238b2cb928a1024b766032549168d04062a970c.
2013-12-19 02:13:05 +01:00
AMOS bot
f70a614ef1 Automatically generated installer lang files 2013-12-19 00:44:14 +00:00
Eloy Lafuente (stronk7)
c751d81bbc Merge branch 'MDL-42425' of https://github.com/Lightwork-Marking/moodle
Conflicts:
	mod/assign/upgrade.txt
2013-12-19 01:37:57 +01:00
Yuliya Bozhko
acfe72293f MDL-42965 badges: Fix empty string comparison for Oracle 2013-12-19 10:26:44 +13:00
Paul Charsley
29932b2112 MDL-42425 modify mod_assign_save_grade to process advanced grading data 2013-12-19 09:39:22 +13:00
Jean-Philippe Gaudreau
353643d33f MDL-41246 cache: Fix PHP notice of non well formed numeric values for the memcache store 2013-12-18 08:52:08 -05:00
Frederic Massart
4550e762f4 MDL-43438 mod_assignment: Prevent double inclusion of plugin files 2013-12-18 09:13:47 +01:00
David Monllao
48ca887cc1 MDL-43235 behat: Remove notice about undeclared var 2013-12-18 16:02:02 +08:00
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