72387 Commits

Author SHA1 Message Date
Andrew Nicols
8f18ba9f0e Merge branch 'MDL-48933-master-fixup' of https://github.com/FMCorz/moodle 2015-02-04 10:41:09 +08:00
Eloy Lafuente (stronk7)
0db8095621 Merge branch 'MDL-47159_master' of git://github.com/dmonllao/moodle 2015-02-04 03:39:07 +01:00
David Monllao
6611780e83 MDL-46662 grader: Fixing return type, it is an array 2015-02-04 10:37:38 +08:00
David Monllao
89cccc9e0e Merge branch 'MDL-46662-master' of git://github.com/zbdd/moodle 2015-02-04 10:36:42 +08:00
Frederic Massart
0061876d57 MDL-48933 core_message: Clean up for a better coding style 2015-02-04 10:36:30 +08:00
David Monllao
4879ea0e18 MDL-47159 atto_link: Adding prefix when url doesn't specify one 2015-02-04 10:23:04 +08:00
Zachary Durber
2350b3f453 MDL-46662 grader: Improve course header and aggregation accessibility
Deprecated unused grader collapse icon function.
2015-02-04 10:19:52 +08:00
Rajesh Taneja
288eea620a MDL-49081 tests: Removed dev option from composer
dev option is enabled by default in composer, so not required.
https://github.com/composer/composer/blob/master/CHANGELOG.md
2015-02-04 10:19:46 +08:00
Rajesh Taneja
6cf0aa0127 MDL-47562 gradereport_singleview: Updated behat steps with Save string change 2015-02-04 03:12:25 +01:00
Andrew Nicols
06569b71ac MDL-48160 theme: Add deprecation notice for legacy RTL styles 2015-02-04 09:18:22 +08:00
Andrew Nicols
0e642ea578 Merge branch 'wip-MDL-48160_master' of git://github.com/lazydaisy/moodle 2015-02-04 08:47:44 +08:00
Dan Poltawski
40582c75e0 Merge branch 'MDL-48901_master' of git://github.com/dmonllao/moodle
Conflicts:
	mod/lesson/upgrade.txt
2015-02-03 23:27:15 +00:00
David Monllao
39fb968132 MDL-48901 mod_lesson: Deprecating unused functions 2015-02-04 07:23:41 +08:00
Sam Hemelryk
7fa57e0341 MDL-39459 cache: mode included in stats output
The cache store mode is now included in the performance stats
printed at the bottom of the page.
It is represented as either [a] [s] or [r] and a title is used
to actually state the mode.
2015-02-04 09:35:21 +13:00
Sam Hemelryk
892e21aadd MDL-36296 block_navigation: consistency fixes
This change fixes a couple of consistency issues in the navigation block.
At the same time it fixes it the CSS for the navigation block as it had
really degraded over the last years.
Notable points about this change:

* Fixed icon display by wrapping content in a span allowing columns to
  be styled.
