mirror_php/moodle
1
0
Fork 0
mirror of https://github.com/moodle/moodle.git synced 2025-01-19 14:27:22 +01:00
Code Issues Projects Releases Wiki Activity
67,665 Commits 36 Branches 519 Tags
Commit Graph

67665 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Dan Poltawski
8f6b4739de Merge branch 'MDL-45048-master' of git://github.com/FMCorz/moodle 2014-04-14 10:01:11 +08:00
Dan Poltawski
069fe267b6 Moodle release 2.7beta v2.7.0-beta 2014-04-11 17:42:43 +08:00
Dan Poltawski
97c274ded7 MDL-40063/MDL-45057 quiz: disable related unit tests 
I kept the commit number format same as the last commit just
to annoy Fred.
 2014-04-11 17:36:40 +08:00
Dan Poltawski
c5e5f1b786 MDL-40063/MDL-45057 quiz: disable firing of override events 
This hacky solution is brought to you by the the motivation to
release.
 2014-04-11 16:58:10 +08:00
Frederic Massart
cf7a50b28e MDL-45048 repository_wikimedia: Abusing usage of optional_param 
The optional_param call was moved outside of the constructor
because it was called every time the repository would be initialised.
That was leading to problems when the parameter was defined from
another form and not complying with its expected type.
 2014-04-11 15:19:48 +08:00
Dan Poltawski
34f7e31ffb Merge branch 'MDL-40063_master' of https://github.com/markn86/moodle 2014-04-11 14:31:27 +08:00
Dan Poltawski
9d1eed69a0 Merge branch 'MDL-44981-master' of git://github.com/jamiepratt/moodle 2014-04-11 13:01:38 +08:00
Dan Poltawski
d6a756a949 Merge branch 'MDL-44980-master-v2' of git://github.com/jamiepratt/moodle 2014-04-11 12:55:15 +08:00
Dan Poltawski
8a69b046e5 Merge branch 'wip-MDL-45038-master' of git://github.com/marinaglancy/moodle 2014-04-11 12:48:14 +08:00
Mark Nelson
9d65d3e70b MDL-40063 mod_quiz: created 'override_created' events 2014-04-10 20:42:44 -07:00
Mark Nelson
e8365f27e5 MDL-40063 mod_quiz: replaced ‘manualgrade’ add_to_log call with an event 2014-04-10 20:42:24 -07:00
Mark Nelson
a2caf56dff MDL-40063 mod_quiz: replaced 'attempt' add_to_log call with an event 2014-04-10 20:41:56 -07:00
Mark Nelson
45e1e3bd76 MDL-40063 mod_quiz: replaced 'preview' add_to_log call with an event 2014-04-10 20:41:54 -07:00
Mark Nelson
e0114708af MDL-40063 mod_quiz: replaced 'continue attempt' add_to_log call with an event 2014-04-10 20:41:39 -07:00
Mark Nelson
8de2eb3582 MDL-40063 mod_quiz: replaced 'delete override' add_to_log call with events 2014-04-10 20:41:09 -07:00
Mark Nelson
e7d80a059a MDL-40063 mod_quiz: replaced 'edit override' add_to_log call with events 2014-04-10 20:40:51 -07:00
Mark Nelson
68758eff12 MDL-40063 mod_quiz: removed 'close attempt' add_to_log call 2014-04-10 20:40:27 -07:00
Mark Nelson
60ab03eb10 MDL-40063 mod_quiz: replaced 'view summary' add_to_log call with an event 2014-04-10 20:40:25 -07:00
Mark Nelson
2a3f82041f MDL-40063 mod_quiz: replaced 'review' add_to_log call with an event 2014-04-10 20:40:13 -07:00
Dan Poltawski
af8a43248e weekly release 2.7dev 2014-04-11 11:39:56 +08:00
Mark Nelson
2ec79ad996 MDL-40063 mod_quiz: replaced 'report' add_to_log call with an event 2014-04-10 20:39:56 -07:00
Dan Poltawski
ea1be84468 NOBUG: Fixed file access permissions 2014-04-11 11:39:56 +08:00
Dan Poltawski
f940d3ad6d Merge branch 'install_master' of https://git.in.moodle.com/amosbot/moodle-install 2014-04-11 11:39:52 +08:00
Mark Nelson
7dad3d95fd MDL-40063 mod_quiz: replaced 'delete attempt' add_to_log call with an event 2014-04-10 20:39:15 -07:00
Mark Nelson
58940b190a MDL-40063 mod_quiz: replaced 'addcategory' add_to_log call with an event 2014-04-10 20:38:34 -07:00
Mark Nelson
5e8f736565 MDL-40063 mod_quiz: replaced 'editquestions' add_to_log call with an event 2014-04-10 20:34:27 -07:00
Mark Nelson
b332fc6c8c MDL-40063 mod_quiz: replaced 'view' and 'view all' add_to_log calls with events 2014-04-10 20:34:14 -07:00
Damyon Wiese
7b28067413 Revert "MDL-44758 editor-atto: prevent table-in-table creation" 
This reverts commit 3a6511a530015813f7bfda5547f8fc9de750efcf.

