Commit graph

72092 commits

Author SHA1 Message Date
Andrew Nicols
ad5fe454df MDL-22043 mod_forum: Fix toggle subscription editing button behaviour
Update the user session property before generating the button which relies
upon it.
2014-11-19 13:31:54 +08:00
Rajesh Taneja
e1d138a74f MDL-46865 report_log: Fixed site name in behat step 2014-11-19 10:17:32 +08:00
Andrew Nicols
fc05c1b8e5 MDL-48197 testing: Normalise uses of noemailever and phpmailer sink 2014-11-19 09:09:50 +08:00
Andrew Nicols
556e3a9e8a MDL-48197 testing: Always set up a mail sink for mail redirection
Rather than setting noemailever in the bootstrap, this sets up a default
phpmailer message sink which will catch all messages.

Tests which require the phpmailer sink will continue to work as before
without change, though the noemailever config setting no longer needs to
be altered.

For tests wanting to test with noemailever set with the previous behaviour,
they will need to load the message sink and then close it.
2014-11-19 09:09:49 +08:00
Andrew Nicols
494cf9b81c MDL-23839 navigation: Check for assignable course category roles 2014-11-19 08:54:53 +08:00
Sam Hemelryk
cb2cf2fed3 MDL-48189 grade: letters now covered by behat 2014-11-19 11:57:19 +13:00
Dan Poltawski
1e717e84e7 MDL-48277 css: enable some helpful csslint warnings
Note that these rules cause a resonable amount of warnings when run
across the codebase but should be useful in the development of new css.

* known-properties can find typos in properties used
  https://github.com/CSSLint/csslint/wiki/Require-use-of-known-properties
* display-property-grouping can discover situations where rules are used
  in invalid combinations
  https://github.com/CSSLint/csslint/wiki/Require-properties-appropriate-for-display
* empty-rules finds situations where empty rules are defined
  https://github.com/CSSLint/csslint/wiki/Disallow-empty-rules
* important warnings when !important is used (generally bad for themers)
  https://github.com/CSSLint/csslint/wiki/Disallow-!important
2014-11-18 22:11:36 +00:00
Dan Poltawski
03e93abad8 MDL-48277 css: enable duplicate definitions lint rule
And remove duplicates found in code which were detected by this rule
(leaving the last rule defined as this would take precidence).

https://github.com/CSSLint/csslint/wiki/Disallow-duplicate-properties
2014-11-18 22:11:36 +00:00
Dan Poltawski
9ec6c460e6 MDL-48277 css: remove invalid @-ms-keyframes rule
This is directly copied from bootstrap, but was added to a beta version
of IE10, but never the production version so is uncessary.

Refs:
http://blogs.msdn.com/b/ie/archive/2012/06/06/moving-the-stable-web-forward-in-ie10-release-preview.aspx
https://github.com/CSSLint/csslint/issues/295
2014-11-18 22:11:35 +00:00
Dan Poltawski
4b4974881b MDL-48277 css: remove empty CSS files
To avoid tools moaning and uncessary file loads
* course/style.css was mistakenly added empty in 01e0e7044
* theme/canvas/style/question.css has been empty since 2.1 481dc639
2014-11-18 22:11:35 +00:00
Dan Poltawski
16c5684e6e MDL-48277 css: initial csslint config file
Will throw errors about invalid CSS
2014-11-18 22:11:11 +00:00
Sam Hemelryk
c866fe44de MDL-23538 backup: tidied up phpdocs + coding style 2014-11-19 10:04:10 +13:00
Sam Hemelryk
a74d4743e1 MDL-33606 event: moved upgrade notice 2014-11-19 09:38:55 +13:00
Sam Hemelryk
469c32955a Merge branch 'MDL-33606_master' of git://github.com/dmonllao/moodle 2014-11-19 09:37:19 +13:00
Sam Hemelryk
756350b82d Merge branch 'MDL-47587' of git://github.com/jmvedrine/moodle 2014-11-19 09:18:36 +13:00
Daniel Thies
3086c8cedb MDL-45867 atto_equation: Change preview update to asynchronous 2014-11-18 13:26:13 -06:00
Mary Evans
a263396486 MDL-47915 theme: use id='page-content' rather than 'content'.
Also added JS fallback for themes using copied layouts in scorm
2014-11-18 17:49:57 +00:00
Gilles-Philippe Leblanc
af14ef657a MDL-47501 gradebook: Add an indication that the grade letters was overridden 2014-11-18 17:13:40 +00:00
Helen Foster
ee7a1a546c MDL-47800 admin: improved strings 2014-11-18 16:35:38 +00:00
Dan Poltawski
eb0acfa311 Merge branch 'wip_MDL-47800_m28_pwchange2' of git://github.com/skodak/moodle 2014-11-18 16:32:57 +00:00
AMOS bot
e368d245c4 Automatically generated installer lang files 2014-11-19 00:05:38 +08:00
Dan Poltawski
c8b01e0c7d Merge branch 'MDL36874_Text_navigation_for_Books' of git://github.com/Dave-B/moodle
Conflicts:
	mod/book/version.php
	mod/book/db/upgrade.php
