Commit graph

67793 commits

Author SHA1 Message Date
Damyon Wiese
390365e696 Merge branch 'MDL-44936-master' of git://github.com/FMCorz/moodle 2014-04-14 11:38:46 +08:00
Dan Poltawski
e3c18e1e62 Merge branch 'w16_MDL-44366_m27_filtergloss' of https://github.com/skodak/moodle 2014-04-14 10:53:56 +08:00
Damyon Wiese
313ae82ec0 Merge branch 'MDL-44844-master' of git://github.com/andrewnicols/moodle 2014-04-14 10:32:00 +08:00
Damyon Wiese
a4b2e65c7d Merge branch 'w16_MDL-44910_m27_logupgrade' of https://github.com/skodak/moodle 2014-04-14 10:14:47 +08:00
Dan Poltawski
8f6b4739de Merge branch 'MDL-45048-master' of git://github.com/FMCorz/moodle 2014-04-14 10:01:11 +08:00
Damyon Wiese
f8a8610be4 MDL-45009 Tex filter: Add \( \) delimiters for 1:1 compatibility with MathJax 2014-04-14 09:57:19 +08:00
Petr Škoda
6b7da257af MDL-45070 relax the mariaDB version checker to work with long Ubuntu versions
Example of Ubuntu version: 5.5.5-10.0.10-MariaDB-1~saucy-log
2014-04-14 09:44:45 +08:00
Petr Škoda
5d2abe72a2 MDL-44910 enable new logging during upgrade and installation
The legacy logging is now enabled for reading only
if legacy log data older than one day exists.
2014-04-14 09:43:40 +08:00
Petr Škoda
1e83288de7 MDL-44366 improve glossary filter performance
This should have when there are no glossaries in course or
when there are no linked entries in existing glossaries.
2014-04-14 09:42:40 +08:00
Petr Škoda
86286bdb7e MDL-44366 bump up glossary and filter version 2014-04-14 09:42:40 +08:00
Petr Škoda
37625e2abb MDL-44366 rework glossary filter caching 2014-04-14 09:42:39 +08:00
Dan Poltawski
069fe267b6 Moodle release 2.7beta 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
Jetha Chan
cee8be6325 MDL-44951 theme_bootstrapbase: forum post css tweaks
Adjusted forum post CSS for cleaner appearance.
2014-04-11 14:40:54 +08:00
Dan Poltawski
34f7e31ffb Merge branch 'MDL-40063_master' of https://github.com/markn86/moodle 2014-04-11 14:31:27 +08:00
Adrian Greeve
0ee4ccb636 MDL-43719 tags: Fix the sql statement in the tag management page.
MSSQL and Oracle require that all fields in teh select also be present
in the group by section.
2014-04-11 13:54:54 +08:00
Ankit Agarwal
3610ad436c MDL-45035 events: Fix @package and @since tags in Moodle 2.7 events 2014-04-11 13:45:33 +08:00
James Pratt
f4555f88c8 MDL-45003 qtype numeric : classify invalid response as no response. 2014-04-11 12:41:23 +07:00
Ankit Agarwal
9638600bbb MDL-45035 events: Fix @package and @since tags in Moodle 2.6 events 2014-04-11 13:32:33 +08:00
Dan Poltawski
9d1eed69a0 Merge branch 'MDL-44981-master' of git://github.com/jamiepratt/moodle 2014-04-11 13:01:38 +08:00
Damyon Wiese
2e8cbbb3ac MDL-44826 Atto: Remove most of the image alignment options
Just keep the simple ones and put some default padding on images.
2014-04-11 12:55:28 +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
Frederic Massart
eddc1461f8 MDL-44936 csslib: Chunking supports @media queries and commas in rules 2014-04-11 12:05:00 +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 3a6511a530.

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
Jetha Chan
efbcbd5e46 MDL-45040 editor-atto: selection reverts erroneously
Fixed an issue where selections reverted on toolbar button press when the last selection was made by dragging outside of Atto.
2014-04-10 18:06:47 +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