Commit graph

1967 commits

Author SHA1 Message Date
Marina Glancy
89b909f6de MDL-57769 course: prepare to remove numsections option 2017-03-30 08:26:12 +08:00
Dan Poltawski
e3aced3b59 MDL-57162 tool_mobile: add a bit more phpdoc info 2017-03-21 12:07:54 +00:00
Dan Poltawski
0c5eee372b Merge branch 'MDL-57162-master' of git://github.com/jleyva/moodle 2017-03-21 11:38:06 +00:00
Juan Leyva
e8eb889326 MDL-57162 tool_mobile: Native app banners for Android 2017-03-21 10:07:21 +01:00
Dan Poltawski
d4d91727bf Merge branch 'MDL-58263-master' of git://github.com/jleyva/moodle 2017-03-20 11:39:58 +00:00
Dan Poltawski
5de6c5dc3b Merge branch 'MDL-57838-master' of git://github.com/jleyva/moodle 2017-03-20 11:27:04 +00:00
Dan Poltawski
e8f8594244 Merge branch 'MDL-58285' of https://github.com/NeillM/moodle 2017-03-20 08:53:23 +00:00
Dan Poltawski
48f5c05019 Merge branch 'wip-MDL-34859-master' of git://github.com/marinaglancy/moodle 2017-03-20 07:54:22 +00:00
Marina Glancy
44e86fb3d5 MDL-34859 backup: add restore defaults 2017-03-20 14:59:45 +08:00
Damyon Wiese
42d4689c65 MDL-40759 fontawesome: Minor cleanups
Remove eslint hints that are not required and revert changes to the
behat test for recycle bin that are not needed.
2017-03-17 15:52:46 +08:00
Damyon Wiese
b9b409cfc3 MDL-40759 icons: Peer review fixes (all minor) 2017-03-17 15:52:46 +08:00
Damyon Wiese
3e6adcd69c MDL-40759 icons: Rename activity_icon
image_icon is a better name because there are some valid uses for these other than for activity icons.

E.g. Old JS code that is not worth re-writing.
2017-03-17 15:52:18 +08:00
Damyon Wiese
8857c715d1 MDL-40759 icons: Behat fixes for font-awesome 2017-03-17 15:52:18 +08:00
Damyon Wiese
663640f5b3 MDL-40759 icons: convert uses of pix_url to pix_icon
Also change filepicker to use scaled svgs instead of sets of custom pngs. The svgs are taken from font-awesome.
2017-03-17 15:52:17 +08:00
Damyon Wiese
2b931458ad MDL-40759 plugins: Add font icon mapping to all plugins 2017-03-17 15:51:29 +08:00
Damyon Wiese
e6bf10c772 MDL-40759 dragdrop: Use a pix icon renderer for drag handles. 2017-03-17 15:51:28 +08:00
Damyon Wiese
a26ce2482a MDL-40759 themes: font awesome support
We add a new theme config so the theme can say it supports font-awesome.
If this is true, the pix_icon renderer will call a mapping function to map
from the moodle style t/edit to a font-awesome style fa-cog icon name. Then the renderer
will either render an image tag for old icons - or an accessible font-awesome <i> tag.

This mostly works - but there are some places where we don't use the pix icon renderer, and
we directly create image tags with pix_url image sources. These will need updating (Atto icons,
drag and drop move icons, editpdf icons).
2017-03-17 15:51:28 +08:00
Neill Magill
1c668c3ce0 MDL-58285 tool_mobile: Web service generates incorrect fileurl on IIS
The tool_mobile_get_plugins_supporting_mobile generated an incorrect
fileurl on IIS. The /mobile/filename.zip part was generated as
\mobile\filename.zip, this failed the PARAM_URL check.

