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

18076 commits

Author SHA1 Message Date
Marina Glancy
81e50a3661 Merge branch 'MDL-44316_master' of git://github.com/markn86/moodle 2014-03-25 14:03:06 +08:00
Sam Hemelryk
a4604e1e97 MDL-43839 unit test fixes 2014-03-25 15:06:32 +13:00
Sam Hemelryk
a468750723 Merge branch 'w13_MDL-44511_m27_jquery' of https://github.com/skodak/moodle 2014-03-25 12:26:53 +13:00
Sam Hemelryk
fe24226063 Merge branch 'MDL-44357-master-noplugin' of git://github.com/FMCorz/moodle 2014-03-25 08:56:49 +13:00
Marina Glancy
66cb56ade6 Merge branch 'w13_MDL-44639_m27_taskdocs' of git://github.com/skodak/moodle 2014-03-24 17:02:10 +08:00
Marina Glancy
0b536b368c Merge branch 'w13_MDL-44661_m27_anon' of git://github.com/skodak/moodle 2014-03-24 15:38:58 +08:00
Frederic Massart
379924a6a5 MDL-44357 libraries: Remove import_file method from core_lessc 
This is not used any more, and would not work if the file to be
imported is located in a theme when $CFG->themedir is not set
to the default value.
 2014-03-24 15:15:04 +08:00
Frederic Massart
833511a005 MDL-44357 theme_more: New customizable theme 
AMOS BEGIN
 CPY [choosereadme,theme_clean],[choosereadme,theme_more]
 CPY [configtitle,theme_clean],[configtitle,theme_more]
 CPY [customcss,theme_clean],[customcss,theme_more]
 CPY [customcssdesc,theme_clean],[customcssdesc,theme_more]
 CPY [footnote,theme_clean],[footnote,theme_more]
 CPY [footnotedesc,theme_clean],[footnotedesc,theme_more]
 CPY [invert,theme_clean],[invert,theme_more]
 CPY [invertdesc,theme_clean],[invertdesc,theme_more]
 CPY [logo,theme_clean],[logo,theme_more]
 CPY [logodesc,theme_clean],[logodesc,theme_more]
 CPY [pluginname,theme_clean],[pluginname,theme_more]
 CPY [region-side-post,theme_clean],[region-side-post,theme_more]
 CPY [region-side-pre,theme_clean],[region-side-pre,theme_more]
AMOS END
 2014-03-24 15:15:04 +08:00
Frederic Massart
08823e5f03 MDL-44357 theme: Do not include plugins LESS or CSS when compiling 2014-03-24 15:15:04 +08:00
Frederic Massart
29d73d2751 MDL-44357 theme: Chunk content in styles_debug for IE 2014-03-24 15:15:03 +08:00
Frederic Massart
d433cf37cd MDL-44357 theme: Allow core to compile LESS in PHP 2014-03-24 15:15:03 +08:00
Sam Hemelryk
7911effdcb MDL-43839 fixed clean as default phpunit bugs 2014-03-24 17:10:54 +13:00
Sam Hemelryk
e23dcd5b94 Merge branch 'MDL-43839_clean_default3' of https://github.com/andyjdavis/moodle 2014-03-24 10:26:20 +13:00
Mark Nelson
cc033d48b5 MDL-44316 core_tag: changed the API to accept a contextid and component 2014-03-22 13:50:08 -07:00
Mark Nelson
8dfc4d9c58 MDL-44316 core: updated the 'tag_instance' table to store the component, contextid and timecreated 2014-03-22 13:50:07 -07:00
Mark Nelson
e0c8619823 MDL-44316 test: added function to generate a tag 2014-03-22 13:47:24 -07:00
Petr Škoda
bc29320285 MDL-44661 implement event->anonymous property 2014-03-20 17:33:35 +08:00
Petr Škoda
b7f7c3bcf2 MDL-44639 fix some phpdocs issues in tasks classes 
There is also one extra () to improve code readability.
 2014-03-20 17:32:56 +08:00
Petr Škoda
fa71f84fc8 MDL-44511 import latest jQuery and add tests 2014-03-20 17:31:34 +08:00
Sam Hemelryk
89381287ce Merge branch 'MDL-44608-master-fix1' of http://github.com/damyon/moodle 2014-03-19 21:22:23 +01:00
Marina Glancy
4826ed1177 Merge branch 'MDL-44141-master' of git://github.com/sammarshallou/moodle 2014-03-19 09:49:00 +08:00
Damyon Wiese
9be8583ac5 MDL-44608 task scheduler: Make unit test case insensitive 2014-03-19 09:24:50 +08:00
Eloy Lafuente (stronk7)
2c36f83422 MDL-41760 move upgrade steps to match 04 version. 
In previous (merge) commit, version was moved, on conflict
to 04 (coz 01) was already in use. This commit moves the 3
upgrade steps to 02, 03 and 04, matching that final version.
 2014-03-19 02:15:17 +01:00
