David Monllao
f5b07540c7
Merge branch 'MDL-56532-master' of git://github.com/andrewnicols/moodle
2016-10-25 12:43:36 +08:00
David Monllao
0add237ef5
Merge branch 'MDL-56516-master' of git://github.com/andrewnicols/moodle
2016-10-25 12:37:44 +08:00
Andrew Nicols
14d9b4fd85
MDL-56532 tool_usertours: Correct langstring uses for top/bottom
2016-10-25 12:15:34 +08:00
David Monllao
74965e29f6
Merge branch 'MDL-56006-master' of git://github.com/damyon/moodle
2016-10-25 11:51:21 +08:00
Rajesh Taneja
d87dac7e70
MDL-56006 behat: Load proper context by helper
2016-10-25 11:21:53 +08:00
Russell Smith
261bfabc6f
MDL-54916 filestorage: Only write empty zip on change.
...
In some cases we may inspect an empty zip file. If we do open
an empty zip file, check that it changed before we attempt to write
it to disk. It may be the case that we were reading the file from
a location that we don't have write access to.
2016-10-25 14:10:36 +11:00
Andrew Nicols
85f33abf3e
Merge branch 'MDL-56015-master' of git://github.com/damyon/moodle
2016-10-25 10:37:36 +08:00
Damyon Wiese
848db61636
MDL-56006 blocks: Fix installation with no required blocks
...
Boost requires no blocks which was causing a failure on installation.
2016-10-25 10:15:20 +08:00
Rajesh Taneja
4422ffc55e
MDL-56006 behat: Get proper feature and context for default theme
...
No matter which theme is default theme, overridden
context and blacklisted features should be respected
2016-10-25 10:15:20 +08:00
Damyon Wiese
e56b58e3c9
MDL-56006 theme: Set Boost as the default theme
...
Units tests have been adjusted e.g. 'boost' instead of 'clean' in pix urls.
Some places I didn't update the test to reflect the boost markup and reset
the theme to clean. This is because the test was not testing the markup - but the
functionality (e.g. looking for specific structures to indicate an error in a form element).
2016-10-25 10:15:20 +08:00
Damyon Wiese
976b635d7b
MDL-56015 theme_boost: Clean up pix folder
...
Add real screenshot of new theme and delete unused images and icons.
2016-10-25 10:09:07 +08:00
Andrew Nicols
6db92c6c37
MDL-56516 tool_usertous: Remove eroneous test
2016-10-25 08:54:33 +08:00
Andrew Nicols
67b49f27a4
MDL-56516 tool_usertours: Adjust tour query for MySQL
2016-10-25 08:39:36 +08:00
Eloy Lafuente (stronk7)
6858c7acec
Merge branch 'MDL-48350-M32' of git://github.com/lazydaisy/moodle
2016-10-24 20:30:11 +02:00
Eloy Lafuente (stronk7)
d6ab5917fa
Merge branch 'MDL-56532-master' of git://github.com/andrewnicols/moodle
2016-10-24 20:05:03 +02:00
jmalmsten-panopto
3480411e0d
MDL-46942 core_backup: added original course id to restore event
2016-10-24 09:01:34 -07:00
Dan Poltawski
b5c5d741c4
Merge branch 'MDL-56538-master' of git://github.com/crazyserver/moodle
2016-10-24 15:50:55 +01:00
Dan Poltawski
b37895a13a
Merge branch 'MDL-56531-master' of git://github.com/andrewnicols/moodle
2016-10-24 15:43:27 +01:00
Dan Poltawski
2eb61a66dc
Merge branch 'wip-MDL-56439-master' of git://github.com/marinaglancy/moodle
2016-10-24 14:33:53 +01:00
Andrew Nicols
c6698a4f0f
MDL-56532 tool_usertours: Improve help for step editing
2016-10-24 21:21:44 +08:00
Andrew Nicols
3f41a803e7
MDL-56531 tool_usertours: Run step title/content through filters
2016-10-24 21:18:10 +08:00
Pau Ferrer Ocaña
8845688ce4
MDL-56534 assign: Add grading status on get_submissions WS
2016-10-24 13:24:18 +02:00
John Beedell
0cfeb01496
MDL-56395 Gradebook item titles - adjusting category titles
2016-10-24 11:43:10 +01:00
Juan Leyva
a18cb9d84f
MDL-29795 assign: Apply overrides to get_assignments
...
This commit also fix a problem in the previous commit
2016-10-24 11:24:40 +01:00
Damyon Wiese
6b8e798db1
MDL-29795 assign: Apply overrides before saving a submission
...
From the webservice.
2016-10-24 11:04:10 +01:00
Ilya Tregubov
d685b95935
MDL-29795 mod_assign: Add user/group override assignment module
2016-10-24 11:03:49 +01:00
John Beedell
89eacee7a2
MDL-56395 Gradebook: Make long item titles more accessible
2016-10-24 10:51:59 +01:00
Frédéric Massart
17553c6350
MDL-56213 theme_boost: Visual inconsistencies in backup/restore
...
* Some additional SCSS rules were added to be more visually pleasing
* Javascript had to be tweaked as targets were too specific
2016-10-24 10:29:38 +01:00
Lee Campbell
74866f8f16
MDL-56323 core_user: User profile field default value not on signup page
...
The default value of a configured text input user profile field is not rendering on signup page
2016-10-24 09:32:32 +01:00
Dan Poltawski
a809969691
Merge branch 'MDL-56350-master' of git://github.com/andrewnicols/moodle
2016-10-24 09:17:52 +01:00
David Monllao
8823be0b60
Merge branch 'MDL-56516-master' of git://github.com/andrewnicols/moodle
2016-10-24 15:41:34 +08:00
David Monllao
3ea1fa18cc
Merge branch 'mdl56466-master' of https://github.com/tlock/moodle
2016-10-24 15:23:51 +08:00
Andrew Nicols
6511cf7795
MDL-56509 tool_usertours: Remove guest from list and add admin
...
It is not possible to display a tour to users with the guest role so remove
all users with this archetype from the list.
This also changes behaviour such that it is possible to target a tour just
to administrators and administrators are not shown the tours for roles
which they do not have in the current context.
2016-10-24 15:11:54 +08:00
David Monllao
1b14f1a497
Merge branch 'MDL-55981-master' of git://github.com/andrewnicols/moodle
2016-10-24 14:06:17 +08:00
Andrew Nicols
5fe4bd6422
MDL-55981 core: Correct availability tests to use editingteacher
2016-10-24 13:59:33 +08:00
Andrew Nicols
33492029de
Merge branch 'MDL-56321-master' of git://github.com/damyon/moodle
2016-10-24 13:29:31 +08:00
David Monllao
c10cd185a9
Merge branch 'MDL-55981-master' of git://github.com/andrewnicols/moodle
2016-10-24 13:20:42 +08:00
David Monllao
0c6cf86925
MDL-55074 theme_boost: Deleting old file
2016-10-24 13:11:38 +08:00
David Monllao
93432c781e
MDL-56552 tool_mobile: No phpunit timing issues
2016-10-24 12:57:52 +08:00
David Monllao
947970fc49
MDL-55074 boost: Fixing issues reported by stylelint
2016-10-24 12:40:40 +08:00
David Monllao
48f43096e0
Merge branch 'MDL-55074-master' of git://github.com/damyon/moodle
2016-10-24 12:33:51 +08:00
Damyon Wiese
df25a884e8
MDL-56321 theme_boost: Remove extra styling from context_header
2016-10-24 12:11:13 +08:00
Frédéric Massart
e9a009dcd6
MDL-56321 theme_boost: Profile page adjustments
...
- Removed the border overlapping a user's avatar. This only affected
course profiles and the default preset.
- Do not break the sections when they wrap from one column to another
- Sneaked in a change to remove left/right padding on .box. I've been
wanting to change that since I added it. The padding on top and bottom
is sometimes useful to separate boxes, but the left/right padding
should be applied by the general structure.
2016-10-24 12:11:12 +08:00
Andrew Nicols
49b78f21b4
Merge branch 'MDL-56533-master' of git://github.com/crazyserver/moodle
2016-10-24 12:07:40 +08:00
Damyon Wiese
4b937932a2
MDL-55074 theme_behat: Behat fixes for user_grade_navigation
2016-10-24 12:00:23 +08:00
David Monllao
aaa2788e42
Merge branch 'MDL-56129-master' of git://github.com/andrewnicols/moodle
2016-10-24 11:56:06 +08:00
Andrew Nicols
c823bfee62
MDL-56129 core: Set a timeout on the session cookie
...
This is primarily because iOS has changed something under the hood which
means that only session cookies which have an expiry are passed around the
OS.
In order to make media playable outside of the browser (e.g. a video), we
must set a session cookie timeout.
Since the session timeout is configurable, this patch sets the cookie
timeout to the session timeout plus a period of one week.
This ensures that videos continue to work, and that the expired session
message is shown on the login page, but without requiring excessively long
session times.
2016-10-24 11:47:06 +08:00
Andrew Nicols
1093e43bda
MDL-56516 tool_usertours: Cache tours and steps
2016-10-24 11:34:10 +08:00
David Monllao
80b74762c9
DML-53048 forms: Remove conflict resultion remaining bit
...
Change wrong alternative references as well.
2016-10-24 11:16:53 +08:00
David Monllao
8f68e0343a
Merge branch 'MDL-53048-master' of git://github.com/andrewnicols/moodle
2016-10-24 11:12:25 +08:00
