moodle/moodle
3
0
Fork 0
mirror of https://github.com/moodle/moodle.git synced 2025-08-06 01:16:44 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions
65969 commits 37 branches 540 tags 1.3 GiB
Commit graph

65969 commits

This branch
This branch
All branches
Author SHA1 Message Date
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
Andrew Nicols
fd03a33c35 MDL-43270 JavaScript: Migrate moodle-course-dragdrop to use Shifter 2013-12-23 17:09:39 +08:00
Andrew Nicols
80c2d36007 MDL-43273 JavaScript: Migrate moodle-course-coursebase to use Shifter 2013-12-23 16:34:54 +08:00
Andrew Nicols
672ce80ea6 MDL-43271 JavaScript: Migrate moodle-course-formatchooser to use Shifter 2013-12-23 16:23:54 +08:00
Andrew Nicols
54a3dca258 MDL-43307 JavaScript: Migrate moodle-mod_assign-history to use Shifter 2013-12-23 16:18:10 +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
Sam Hemelryk
6ac16bb981 Merge branch 'MDL-35032-master' of git://github.com/FMCorz/moodle 2013-12-23 15:58:04 +13:00
Aaron Barnes
832530e2eb MDL-43394 behat: Fix checkbox action 2013-12-23 15:40:06 +13:00
Andrew Nicols
47281f7ede MDL-43411 JavaScript: Correct checks for section support to use helper function 2013-12-23 09:35:34 +08: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
Rajesh Taneja
cdfd607449 MDL-43293 Events: Added unit test for comment events 2013-12-23 09:22:15 +08: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
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
Tim Hunt
3d1c4e189e MDL-43448 Links to the gradebook not fixed on restore. 
Note we can only fix certain generic links, we can't handle ones like
/grade/report/{reportname}/index.php, but fortunately, we were only
using the generic ones.

I added a couple of other likely things too (badges and participants
list).
 2013-12-20 11:55:01 +00: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
Damyon Wiese
4a47008ca6 MDL-42585 Assign: Add capability to only view grades 
AMOS BEGIN
    CPY [viewgrades,grades],[assign:viewgrades,mod_assign]
AMOS END
 2013-12-20 11:01:44 +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 29932b2112.

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
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 e238b2cb92.
 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