David Monllao
c41132f075
Merge branch 'MDL-55168-master' of git://github.com/danpoltawski/moodle
2016-10-03 14:33:24 +08:00
David Monllao
2e5a8fd7aa
Merge branch 'wip-mdl-56210' of https://github.com/rajeshtaneja/moodle
2016-10-03 13:53:29 +08:00
David Monllao
6a9dc6b899
Merge branch 'MDL-55165-master' of git://github.com/danpoltawski/moodle
2016-10-03 13:31:36 +08:00
Simey Lameze
bc963d98d8
MDL-56009 lib: update RequireJS to 2.3.2
2016-10-03 13:21:33 +08:00
Daniel Thee Roperto
29406dded1
MDL-56231 library: Fixed PhpDoc for flexible_table constructor.
...
The flexible_table::__construct($uniqueid) accepts a string, not an int
as previously noted in the PhpDoc.
2016-10-03 16:07:11 +11:00
David Monllao
2f234a4af8
Merge branch 'MDL-56164-master' of git://github.com/danpoltawski/moodle
2016-10-03 13:07:01 +08:00
Rajesh Taneja
24c2dcada5
MDl-56210 behat: Ensure page is loaded, before checking button
2016-10-03 13:03:51 +08:00
David Monllao
7b7ddd97b9
Merge branch 'wip-MDL-55990-master' of git://github.com/marinaglancy/moodle
2016-10-03 13:00:08 +08:00
Andrew Nicols
dbab30b127
MDL-55767 competency: Deprecate langstring and replace
2016-10-03 12:59:32 +08:00
Andrew Nicols
aac3b0bebb
Merge branch 'MDL-55767-master' of git://github.com/damyon/moodle
2016-10-03 12:55:06 +08:00
David Monllao
dae538606f
Merge branch 'MDL-55964_master' of https://github.com/StudiUM/moodle
2016-10-03 12:40:25 +08:00
Jake Dallimore
d5553254e9
MDL-56010 libraries: Upgrade loglevel.js to 1.4.1 - post-import changes
2016-10-03 12:25:42 +08:00
Jake Dallimore
0b8cdaf6cb
MDL-56010 libraries: Upgrade loglevel.js to 1.4.1 - library import
2016-10-03 12:23:28 +08:00
Damyon Wiese
9e14057444
MDL-55767 competencies: Better exceptions for persistent
...
The persistent exceptions "squash" all the details and only display
them to developers. This leads to generic "Invalid persistent" messages
with no explanation. Instead lets include the message detail always.
2016-10-03 12:01:56 +08:00
Rajesh Taneja
f5d3befb72
MDL-55769 behat: Point to moodle-behat-extension 3.32.3
2016-10-03 11:50:51 +08:00
Damyon Wiese
5e4fffa013
MDL-55767 tool_lpimportcsv: import/export competency fmwks
2016-10-03 11:47:07 +08:00
David Monllao
c31610afde
Merge branch 'MDL-56127' of git://github.com/stronk7/moodle
2016-10-03 11:09:16 +08:00
David Monllao
92e3294dfc
Merge branch 'MDL-56167-master' of git://github.com/danpoltawski/moodle
2016-10-03 11:04:34 +08:00
Andrew Nicols
580d3fe780
Merge branch 'MDL-56003-master' of git://github.com/FMCorz/moodle
2016-10-03 10:51:43 +08:00
Andrew Nicols
5f21d5e8ab
Merge branch 'MDL-39117' of git://github.com/mr-russ/moodle
2016-10-03 10:13:09 +08:00
Andrew Nicols
8bb7148a9a
Merge branch 'MDL-56168-master' of git://github.com/FMCorz/moodle
2016-10-03 08:20:38 +08:00
lazydaisy
0ef2631d1c
MDL-55226 theme/index.php: Tidy up irregular spacing in original markup
2016-10-01 15:14:57 +01:00
lazydaisy
4b58fc61dd
MDL-55226 theme/index.php: Make theme selector responsive.
2016-10-01 14:58:12 +01:00
Tim Hunt
67c8c9b493
MDL-56069 quiz: nav buttons don't scroll to the right question
...
When there is more than one question on a page, say questions 2, 3 & 4.
Then when you click the navigation button for Q4, then it should load
the next page scrolled down so that Q4 is visible. That was not working.
2016-09-30 15:05:02 +01:00
John Beedell
b5cbcc4dfb
MDL-55911 Quiz: Accessibility, Label blanks in DD questions
2016-09-30 09:43:59 +01:00
John Beedell
905953909f
MDL-31243 access/enrol libs: rename new groups functions
2016-09-30 09:27:59 +01:00
John Beedell
9121bb2d23
MDL-31243 access/enrol libs: new fns returning useful SQL fragments
...
Refactor similar SQL generation code from get_users_by_capability
and get_enrolled_uses to make get_with_capability_sql.
Modified files: accesslib.php, enrollib.php, grouplib.php, new tests.
2016-09-30 09:27:56 +01:00
John Beedell
9f5170e955
MDL-31243 access/enrol libs: move enrol functions
2016-09-30 09:27:53 +01:00
Dan Poltawski
e63d89a51d
MDL-55168 assign: fix some incorrectly defined css transitions
...
The lint error suggests as though we were waiting 0s to do a
transiition of duration of 0s (i.e. nothing), but thats not actually
the case.
2016-09-30 09:25:30 +01:00
Dan Poltawski
efd03a8e71
MDL-55168 report_competency: delete empty css file
2016-09-30 09:25:26 +01:00
Dan Poltawski
693652b78d
MDL-55168 css: fix various errors detected by stylelint
...
Ignored properties, invalid propertiies, duplicates, invalid selectors..
Detected by stylelint rules:
http://stylelint.io/user-guide/rules/declaration-block-no-ignored-properties
http://stylelint.io/user-guide/rules/selector-type-no-unknown
http://stylelint.io/user-guide/rules/declaration-block-no-duplicate-properties
http://stylelint.io/user-guide/rules/max-line-length
http://stylelint.io/user-guide/rules/no-browser-hacks
2016-09-30 09:25:25 +01:00
Dan Poltawski
99fe296eb2
MDL-55168 css: remove 0-length units
2016-09-30 09:25:25 +01:00
Dan Poltawski
aea8eaecde
MDL-55168 css: use shorthand colour props when possible
2016-09-30 09:25:24 +01:00
Dan Poltawski
e90cef839c
MDL-55168 css: ignore some stylelint complains
...
1) Legacy css where it would not be a good use of time to
update.
2) Ignored some long lines and added todo
3) Fixed some line length issues
2016-09-30 09:25:24 +01:00
Dan Poltawski
ed6aea6002
MDL-55168 css: fix spacing of selectors
2016-09-30 09:25:24 +01:00
Dan Poltawski
bc33e9bd3f
MDL-55168 css: reformat plain css with stylefmt
2016-09-30 09:25:23 +01:00
Dan Poltawski
d5dff6316a
MDL-55168 grunt: Add plain css linting
2016-09-30 09:25:23 +01:00
Dan Poltawski
195f42de40
MDL-56164 theme_boost: remove empty stylesheet
2016-09-30 08:55:06 +01:00
Dan Poltawski
ad9da28cb5
MDL-56164 theme_boost: remove empty stylesheet
2016-09-30 08:50:47 +01:00
Neill Magill
c3e1c98f04
MDL-52317 Atto: Large resized images may display scroll bars
...
When an image was added via Atto and it was set to resize automatically
if the alignment was set to Top, Middle or Bottom when it was made
smaller then a vertical scroll bar would be displayed.
This was caused by the interaction of the margin settings on the image
and the 100% width set via the img-responsive css class. The width of
an element only includes the content area and not any borders, padding
or margins.
This change stops atto hardcoding the styles for image alignment into
the images style tag, it instead adds a class that defines the alignment
the image should have.
This change has the benefit that themers will now be able to adjust
how atto image alignments work if they wish.
Images added before this patch will continue to have the issue
until they are edited by the plugin, at which time their legacy style
will be removed and the new alignment method will be added.
Thanks to Andrew Nicols who provided a refactor for the Alignment
and style detection code.
2016-09-30 08:48:33 +01:00
Rajesh Taneja
c2b0213b08
MDL-55986 behat: Re-factor exiting api's
...
Return all features and contexts, so they can
be filtered well at one place
2016-09-30 13:32:20 +08:00
Damyon Wiese
f5ba9ac995
MDL-45969 editpdf: The logic for showing a previous attempt is wrong
...
It originally was only ever going to show static pdfs for older versions,
but this doesn't make sense in the UI for 3.1.
2016-09-30 13:15:00 +08:00
Rajesh Taneja
eed52d64bb
MDL-56210 behat: Ensure behat waits for dependancy manager
2016-09-30 10:19:09 +08:00
Jake Dallimore
20df227e22
MDL-56011 libraries: upgrade mustache.php to 2.11.1
2016-09-30 08:40:41 +08:00
Dan Poltawski
c561b23d8f
MDL-55886 block_rss_client: fix oracle compatibility
2016-09-29 16:55:07 +01:00
Deepa Jayaprakash
9b24ebd665
MDL-55861 course: Click drag&drop icon, incorrect activities shown
2016-09-29 16:42:10 +01:00
Dan Poltawski
81c9e018b4
MDL-56172 admin: remove cssoptimiser config options
2016-09-29 16:41:29 +01:00
Dan Poltawski
d52ebf11d3
MDL-56172 css: remove css optimiser
...
This functionality no longer makes sense inside Moodle now that we have
external tools like stylelint to help us with this. It was not able to
be used by any core themes.
The code was always marked as not for external use.
2016-09-29 16:40:40 +01:00
Dan Poltawski
cdcfc4bcd2
MDL-55165 bootstrap: built css
2016-09-29 16:39:30 +01:00
Dan Poltawski
13e0d7f3e6
MDL-55165 stylelint: remove unset redundant properities rule
...
http://stylelint.io/user-guide/rules/shorthand-property-no-redundant-values/
Fred and I had discussed enabling this rule, but think it's better for
CSS newcomers to be disabled, so lets remove trace of it.
2016-09-29 16:39:30 +01:00