mirror_php/moodle
1
0
Fork 0
mirror of https://github.com/moodle/moodle.git synced 2025-01-19 06:18:28 +01:00
Code Issues Projects Releases Wiki Activity
65,823 Commits 36 Branches 519 Tags
Commit Graph

65823 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
f29dcf642b Merge branch 'MDL-42212-master' of git://github.com/FMCorz/moodle 2014-01-06 10:30:31 +13:00
Sam Hemelryk
62b4ddc294 Merge branch 'MDL-42801-master' of git://github.com/andrewnicols/moodle 2014-01-06 10:19:20 +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
2dad31ecf9 MDL-43238 mod_assign: removed incorrect validation 2014-01-06 09:51:38 +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 Nicols
4e2c2c64bb MDL-36334 mod_scorm: Remove gallery-sm-treeview 
This has now been incorporated into core.
 2013-12-30 19:19:26 +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
Andrew Nicols
9b2ad813b8 MDL-42801 JavaScript: Fix dndupload to match actual style 2013-12-28 09:13:40 +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
Sam Hemelryk
bbb291b7b7 weekly release 2.7dev 2013-12-24 17:17:29 +13:00
Sam Hemelryk
a89ce43091 Merge branch 'install_master' of git://git.moodle.org/moodle-install 2013-12-24 17:17:26 +13:00
Sam Hemelryk
69f86e87a7 Merge branch 'wip-MDL-41788_master_3' of git://github.com/gjb2048/moodle 2013-12-24 12:52:22 +13: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
24bf5af4b7 Merge branch 'MDL-41246-master' of git://github.com/StudiUM/moodle 2013-12-24 11:41:48 +13:00
Sam Hemelryk
c5213d7e6e Merge branch 'MDL-43438-master' of git://github.com/FMCorz/moodle 2013-12-24 11:23:15 +13:00
Sam Hemelryk
ee70f10f99 Merge branch 'MDL-43250-master' of git://github.com/damyon/moodle 2013-12-24 10:36:22 +13:00
Sam Hemelryk
a92617fa3f Merge branch 'MDL-43410-master' of git://github.com/andrewnicols/moodle 2013-12-24 09:13:05 +13:00
AMOS bot
0632fd6cf2 Automatically generated installer lang files 2013-12-23 12:40:09 +00:00
AMOS bot
acd37edfbf Automatically generated installer lang files 2013-12-23 12:26:25 +00:00
Sam Hemelryk
6ac16bb981 Merge branch 'MDL-35032-master' of git://github.com/FMCorz/moodle 2013-12-23 15:58:04 +13:00
Sam Hemelryk
4a91dfdb08 Merge branch 'MDL-30195-master' of git://github.com/FMCorz/moodle 2013-12-23 14:34:35 +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
Eloy Lafuente (stronk7)
a6761e26e7 Merge branch 'MDL-43318-master' of git://github.com/damyon/moodle 2013-12-23 00:39:41 +01:00
Sam Hemelryk
0e7367a57e MDL-34182 js: fixed typo in ajaxException use 2013-12-23 09:54:57 +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
Damyon Wiese
edd9bb451c weekly release 2.7dev 2013-12-20 11:56:58 +08:00
Damyon Wiese
4cdae94e08 Merge branch 'install_master' of git://git.moodle.org/moodle-install 2013-12-20 11:56:54 +08:00
Damyon Wiese
997588195d MDL-43318 Assign: Fix bug when editing previous attempt feedback 2013-12-20 11:14:27 +08:00
Eloy Lafuente (stronk7)
1f73779156 MDL-42425 assign: keep already bumped version. 2013-12-20 03:40:58 +01:00
Eloy Lafuente (stronk7)
c7df8656be Revert "MDL-42425 modify mod_assign_save_grade to process advanced grading data" 
This reverts commit 29932b211287985c8e3235e52fc78782528309a2.

Conflicts:
	mod/assign/upgrade.txt
 2013-12-20 03:39:14 +01: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
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
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