* Re-wrote the CSS entirely as it could be done much better.
* Fixed inconsistencies between the php and JS for rendering nodes.
2015-02-04 09:04:50 +13:00
Mary Evans
73b425be07 MDL-48160 theme: Improve all block region layouts when coded for RTL. 2015-02-03 18:19:14 +00:00
Dan Poltawski
32a34ed24f Merge branch 'MDL-48942_survey' of https://github.com/andyjdavis/moodle 2015-02-03 15:55:21 +00:00
Dan Poltawski
8c506dfacd Merge branch 'MDL-48933-master' of git://github.com/FMCorz/moodle 2015-02-03 15:09:33 +00:00
Dan Poltawski
cc70e0fbc9 Merge branch 'MDL-48955-29' of https://github.com/vadimonus/moodle 2015-02-03 14:02:58 +00:00
Dan Poltawski
685b6681db Merge branch 'MDL-48945-master' of https://github.com/sammarshallou/moodle 2015-02-03 13:55:10 +00:00
Dan Poltawski
8a5f6a0f9a Merge branch 'wip-mdl-49002' of https://github.com/rajeshtaneja/moodle 2015-02-03 13:16:52 +00:00
Dan Poltawski
769bfb12c1 Merge branch 'm29_MDL-48799_Incorrect_Legacy_Dir_Fallback' of https://github.com/scara/moodle 2015-02-03 13:13:13 +00:00
Dan Poltawski
8448af7d86 Merge branch 'behat_goutte_nowait' of https://github.com/tlevi/moodle 2015-02-03 13:08:32 +00:00
Dan Poltawski
08a74cd6f6 Merge branch 'm29_MDL-48907' of https://github.com/totara/moodle 2015-02-03 12:56:42 +00:00
Dan Poltawski
2b3ecd45c0 Merge branch 'MDL-48963_m29v5' of https://github.com/sbourget/moodle 2015-02-03 12:53:29 +00:00
Dan Poltawski
c11dca3fae Merge branch 'MDL-48920' of git://github.com/stronk7/moodle 2015-02-03 12:39:10 +00:00
Eloy Lafuente (stronk7)
e3b3173357 MDL-48920 tool_generator: fix unit tests 2015-02-03 13:24:50 +01:00
Dan Poltawski
cf02542d93 MDL-44071 upgrade.txt: improve notice 2015-02-03 12:20:39 +00:00
Dan Poltawski
1ee0c927b2 Merge branch 'MDL-44071-master' of git://github.com/zbdd/moodle 2015-02-03 12:16:16 +00:00
Eloy Lafuente (stronk7)
7172903fcf Merge branch 'MDL-41851-master' of git://github.com/andrewnicols/moodle 2015-02-03 12:36:00 +01:00
Dan Poltawski
e46856e48b MDL-48624 behat: fix trailing whitespace 2015-02-03 11:01:34 +00:00
Dan Poltawski
cb4748b67d Merge branch 'wip-mdl-48624-m' of https://github.com/rajeshtaneja/moodle 2015-02-03 11:01:05 +00:00
Eloy Lafuente (stronk7)
3cafe67502 Merge branch 'wip-mdl-48403' of https://github.com/rajeshtaneja/moodle 2015-02-03 11:57:27 +01:00
Eloy Lafuente (stronk7)
7eb4e0397b Merge branch 'wip-mdl-49015' of https://github.com/rajeshtaneja/moodle 2015-02-03 11:52:03 +01:00
Eloy Lafuente (stronk7)
336314812f Merge branch 'MDL-48328_M29' of git://github.com/lazydaisy/moodle
Conflicts:
	theme/bootstrapbase/style/moodle.css
2015-02-03 11:42:41 +01:00
Jetha Chan
a952ed04d1 MDL-49073 timezones: update to 2015a (2323 rules) 2015-02-03 17:37:30 +08:00
Andrew Nicols
794e3c8cd5 Merge branch 'MDL-48865-master' of git://github.com/xow/moodle 2015-02-03 16:36:11 +08:00
Neill Magill
f95b1e85fb MDL-48865 core_block: Show regions with only hidden blocks when editing
Before this patch if all the blocks in a block region are set to hidden the region will be docked even when editing is enabled.
This meant that as a user I would need to add a new block to the page and move it to that region via the configuration
menu before I could manipulate the hidden blocks again.
2015-02-03 16:14:20 +08:00
Andrew Nicols
71439af9d5 Merge branch 'MDL-48920-master' of git://github.com/FMCorz/moodle 2015-02-03 16:11:08 +08:00
Andrew Nicols
70b7861da2 Merge branch 'tgz_fixing' of https://github.com/tlevi/moodle 2015-02-03 16:02:59 +08:00
Andrew Nicols
26faad60e2 Merge branch 'MDL-48989-master' of git://github.com/jleyva/moodle 2015-02-03 15:51:38 +08:00
Mark Nelson
0b1df17129 MDL-48884 mod_assign: prevented setting gradebook feedback unnecessarily 2015-02-02 23:34:54 -08:00
Andrew Nicols
bd8c9bc343 Merge branch '48968-29' of git://github.com/samhemelryk/moodle 2015-02-03 14:22:19 +08:00
Andrew Nicols
48bac91be8 Merge branch 'MDL-48929-master' of git://github.com/FMCorz/moodle 2015-02-03 13:55:32 +08:00
Andrew Nicols
f13e8ad041 Merge branch 'MDL-37477-master' of git://github.com/jethac/moodle 2015-02-03 13:48:54 +08:00
Andrew Nicols
c6bcbad07a MDL-48484 admin: Improve coding style 2015-02-03 13:40:30 +08:00
Jetha Chan
49faeef6bb MDL-37477 output: Add support for table captions 2015-02-03 13:38:24 +08:00
Andrew Nicols
5dee60446c Merge branch 'm29_MDL-48484' of https://github.com/totara/moodle 2015-02-03 13:04:38 +08:00
Andrew Nicols
43bde1b9fd Merge branch 'm29_MDL-46467' of https://github.com/totara/moodle 2015-02-03 12:57:25 +08:00
Andrew Nicols
6ef9a63bcd Merge branch 'MDL-48608_master' of git://github.com/markn86/moodle 2015-02-03 12:30:29 +08:00