mirror_php/moodle
1
0
Fork 0
mirror of https://github.com/moodle/moodle.git synced 2025-03-25 10:00:31 +01:00
Code Issues Projects Releases Wiki Activity
71,403 Commits 36 Branches 527 Tags
Commit Graph

71403 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Sam Hemelryk
2949dedcda MDL-43628 mod_assign: fixed formatting of statement 2014-11-20 10:18:28 +13:00
Eloy Lafuente (stronk7)
4067991016 Merge branch '48206-29' of git://github.com/samhemelryk/moodle 
Conflicts:
	theme/bootstrapbase/style/moodle.css
 2014-11-19 21:28:51 +01:00
Sam Hemelryk
7a5e605424 Merge branch 'MDL-46531-fixes' of git://github.com/andrewnicols/moodle 2014-11-20 09:12:14 +13:00
Rajesh Taneja
7b9fb265d2 MDL-48251 behat: Shuffling activity creation fix quiz behat 2014-11-19 20:07:07 +01:00
David Balch
112aed6035 MDL-9443 core_files: Also filter .xhtml resources. 
Change the filters to treat .xhtml files the same as .html,
so they are filtered by both "All files" and "HTML files only".
 2014-11-19 14:14:50 +00:00
Dan Poltawski
72e3cb9ad2 MDL-29585 wiki: fix unit test fails 2014-11-19 11:37:35 +00:00
Dan Poltawski
b4fc107a35 Merge branch 'MDL-29585-master-fixup' of https://github.com/FMCorz/moodle 2014-11-19 10:29:10 +00:00
Frederic Massart
414f7ef8ff MDL-29585 mod_wiki: Prevent broken links in editable sections 
When a section name ended with a URL, the '<a' part of [edit] link
that is appended to the section was considered as part of the URL
in the section, thus causing the [edit] link to be broken.
 2014-11-19 17:28:36 +08:00
Andrew Nicols
db97ff0ee6 MDL-46531 editor_atto: Handle a null selection better on colour change 
Sadly, there is no easy way to do this. When a range is empty, we need to
create a new span, make the changes there, and then select it. Rangy does
not provide a helper to do this yet (will be in 1.3) so we have to do it
manually in the mean time.
 2014-11-19 15:45:37 +08:00
Dan Poltawski
23842d8c50 Merge branch 'wip-mdl-46865' of https://github.com/rajeshtaneja/moodle 2014-11-19 06:39:35 +00:00
Mario Wehr
772e9dc17e MDL-48274 mod_forum: Add missing context to has_capability call 2014-11-19 14:06:07 +08:00
Dan Poltawski
7417189dcc MDL-48276 qformat_xhtml: avoid uncessary html in .css file 
In order to help automated tools move the html out of the css
file.
 2014-11-19 05:55:59 +00:00
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