This change stops the use of OS specific directory separators and uses
the linux/web separator. PHP file functions recognise this properly.
2017-03-16 12:08:36 +00:00
Juan Leyva
bae88061cc MDL-57838 tool_mobile: Point to the docs for more information
We should ask the admin to check the "Moodle docs for this page"
instead of adding a constant including a URL in the code.
2017-03-15 11:53:10 +01:00
Juan Leyva
1882158316 MDL-58263 tool_mobile: Use new callback to print header tags 2017-03-14 22:19:18 +01:00
Rajesh Taneja
337eaa2b55 MDL-58250 behat: Status should be new exit code
Oring should not be done with old status,
as it will always return failure.
2017-03-14 07:31:37 +08:00
Damyon Wiese
ac40d8b589 MDL-57596 forms: CLEANHTML in persistent forms
Add special handling for text fields with the CLEANHTML type. This should
be used when students and teachers can edit the same field (you can't trust those students).

Applies cleaning on submitted data, and on data stored in the DB before it is put back in an editing form.
2017-03-10 18:04:48 +00:00
Andrew Nicols
c742c61956 Merge branch 'wip-mdl-57940' of https://github.com/rajeshtaneja/moodle 2017-03-10 18:04:44 +00:00
Dan Poltawski
1523d53bdc Merge branch 'MDL-58035' of git://github.com/timhunt/moodle 2017-03-10 18:03:52 +00:00
Eloy Lafuente (stronk7)
21521604af Merge branch 'MDL-58064-master-enfix' of git://github.com/mudrd8mz/moodle 2017-03-07 16:36:54 +01:00
Tim Hunt
56068f5972 MDL-58035 tool_templatelibrary: fix unit test using removed base theme 2017-03-07 13:35:06 +00:00
gthomas2
353e78765a MDL-58052 behat: user session function - use to edit current profile 2017-03-03 13:57:01 +00:00
Andrew Nicols
1b70f778fd MDL-53978 tool_usertours: No tours for guest or no user 2017-03-02 10:24:06 +08:00
Eloy Lafuente (stronk7)
211843420d Merge branch 'MDL-55980-master' of https://github.com/sammarshallou/moodle 2017-02-28 22:11:16 +01:00
David Monllao
f3221d8d79 Merge branch 'wip-MDL-51833-master' of git://github.com/abgreeve/moodle 2017-02-28 11:29:33 +01:00
Andrew Nicols
d83be33f3d MDL-55547 tool_monitor: Coding style fixes 2017-02-28 09:43:21 +08:00
Andrew Nicols
d28357fbca Merge branch 'wip-MDL-55547-master' of git://github.com/marinaglancy/moodle 2017-02-28 09:43:14 +08:00
Eloy Lafuente (stronk7)
7002b7c320 Merge branch 'MDL-58041_master' of https://github.com/sam-moodle/moodle 2017-02-28 02:29:17 +01:00
Helen Foster
ecfe6f58ce MDL-58064 lang: Merge English strings from the en_fix language pack 2017-02-27 10:14:34 +01:00
Rajesh Taneja
26bf6d4ead
MDL-57940 behat: Allow behat parallel run to start with delay
Behat parallel run if executed together
then selenium might fail to launch browser
and timeout. It would be nice to have a
custom delay between the start of each process
2017-02-27 16:15:31 +08:00
Andrew Nicols
d21b71fb1a MDL-53978 usertours: Coding style fix 2017-02-27 15:21:36 +08:00
Andrew Nicols
d9a5f82086 Merge branch 'MDL-53978-render-callbacks' of https://github.com/brendanheywood/moodle 2017-02-27 15:20:28 +08:00
Adrian Greeve
7c8afa8ff8 MDL-51833 tool_monitor: Improve access check for monitor. 2017-02-27 08:59:45 +08:00
sam marshall
38fa1ca558 MDL-55980 Scheduled tasks: Run individual scheduled tasks from web 2017-02-24 10:42:28 +00:00
Brendan Heywood
3e050643c7 MDL-53978 usertours: Swap to better callback 2017-02-24 13:06:54 +11:00
Jake Dallimore
86f1d1bb86 MDL-35980 comment: add comment info to delete button for screen readers
For each delete button in the comments widget, make the spoken text a
string containing the name of the poster and the datetime.
2017-02-24 08:15:40 +08:00
Sam Chaffee
29be72373c MDL-58041 tool_monitor: Fix event monitor subscription behat failures 2017-02-21 11:19:40 -07:00
Marina Glancy
0c30e89f34 MDL-55547 tool_monitor: fix exceptions when course was deleted
Delete subscriptions when course is deleted
2017-02-20 12:11:29 +08:00
Rajesh Taneja
52d1697c12
MDL-57030 behat: Save run status after execution 2017-02-15 10:16:09 +08:00
Eloy Lafuente (stronk7)
afd3eb9e11 Merge branch 'wip-mdl-57030' of https://github.com/rajeshtaneja/moodle 2017-02-14 16:30:39 +01:00
Rajesh Taneja
f540dcc96c
MDL-57030 behat: Added option to automatically rerun failures 2017-02-08 13:22:55 +08:00
Rajesh Taneja
9bb156ee75
MDL-57853 phpunit: Remove use of setExpectedException 2017-02-06 11:44:42 +08:00
Rajesh Taneja
6fd35788c1 MDL-54628 behat: Rerun command now include replace option passed 2017-02-02 08:21:11 +08:00
Dan Poltawski
8cf4591a8e Merge branch 'wip-mdl-54628' of https://github.com/rajeshtaneja/moodle 2017-02-01 13:01:26 +08:00
Andrew Nicols
b462c655dc Merge branch 'MDL-57410-master' of git://github.com/jleyva/moodle 2017-01-31 09:00:34 +08:00