moodle/moodle
3
0
Fork 0
mirror of https://github.com/moodle/moodle.git synced 2025-08-06 17:36:38 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions
81436 commits 37 branches 540 tags 1.3 GiB
Commit graph

81436 commits

This branch
This branch
All branches
Author SHA1 Message Date
Dan Poltawski
c435523ac5 Merge branch 'MDL-56468-master' of git://github.com/andrewnicols/moodle 2016-10-25 08:11:05 +01:00
David Monllao
bf91437d25 Merge branch 'wip-mdl-55074' of https://github.com/rajeshtaneja/moodle 2016-10-25 15:09:24 +08:00
David Monllao
1d58c301c7 Merge branch 'MDL-56156-master' of git://github.com/damyon/moodle 2016-10-25 15:05:17 +08:00
Andrew Nicols
b146ff9451 MDL-56004 theme_bootstrapbase: Rebuild less 2016-10-25 14:24:32 +08:00
Andrew Nicols
2979c25683 Merge branch 'MDL-56004-master' of https://github.com/damyon/moodle 2016-10-25 14:13:19 +08:00
David Monllao
5c39800880 Merge branch 'wip-mdl-53048' of https://github.com/rajeshtaneja/moodle 2016-10-25 14:00:29 +08:00
Dan Poltawski
3b89ce210d Merge branch 'MDL-56442-master' of https://github.com/StudiUM/moodle 2016-10-25 06:56:44 +01:00
Rajesh Taneja
c99dffb69c
MDL-55074 behat: Fixed new theme related changes 2016-10-25 13:48:51 +08:00
Dan Poltawski
0579372b70 Merge branch 'MDL-56552_master' of git://github.com/dmonllao/moodle 2016-10-25 06:45:15 +01:00
Dan Poltawski
1a2497c3c2 Merge branch 'MDL-55902-master' of git://github.com/junpataleta/moodle 2016-10-25 06:38:13 +01:00
Damyon Wiese
fb045b4e15 MDL-56004 theme: upgrade.txt note about bootstrap compatibility 2016-10-25 13:36:29 +08:00
Damyon Wiese
0862719092 MDL-56004 theme: Add some BS2 compatibility to BS4. 
This is for user-created texts (e.g. the people have used the generico filter to inject BS2 markup into user tests).

It is also for existing old HTML that we have not had time to upgrade yet.
 2016-10-25 13:36:23 +08:00
Damyon Wiese
fe4a6c3bdb MDL-56004 theme: Add some BS4 compatibility to BS2 2016-10-25 13:36:18 +08:00
David Monllao
1e56070d34 Merge branch 'wip-mdl-55981' of https://github.com/rajeshtaneja/moodle 2016-10-25 13:29:03 +08:00
Rajesh Taneja
39946dc135
MDL-53048 behat: Fixed unmasked password field to select 2016-10-25 13:23:36 +08:00
Rajesh Taneja
cdb4975a44
MDL-55981 behat: Fixed groups seen by user 2016-10-25 13:19:32 +08:00
Dan Poltawski
76a6dc685d Merge branch 'MDL-56534-master' of git://github.com/crazyserver/moodle 2016-10-25 06:08:48 +01:00
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
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
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