moodle/moodle
3
0
Fork 0
mirror of https://github.com/moodle/moodle.git synced 2025-08-09 10:56:56 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions
67081 commits 37 branches 544 tags 1.3 GiB
Commit graph

18058 commits

Author SHA1 Message Date
Eloy Lafuente (stronk7)
c4edcce3ac Merge branch 'w52_MDL-43314_m27_floats' of https://github.com/skodak/moodle 2013-12-24 00:20:24 +01:00
Sam Hemelryk
946e770ede Merge branch 'MDL-43243-master' of git://github.com/andrewnicols/moodle 2013-12-24 11:56:01 +13:00
Sam Hemelryk
a92617fa3f Merge branch 'MDL-43410-master' of git://github.com/andrewnicols/moodle 2013-12-24 09:13:05 +13:00
Andrew Nicols
bd5b681a89 MDL-43302 JavaScript: Migrate moodle-form-passwordunmask to use Shifter 2013-12-23 16:40:28 +08:00
Andrew Nicols
193136ccd5 MDL-43490 JavaScript: Remove deprecated yui2_lib from 2.7 
This patch removes the deprecated yui2_lib from Moodle 2.7. It was
deprecated in Moodle 2.4.
 2013-12-23 15:36:47 +08:00
Andrew Nicols
2901378c36 MDL-43489 JavaScript: Remove deprecated js_gallery_module from 2.7 
This patch removes the deprecated js_gallery_module from Moodle 2.7. It was
deprecated well before Moodle 2.0.
 2013-12-23 15:27:50 +08:00
Aaron Barnes
832530e2eb MDL-43394 behat: Fix checkbox action 2013-12-23 15:40:06 +13:00
Sam Hemelryk
4cec4ee627 Merge branch 'w52_MDL-43367_m27_contextpath' of https://github.com/skodak/moodle 2013-12-23 14:31:58 +13:00
Rajesh Taneja
a55eaf0351 MDL-43293 Events: Added comments event in modules supporting comments 2013-12-23 09:22:14 +08:00
Andrew Nicols
ce4da4612e MDL-43323 JavaScript: Lazily load exception dependencies for tooltip 
Only load the exception-related dependencies for tooltip when required. In
normal situations they should not be required at all.
 2013-12-23 08:20:43 +08:00
Sam Hemelryk
5c7e16db54 Merge branch 'MDL-34182-master' of git://github.com/andrewnicols/moodle 2013-12-23 09:54:44 +13:00
Sam Hemelryk
8ca4f69539 Merge branch 'MDL-43325-master' of git://github.com/andrewnicols/moodle 
Conflicts:
	lib/yui/build/moodle-core-notification-dialogue/moodle-core-notification-dialogue-min.js
 2013-12-23 09:54:26 +13:00
Petr Škoda
404ecca376 MDL-43314 make float serialize consistent on all systems 
This should resolve problems with plugin version change detection.
 2013-12-22 16:06:29 +08:00
Petr Škoda
19dc3b0b0d MDL-43367 stop returning of bogus context children when path unknown 
This also prevents deletion of system context.
 2013-12-22 15:58:30 +08:00
Eloy Lafuente (stronk7)
9f9618fa69 Merge branch 'MDL-43404_master-move-fails-to-scenarios' of git://github.com/dmonllao/moodle 2013-12-20 02:58:12 +01: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
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
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
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
Sam Hemelryk
272e440090 Merge branch 'MDL-43235_master' of git://github.com/dmonllao/moodle 2013-12-18 11:19:34 +13:00
Sam Hemelryk
2df83c2ea8 Merge branch 'MDL-43355_master' of git://github.com/dmonllao/moodle 2013-12-18 10:52:41 +13: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
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
David Monllao
4415b667a4 MDL-43404 behat: Form change checker disabled when running behat 2013-12-17 18:39:31 +08:00
David Monllao
db3ecbd02a MDL-43404 behat: Removing auto accept_alert 2013-12-17 16:29:56 +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
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
0359fe71e2 Merge branch 'w51_MDL-43268_m27_filternotice' of https://github.com/skodak/moodle 2013-12-17 08:25:08 +13:00
Sam Hemelryk
21ad9a7921 Merge branch 'MDL-43240-master' of git://github.com/andrewnicols/moodle 2013-12-16 16:03:09 +13:00
Sam Hemelryk
d431ff1f51 Merge branch 'wip-mdl-21180' of https://github.com/rajeshtaneja/moodle 2013-12-16 15:44:15 +13:00
Rajesh Taneja
134c514be0 MDL-21180 Gradebook: Consistent handling of change in aggregation 
Change from/to GRADE_AGGREGATE_WEIGHTED_MEAN and GRADE_AGGREGATE_EXTRACREDIT_MEAN was only
handled prior to this patch. GRADE_AGGREGATE_SUM and GRADE_AGGREGATE_WEIGHTED_MEAN2 also
behave similar and should be handled same way
 2013-12-16 09:57:42 +08:00
Sam Hemelryk
c57864b76f Merge branch 'MDL-42965_master' of https://github.com/totara/openbadges 2013-12-16 13:47:57 +13:00
Yuliya Bozhko
455d13b7e4 MDL-40551 badges: Support fully deleting badges 2013-12-16 09:29:38 +13:00
David Monllao
e227cfe0e3 MDL-43235 behat: Ensure that behat_config_manager::get_config_file_contents() has always a behat_wwwroot 2013-12-13 14:20:03 +08:00
Andrew Nicols
f2c780d525 MDL-34182 AJAX: Change to use shared method when checking the siteadminbranch for invalid output 2013-12-13 14:10:04 +08:00
Andrew Nicols
af736f903d MDL-34182: Add functions to warn of output in AJAX scripts 
We need to be able to capture output when including contributed code as it
may add additional content which makes makes the json we output invalid.

We only warn of these errors if the site is in debugdeveloper, otherwise
we silently drop them.
 2013-12-13 14:10:04 +08:00
Petr Škoda
dbe0203ba8 MDL-42931 fix hardcoded PHP version tests for 2.7 2013-12-13 14:04:24 +08:00
Petr Škoda
60129d5d1f MDL-43213 try to simplify behat config and init code 
1/ always require 3 behat settings - $CFG->behat_wwwroot, $CFG->behat_dataroot and $CFG->behat_prefix
2/ cleanup init code
3/ do not require $CFG->wwwroot and $CFG->dataroot on test sites
4/ remove switch completely - the most confusing part for me
5/ print out behat_wwwwroot in init script so that you can test the test site manually
 2013-12-13 14:03:04 +08:00
Petr Škoda
ed67f462fe MDL-43268 fix filter notice when not in debug mode 2013-12-13 13:57:59 +08:00