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

18101 commits

Author SHA1 Message Date
Sam Hemelryk
bfb6e97eae Merge branch 'MDL-43784-master' of git://github.com/FMCorz/moodle 
Conflicts:
	lib/classes/plugin_manager.php
	lib/db/upgrade.php
 2014-03-26 11:33:47 +13:00
Dan Poltawski
1696ee8050 Merge branch 'wip-MDL-44686-master' of git://github.com/marinaglancy/moodle 2014-03-26 05:15:50 +08:00
Eloy Lafuente (stronk7)
c56e0192ef Merge branch 'w13_MDL-44510_m27_phpunit4' of https://github.com/skodak/moodle 2014-03-25 21:03:44 +01:00
Marina Glancy
daf7b64ef7 Merge branch 'w13_MDL-44107_m27_canview' of git://github.com/skodak/moodle 2014-03-25 17:10:27 +08:00
Andrew Nicols
1f777e5c6c MDL-41987 Javascript: Tidy up YUI documentation 2014-03-25 17:01:37 +08:00
Marina Glancy
da1a0bc3a9 Merge branch 'MDL-44597-master' of git://github.com/andrewnicols/moodle 2014-03-25 16:49:01 +08:00
Marina Glancy
e9e3431ad9 Merge branch 'MDL-40915-master' of git://github.com/ankitagarwal/moodle 2014-03-25 16:18:28 +08:00
Petr Škoda
9e00d46b9c MDL-44510 add extra PEAR PHPUnit info to upgrade.txt 2014-03-25 15:22:22 +08:00
Petr Škoda
15f009e1a2 MDL-44107 add debugging to deprecated event::can_view() 2014-03-25 14:53:17 +08:00
Marina Glancy
3f4a4daa03 Merge branch 'MDL-44704_master' of git://github.com/markn86/moodle 2014-03-25 14:28:10 +08:00
Marina Glancy
390f3c6ade Merge branch 'MDL-44682' of git://github.com/timhunt/moodle 2014-03-25 14:27:42 +08:00
Marina Glancy
dd043de942 Merge branch 'w13_MDL-44106_m27_requestorig' of git://github.com/skodak/moodle 2014-03-25 14:15:19 +08:00
Marina Glancy
19b4e34941 Merge branch 'w13_MDL-41284_m27_stats' of git://github.com/skodak/moodle 2014-03-25 14:06:41 +08:00
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
Andrew Nicols
5d504395f7 MDL-44597 lessphp: Add sourceMap support in theme designer mode 2014-03-24 15:19:49 +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
Ankit Agarwal
451c0e9e6a MDL-40915 events: Add events for calendar actions 
Added a calendar_event_created
 Added a calendar_event_updated
 Added a calendar_event_deleted
 2014-03-21 16:33:19 +08:00
Marina Glancy
a2c271ddcb MDL-44686 behat: limit failure filename length to 255 chars 2014-03-21 15:50:11 +08:00
Frederic Massart
7a2dabcbaa MDL-43784 theme: Removing all the old themes 2014-03-21 12:24:44 +08:00
Mark Nelson
53e4c89d8e MDL-44704 core_message: always use system context when triggering a message_sent event 2014-03-20 20:35:56 -07:00
Tim Hunt
c35cf42e55 MDL-44682 fix bug in decompose_update_into_safe_changes 2014-03-20 15:10:38 +00: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
Petr Škoda
54f1423ecc MDL-44510 support PHPUnit 4.x 
The old style PEAR installation is incompatible with PHPUnit 4,
nobody was supposed to use PEAR any more - composer
is the only supported library installation method now.
 2014-03-20 17:30:42 +08:00
Petr Škoda
bc22fa9310 MDL-44107 deprecated event_base::can_view() 
The problem is that it would be too expensive and difficult
to implement reliable access control in each event.
 2014-03-20 17:29:19 +08:00
Petr Škoda
965a3c6621 MDL-44106 add origin info to $PAGE object and use it in logs 2014-03-20 17:28:32 +08:00
Petr Škoda
e5d48aad44 MDL-44106 add WS_SERVER constant to all web service calls 
This will help us hack around some nasty webservice problems,
such as require_login() and it will be used to set proper 'ws' origin
in logged events.
 2014-03-20 17:28:01 +08:00
Petr Škoda
92927fba72 MDL-41284 hack stats to use new log readers if available 2014-03-20 17:26:09 +08:00
Petr Škoda
e6f0b5f135 MDL-41284 stop using log table for login weekly and monthly stats 
We already have stats for each day, the SUM is what we want there...
 2014-03-20 17:26:09 +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