Eloy Lafuente (stronk7)
1c774322ba Merge branch 'MDL-41760-master-v8' of https://github.com/jamiepratt/moodle 
Conflicts:
	version.php
 2014-03-19 02:14:00 +01:00
sam marshall
ddf368a213 MDL-44141 Completion: System updates data during restore 
The completion system has code which is supposed to prevent it
updating completion status while grades are being restored. This
code was a nasty hack and had not worked for some time. As a result
completion dates were restored incorrectly.

This commit implements a 'proper' way to find out if a restore is
currently running, replacing the previous hack.
 2014-03-18 13:31:34 +00:00
James Pratt
038014c415 MDL-41760 quiz_statistics : response analysis for first/last/all tries 2014-03-18 18:47:19 +07:00
Jerome Mouneyrac
9e103d6e15 MDL-42025 assignfeedback_editpdf: add behat tests 2014-03-18 17:14:31 +08:00
Marina Glancy
3aa71904a1 Merge branch 'w12_MDL-44191_m27_mysql56' of git://github.com/skodak/moodle 2014-03-18 16:03:47 +08:00
Andrew Davis
7d1f086f31 MDL-43839 core: changed the default theme from standard to clean 2014-03-18 11:12:55 +08:00
Sam Hemelryk
319633a0c6 Merge branch 'MDL-44502' of https://github.com/bostelm/moodle 2014-03-18 14:40:56 +13:00
Sam Hemelryk
b02d88d98c Merge branch 'mdl44499-master' of https://github.com/tlock/moodle 2014-03-18 14:26:56 +13:00
Sam Hemelryk
224f8dfda1 Merge branch 'w12_MDL-44527_m27_cacert' of https://github.com/skodak/moodle 2014-03-18 12:52:19 +13:00
Sam Hemelryk
43301757eb Merge branch 'w12_MDL-44515_m27_phpexcel' of https://github.com/skodak/moodle 2014-03-18 11:48:47 +13:00
Sam Hemelryk
0406fb9a4b Merge branch 'w12_MDL-44516_m27_purifier' of https://github.com/skodak/moodle 2014-03-18 11:48:21 +13:00
Sam Hemelryk
1c6dff6f1c Merge branch 'w12_MDL-44521_m27_tcpdf' of https://github.com/skodak/moodle 2014-03-18 11:48:11 +13:00
Sam Hemelryk
7286f5923d Merge branch 'w12_MDL-44522_m27_markdown' of https://github.com/skodak/moodle 2014-03-18 10:17:04 +13:00
Sam Hemelryk
c16fc19461 Merge branch 'w12_MDL-44599_m27_siteid' of https://github.com/skodak/moodle 2014-03-18 09:30:39 +13:00
Marina Glancy
ea406e6b94 Merge branch 'w12_MDL-44624_m27_dmltest' of git://github.com/skodak/moodle 2014-03-17 18:12:16 +08:00
Marina Glancy
9051b7f4ea Merge branch 'MDL-44610-m' of git://github.com/micaherne/moodle 2014-03-17 18:08:57 +08:00
Marina Glancy
3087d9d34e Merge branch 'MDL-44650' of git://github.com/danielneis/moodle 2014-03-17 17:53:00 +08:00
Marina Glancy
6f96d1a9a7 Merge branch 'w12_MDL-41115_m27_emaillogin' of git://github.com/skodak/moodle 2014-03-17 17:44:45 +08:00
Marina Glancy
93eab4fd77 Merge branch 'w12_MDL-43604_m27_mariadb10' of git://github.com/skodak/moodle 2014-03-17 16:03:08 +08:00
Marina Glancy
4715639b22 Merge branch 'w12_MDL-44603_m27_extgrade2' of git://github.com/skodak/moodle 2014-03-17 14:38:01 +08:00
Marina Glancy
992d71cd8f Merge branch 'w12_MDL-44500_m27_eventcourse' of git://github.com/skodak/moodle 2014-03-17 14:32:28 +08:00
Marina Glancy
784d9c2be0 Merge branch 'w12_MDL-44635_m27_ajaxlogs' of git://github.com/skodak/moodle 2014-03-17 14:30:03 +08:00
Marina Glancy
3b85de7b99 Merge branch 'w12_MDL-44339_m27_testdebug' of git://github.com/skodak/moodle 2014-03-17 13:48:27 +08:00
Petr Škoda
d3ab89fbb5 MDL-44635 discard error logging during ajax tests 2014-03-17 11:30:46 +08:00
Sam Hemelryk
9ea57c8bc3 Merge branch 'MDL-44608-master' of git://github.com/damyon/moodle 2014-03-17 12:37:02 +13:00
Petr Škoda
9c140a681e MDL-44300 force PHP 5.6.x to return raw file names for our own guessing 2014-03-17 12:34:02 +13:00
Sam Hemelryk
a8db93c5ac Merge branch 'w11_MDL-44299_m27_sessiongc' of https://github.com/skodak/moodle 2014-03-17 12:10:48 +13:00