67178 Commits

Author SHA1 Message Date
Ankit Agarwal
16e59c6af8 MDL-44596 logging: Refecator code to use component_callback() and get_plugin_list_with_function() 2014-03-26 09:50:41 +08:00
Ankit Agarwal
96c8d59dea MDL-44596 logging: Add some tests to log stores to test the new support methods 2014-03-26 09:12:43 +08:00
Ankit Agarwal
8ead8802fb MDL-44596 logging: Add callbacks to all reports that support log stores 2014-03-26 09:12:43 +08:00
Ankit Agarwal
f0a0f3c2bd MDL-44596 logging: Improve management interfaces for reports and stores
This patch methods to the manager that uses callbacks from reports to determine how reports and stores are compatible with each other. This information is then displayed in the management pages.
2014-03-26 09:12:42 +08:00
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
Sam Hemelryk
dcb43ad7ff Merge branch 'MDL-44364-master-more' of git://github.com/FMCorz/moodle 2014-03-26 11:18:07 +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)
eb4606aeb0 Merge branch 'wip-MDL-41285-master' of git://github.com/marinaglancy/moodle 2014-03-25 21:53:38 +01:00
Eloy Lafuente (stronk7)
767a5a08d9 Merge branch 'MDL-37418_master' of git://github.com/ds125v/moodle 2014-03-25 21:37:26 +01: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
66113ef0ef Merge branch 'wip-mdl-43681' of git://github.com/rajeshtaneja/moodle 2014-03-25 18:08:40 +08: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
Rajesh Taneja
c865dacccc MDL-43681 report_log: check related user before displaying
Related user id can be noreply user which is not in
database.
2014-03-25 16:50:13 +08:00
Marina Glancy
0029497ca5 Merge branch 'w13_MDL-44732_m27_clitask' of git://github.com/skodak/moodle 2014-03-25 16:49:14 +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
e34003004e MDL-42588 scorm: revert accidental change of variable module back to plugin 2014-03-25 16:43:24 +08:00
Marina Glancy
d43556a63f Merge branch 'mdl44573-master' of git://github.com/tlock/moodle 2014-03-25 16:20:37 +08:00
Marina Glancy
c5ff2a76e1 Merge branch 'MDL-42575-master' of git://github.com/jethac/moodle 2014-03-25 16:19:33 +08:00
Marina Glancy
e9e3431ad9 Merge branch 'MDL-40915-master' of git://github.com/ankitagarwal/moodle 2014-03-25 16:18:28 +08:00
Jetha Chan
197407cabe MDL-42588 mod_scorm: display activity name
Added option to display or hide activity name on SCORM player.
2014-03-25 16:17:00 +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
2bcb6dbeb0 Merge branch 'MDL-44665' of git://github.com/timhunt/moodle 2014-03-25 14:28:55 +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
f316de8a7f MDL-44316 core_tag: correction to the default value 2014-03-25 14:05:06 +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
f94bde7250 Merge branch 'w13_MDL-44368_m27_actfilter' of https://github.com/skodak/moodle 2014-03-25 16:23:10 +13:00
Sam Hemelryk
11862768ce Merge branch 'wip-MDL-40059-master' of git://github.com/marinaglancy/moodle 2014-03-25 16:11:10 +13:00
Sam Hemelryk
027d10d67f Merge branch 'MDL-44075-master-v3' of git://github.com/jamiepratt/moodle 2014-03-25 15:06:44 +13:00
Sam Hemelryk
a4604e1e97 MDL-43839 unit test fixes 2014-03-25 15:06:32 +13:00
Sam Hemelryk
8134eb8573 Merge branch 'MDL-44535-master-v2' of https://github.com/jamiepratt/moodle 2014-03-25 12:51:14 +13:00
Damyon Wiese
b5196badcd MDL-43960 assign: Add missing include
There was a report of mod_assign_save_grade webservice failing because of this.
I couldn't reproduce it, but grepping the code found one place where this include
should be added.
2014-03-25 12:38:09 +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
d11302b646 Merge branch 'wip-mdl-43681' of git://github.com/rajeshtaneja/moodle 2014-03-24 17:27:41 +08:00
Rajesh Taneja
877d5a3218 MDL-43681 logging: Invalid events are not added to get_events_select
If event is not restored then don't add it to returned list of
events in get_events_select
2014-03-24 17:26:42 +08:00
Rajesh Taneja
9c5d3f9553 MDl-43681 report_log: Added Behat test for report log 2014-03-24 17:26:42 +08:00
Rajesh Taneja
ac8976c8b5 MDL-43681 report_log: Modified log report to use log readers 2014-03-24 17:24:12 +08: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
53bbd369c0 MDL-44364 theme_bootstrapbase: Clean up calendar variables
There are a few reasons why I am cleaning up the calendar.less file.

1/ The variables were too specific, and unlikely to be overridden. If
   you are going to change the colour of the background, surely you will
   change the border to match the background. And if you want to do
   more advanced things, you will override the selectors anyway.

2/ If you wanted to re-use the color of the event, but not as a
   background or border, you would have to use a variable that
   was specific to the background or the border, a generic
   variable for the event colour seems required.

3/ The colour @redDarker should not be defined there, and its purpose
   is so limited that I do not think we need it at all. Also,
   this variable is unlikely to be re-used ever, better not
   introducing it.

4/ I removed the calendarHeadingsColor because those headings should
   really match the rest of the headings throughout the site. I
   removed it from the overlay, but used the standard Bootstrap
   one for the one in the page.

There are still a few things that would need improvement, like the
usage of @white for the background of the event, which will not really
look good on a dark background.
2014-03-24 15:16:11 +08:00
Frederic Massart
e514c72229 MDL-44364 theme_bootstrapbase: Improve variable usage
The rules or selectors removed appeared either not to be used any more
or were enforcing a rule that was not adequate and should not be
replaced by a variable. Basically, the focus was to simplify our
usage of the colours and variables to use LESS more efficiently.
2014-03-24 15:16:11 +08:00
Frederic Massart
7c923cafe2 MDL-44364 theme_more: More settings to style the theme 2014-03-24 15:16:11 +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