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
65857 commits 37 branches 544 tags 1.3 GiB
Commit graph

17623 commits

Author SHA1 Message Date
Damyon Wiese
5490662ade Merge branch 'MDL-41690-master' of git://github.com/danpoltawski/moodle 
Conflicts:
	course/dnduploadlib.php
 2014-01-06 15:48:31 +08:00
Damyon Wiese
9f83e42fe3 Merge branch 'w01_MDL-36721_m27_passlog' of https://github.com/skodak/moodle 2014-01-06 14:52:56 +08:00
Dan Poltawski
73ee2fda6b MDL-41690 course: remove use of deprecated functions 2014-01-06 10:45:59 +08:00
Dan Poltawski
07e78d935f MDL-41690 cm_info: deprecate various properties 2014-01-06 10:45:59 +08:00
Sam Hemelryk
7c445ab8c0 Merge branch 'w01_MDL-43527_m27_safemode' of https://github.com/skodak/moodle 2014-01-06 14:46:31 +13:00
Sam Hemelryk
8e06909afd Merge branch 'w01_MDL-43528_m27_magic' of https://github.com/skodak/moodle 2014-01-06 14:19:11 +13:00
Sam Hemelryk
98f0074fc5 Merge branch 'MDL-31050_rss' of https://github.com/andyjdavis/moodle 2014-01-06 14:16:26 +13:00
Sam Hemelryk
61a79e01fc Merge branch 'MDL-40551_master' of https://github.com/totara/openbadges 
Conflicts:
	badges/upgrade.txt
 2014-01-06 12:00:11 +13:00
Sam Hemelryk
a9bd004c8c Merge branch 'MDL-35973_redirect' of https://github.com/andyjdavis/moodle 2014-01-06 11:28:34 +13:00
Sam Hemelryk
9b94e327d3 Merge branch 'MDL-43281-master' of git://github.com/andrewnicols/moodle 2014-01-06 11:22:29 +13:00
Sam Hemelryk
dfed81ae12 Merge branch 'MDL-36334-master' of git://github.com/andrewnicols/moodle 2014-01-06 09:53:15 +13:00
Sam Hemelryk
7404bfd003 Merge branch 'w01_MDL-43196_m27_signupfiles' of https://github.com/skodak/moodle 2014-01-06 09:11:32 +13:00
Rajesh Taneja
184afb6b73 MDL-43238 events: Added event other information in event php doc block 2014-01-03 15:03:48 +08:00
Andrew Davis
6c90c5cae2 MDL-31050 rss: removed some unused function parameters and removed some low value comments 2014-01-02 10:35:14 +08:00
Petr Škoda
3e5226ab6e MDL-43528 remove all traces of magic quotes hacking from moodle core 2014-01-02 10:15:06 +08:00
Petr Škoda
90627d9d59 MDL-43527 eliminate last references to safe_mode 
Safe mode is not availabel in PHP 5.4 any more...
 2014-01-02 09:23:15 +08:00
Andrew Nicols
9edca1ae42 MDL-36334 Libraries: Add version gallery-2013.10.02-20-26 of specified gallery modules 
We currently only include:
* gallery-sm-treeview*
 2013-12-30 19:19:26 +08:00
Andrew Nicols
5b49f8b3a8 MDL-36334 JavaScript: Enable access to the gallery 2013-12-30 19:19:26 +08:00
Andrew Davis
e3288953e7 MDL-35973 lib: added a page title to redirect() and added 2 seconds to the page redirection when posting in a forum 2013-12-30 18:26:24 +08:00
Andrew Nicols
1cce5dfb9a MDL-43281 Blocks: Retrieve a newly created block after creating it 
Although we were previously creating the DOM markup for a block region if
it did not exist, we were not making use of it.

This change ensures that we make use of that block region as part of the
blocks code.
 2013-12-30 14:15:32 +08:00
Petr Škoda
914499a340 MDL-36721 do not store passwords in config logs 2013-12-27 11:17:45 +08:00
Petr Škoda
f540cfe99e MDL-43196 do not load file management for guests and when not managing files 2013-12-27 11:11:55 +08:00
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
Sam Hemelryk
4cec4ee627 Merge branch 'w52_MDL-43367_m27_contextpath' of https://github.com/skodak/moodle 2013-12-23 14:31:58 +13: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