James Pratt
49dda8fe6e
MDL-44690 core_questions : amending unit tests
...
to use more human friendly format for submitted question type data.
2014-03-25 14:37:51 +07: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
Damyon Wiese
51e73837b6
MDL-41569: CSS Allow flexible table headers to wrap.
2014-03-25 13:51:26 +08:00
Damyon Wiese
4309255896
MDL-44745 Assign: Fix typo in assign->fullname function
...
This is a new function on master only.
2014-03-25 12:49:36 +08:00
Damyon Wiese
d63e7470a9
MDL-44745 Assign: Make the grading table use the fullname function from the assign class.
...
This will take blind marking into account when displaying student names.
2014-03-25 12:45:36 +08:00
Frederic Massart
6538153bbd
MDL-44719 libraries: Invalid call to ajaxenabled()
...
A bad conflict resolution in 7eaca5a810
wiped this function from the deprecatedlib file. This patch
restores it.
But as we should not call any deprecated function in core we
also remove the its usage.
2014-03-25 11:44:08 +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
Frederic Massart
94d3dbfe2b
MDL-44739 theme_more: Set default theme settings
2014-03-25 10:50:44 +08: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
Andrew Nicols
6d402310a4
MDL-34353 Javascript: Allow chooser dialogues to fall back to non-JS version
...
In order for a chooser dialogue to be able to fall back to it's non-JS
equivalent, we need to use a different set of styles.
This change makes the chooser dialogue preparation function add a new class
to the body which is utilised in the CSS to accomplish this. When the class
is not present, the dialogue content is displayed inline.
2014-03-25 00:51:09 +08:00
Andrew Nicols
6bf267776c
MDL-28261 Javascript: Check for a working connection in SCORM activities
2014-03-24 23:48:32 +08: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
Dan Poltawski
32145fb028
MDL-44590 behat: Add test for course category idnumber duplication
2014-03-24 16:43:42 +08:00
Dan Poltawski
bd3c9587b7
MDL-44590 category: correct get_string component
2014-03-24 16:43:42 +08:00
Frederic Massart
c4164bd6e1
MDL-44670 themes: Updated screenshots of Clean and More
2014-03-24 16:37:55 +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
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
40c0903edf
MDL-44357 gradereport_grader: Fix wrong style causing LESS to fail
2014-03-24 15:15:03 +08:00
Frederic Massart
03525f7e2b
MDL-44357 theme_bootstrapbase: Incorrect order in rule
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
Petr Škoda
454c7b5d39
MDL-44661 fix legacy log reader to ignore new anonymous field
2014-03-24 14:57:21 +08:00
Sam Hemelryk
7911effdcb
MDL-43839 fixed clean as default phpunit bugs
2014-03-24 17:10:54 +13:00
Petr Škoda
7a82dcec41
MDL-44732 add cli script for execution of scheduled tasks
2014-03-24 09:46:51 +08:00
Sam Hemelryk
e911dc86f4
MDL-43839 fixed whitepace issues
2014-03-24 10:30:42 +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