Conflicts:
	lib/editor/atto/plugins/table/yui/build/moodle-atto_table-button/moodle-atto_table-button-debug.js
	lib/editor/atto/plugins/table/yui/build/moodle-atto_table-button/moodle-atto_table-button-min.js
	lib/editor/atto/plugins/table/yui/build/moodle-atto_table-button/moodle-atto_table-button.js
	lib/editor/atto/plugins/table/yui/src/button/js/button.js
 2014-04-11 09:47:57 +08:00
AMOS bot
375aa96db0 Automatically generated installer lang files 2014-04-10 22:38:35 +00:00
Marina Glancy
58d113934d MDL-45038 modinfo: added property section_info::modinfo 2014-04-10 20:26:25 +08:00
Juan Leyva
ad5a8cd6a2 MDL-44342 air notifier: Fixied checking for empty values in event object 2014-04-10 17:34:14 +08:00
Juan Leyva
6acfacfa9a MDL-44342 airnotifier: Added new functions to the Mobile service 2014-04-10 17:34:03 +08:00
Dan Poltawski
e5d3f6ea26 Merge branch 'MDL-44868-master-fixup' of git://github.com/FMCorz/moodle 
Conflicts:
	lib/editor/atto/yui/build/moodle-editor_atto-editor/moodle-editor_atto-editor-min.js
 2014-04-10 14:51:42 +08:00
Rajesh Taneja
0adadbf00b MDL-44070 core_completion: Removed unwanted tag 2014-04-10 14:28:28 +08:00
Frederic Massart
5e543b4f76 MDL-44868 editor_atto: Remember the last focused button in the toolbar 2014-04-10 14:22:10 +08:00
Damyon Wiese
5582fe49cc MDL-44170 LTI - fix unit tests. 2014-04-10 14:15:02 +08:00
Dan Poltawski
c8d940a5a6 Merge branch 'MDL-44927-master-fix2' of https://github.com/damyon/moodle 2014-04-10 14:09:15 +08:00
Damyon Wiese
5f5d4e9e69 Merge branch 'MDL-44170-master' of https://github.com/adrianfish/moodle 2014-04-10 13:33:50 +08:00
Damyon Wiese
92810c07f7 MDL-44927 Atto: Fix bad merge of MDL-44760 (missing menu entry) 2014-04-10 13:26:03 +08:00
Damyon Wiese
0734383d63 MDL-44342 Airnotifier: Bug in retrieving user prefs (fixes fail in unit test) 2014-04-10 13:16:40 +08:00
Juan Leyva
2bb01d13cb MDL-44342 airnotifier: Change default Airnotifier url to use SSL 
This commit include also a fix for checking forced settings
 2014-04-10 09:25:32 +08:00
Sam Hemelryk
8abf605ee1 Merge branch 'MDL-44760-master-2' of https://github.com/andrewnicols/moodle 2014-04-10 09:26:07 +12:00
sam marshall
3e9c7420d3 MDL-44070 Behat: Fixed restrict_activity_by_date.feature 2014-04-09 17:51:59 +02:00
Rajesh Taneja
ae90dec5c2 MDL-44070 core_completion: Fixed behat 2014-04-09 14:24:55 +02:00
Dan Poltawski
1a1949437b Merge branch 'MDL-43856-master-fix1' of https://github.com/damyon/moodle 2014-04-09 17:37:24 +08:00
Damyon Wiese
16ad61bf55 MDL-43856 MathJax: Delay setting of lang until after MathJax startup 2014-04-09 16:44:40 +08:00
Damyon Wiese
21fd2384de Merge branch 'wip-MDL-40843-fix' of git://github.com/marinaglancy/moodle 2014-04-09 15:44:39 +08:00
Mark Nelson
f68fee244a MDL-42462 mod_feedback: added $OUTPUT to list of global variables used to avoid error 2014-04-09 15:37:21 +08:00
Dan Poltawski
8921c6c0c2 Merge branch 'MDL-42195-master-fix2' of https://github.com/damyon/moodle 2014-04-09 15:32:30 +08:00
Marina Glancy
488bbfb720 MDL-40843 chat: fixed bug in SQL query in recent activity block 2014-04-09 15:31:49 +08:00