2014-11-18 13:54:05 +00:00
Dan Poltawski
0bd55a3322 Merge branch '47434-29-1' of git://github.com/samhemelryk/moodle 2014-11-18 13:22:41 +00:00
Dan Poltawski
8d3fba4ce4 Merge branch 'm28_MDL-48041' of https://github.com/totara/moodle
Conflicts:
	theme/bootstrapbase/style/moodle.css
2014-11-18 13:10:57 +00:00
Dan Poltawski
de134194b9 Merge branch 'MDL-48146' of git://github.com/timhunt/moodle 2014-11-18 12:04:48 +00:00
Dan Poltawski
39da77774a Merge branch 'wip_MDL-47803_m28_usersessions2' of https://github.com/skodak/moodle 2014-11-18 10:15:06 +00:00
Dan Poltawski
7baf2d1634 Merge branch 'MDL-47700-master' of git://github.com/xow/moodle 2014-11-18 10:04:33 +00:00
Jean-Michel Vedrine
31f386732b MDL-47587 Lesson: Display progress bar on the end of lesson page 2014-11-18 08:49:22 +01:00
Adrian Greeve
767d01cf39 MDL-48252 scheduled tasks: file_temp_cleanup_task does full delete.
This scheduled task was previously only doing a partial delete
due to the fact that the directory modification time would be
updated when a child file was deleted. It would then have to
wait another week before that directory could be deleted.
2014-11-18 14:17:24 +08:00
Sam Hemelryk
1b4af6f371 Merge branch 'wip-mdl-48250' of https://github.com/rajeshtaneja/moodle 2014-11-18 17:37:57 +13:00
Brian Barnes
25fd8e0778 MDL-48265 feedback: Added alt text to ghostscript test image 2014-11-18 17:09:05 +13:00
Sam Hemelryk
2f365ee4aa Merge branch 'wip-MDL-43205-master' of git://github.com/abgreeve/moodle 2014-11-18 16:48:27 +13:00
Sam Hemelryk
7b604fd9f1 Merge branch 'MDL-29585-master' of git://github.com/FMCorz/moodle 2014-11-18 16:47:24 +13:00
Eloy Lafuente (stronk7)
ea1720be99 Merge branch '48070-29' of git://github.com/samhemelryk/moodle 2014-11-18 03:41:28 +01:00
Petr Skoda
8064168e3c MDL-47803 Add report that lists user sessions 2014-11-18 13:55:11 +13:00
Sam Hemelryk
5b9a75e1fe Merge branch 'MDL-47527_master' of https://github.com/StudiUM/moodle 2014-11-18 13:34:29 +13:00
Sam Hemelryk
51e7f05043 MDL-38343 cache: better test server strings 2014-11-18 12:35:01 +13:00
Sam Hemelryk
817e9010c1 Merge branch 'MDL-47618' of git://github.com/timhunt/moodle 2014-11-18 11:12:28 +13:00
Sam Hemelryk
6067a4c87c Merge branch 'MDL-47777_master' of https://github.com/Syxton/moodle 2014-11-18 10:57:29 +13:00
Sam Hemelryk
06404b0118 Merge branch 'MDL-46531-master' of git://github.com/andrewnicols/moodle
Conflicts:
	theme/bootstrapbase/style/moodle.css
2014-11-18 10:48:31 +13:00
Sam Hemelryk
699f60c6f7 MDL-48070 navbar: ensure navigation initialised 2014-11-18 09:55:36 +13:00
Petr Skoda
866f03de46 MDL-47800 auth: Add option to logout on pw change 2014-11-18 09:51:52 +13:00
Daniel Thies
8bca3609ee MDL-48064 atto_editor: Expand event subscription for saving selection 2014-11-17 11:15:45 -06:00
Dan Poltawski
0f87473fed Merge branch 'MDL-30619_master' of https://github.com/markn86/moodle 2014-11-17 16:48:27 +00:00
Dan Poltawski
34a0b00d4a Merge branch 'MDL-48199-master' of git://github.com/lazydaisy/moodle
Conflicts:
	theme/bootstrapbase/style/moodle.css
2014-11-17 16:42:34 +00:00
Dan Poltawski
b4dd8e28cd Merge branch '48070-29' of git://github.com/samhemelryk/moodle 2014-11-17 16:22:26 +00:00
Tim Hunt
1b49f31df2 MDL-48259 questionlib.php: remove functions deprecated in Moodle 2.6 2014-11-17 15:55:22 +00:00
Dan Poltawski
122cabb41e Merge branch 'MDL-47648' of git://github.com/timhunt/moodle 2014-11-17 15:39:48 +00:00
Dan Poltawski
d012fad7d9 Merge branch 'wip-mdl-46865' of https://github.com/rajeshtaneja/moodle 2014-11-17 15:33:45 +00:00
Dan Poltawski
296e292413 Merge branch 'm29_MDL-48023_Theme_Setting_Files_Cacheable_By_Both_Browsers_And_Proxies' of https://github.com/scara/moodle 2014-11-17 15:20:17 +00:00