Commit graph

1731 commits

Author SHA1 Message Date
David Monllao
91aeb866e0 MDL-52777 usertours: Replacing tabs by spaces
Also dos2unix to svgs just in case.
2016-10-19 10:40:40 +08:00
David Monllao
2c2dde28f2 MDL-52777 usertours: Remove empty styles file 2016-10-19 10:34:12 +08:00
David Monllao
c66027cf4e Merge branch 'MDL-52777-master' of git://github.com/andrewnicols/moodle 2016-10-19 09:59:27 +08:00
Andrew Nicols
001fc061bd MDL-52777 tool_usertours: Add the new User Tours plugin 2016-10-19 09:48:03 +08:00
Dan Poltawski
01bc6a35bc Merge branch 'wip-mdl-55924' of https://github.com/rajeshtaneja/moodle 2016-10-18 13:22:56 +01:00
Dan Poltawski
846baba950 Merge branch 'wip-mdl-55746' of https://github.com/rajeshtaneja/moodle 2016-10-18 12:37:32 +01:00
Juan Leyva
43d8e805bb MDL-56159 webservice: Tolerate exceptions in the get_autologin_key ws 2016-10-18 09:44:10 +01:00
Juan Leyva
961c95499e MDL-45639 tool_mobile: Support auto-login from the app to the site
We din't call it SSO because:
- SSO usually requires a 3rd party for authentication
- SSO term is already used in tool_mobile when supporting using auth methods like CAS or Shibboleth
2016-10-14 12:32:37 +01:00
David Monllao
dd8f30dd4f Merge branch 'wip-mdl-56299-fix' of https://github.com/rajeshtaneja/moodle 2016-10-13 19:35:48 +02:00
Rajesh Taneja
d4b28e0b16 MDL-56299 behat: Popover doesn't work with phantomjs 2016-10-13 19:35:47 +02:00
Rajesh Taneja
c5a566dc15 MDL-55522 behat: Commented failing transformations
- Reverted the order of transformations in order they are expected
- Commented failing transformation steps - MDL-56397
They should be fixed by https://github.com/Behat/Behat/issues/959
2016-10-13 19:35:45 +02:00
Eloy Lafuente (stronk7)
403b817857 Merge branch 'wip-mdl-55522' of https://github.com/rajeshtaneja/moodle 2016-10-13 19:32:04 +02:00
Dan Poltawski
c8303131be Merge branch 'MDL-54682_master' of git://github.com/markn86/moodle 2016-10-11 12:53:11 +01:00
Mark Nelson
16f91ae12a MDL-56299 core: fixed failing Behat tests
This also involved removing legacy Behat tests.
2016-10-11 14:39:24 +08:00
Rajesh Taneja
389e5a0ff4
MDL-55522 behat: test realtive dates 2016-10-10 11:54:13 +08:00
Frédéric Massart
d13880db8b MDL-55597 tool_templatelibrary: Re-inforce logic to skip theme templates 2016-10-07 10:24:50 +02:00
Rajesh Taneja
e1ad3a959d
MDL-55924 behat: Add core features to specified theme's 2016-10-07 10:55:41 +08:00
Rajesh Taneja
95e1d5e50f
MDL-55746 behat: Support blacklist theme features by tags 2016-10-07 09:05:26 +08:00
Rajesh Taneja
f32c2fd781
MDL-55986 behat: use double quotes not single
On windows we need option value to be in
double quotes, else it fails
2016-10-06 15:03:56 +08:00
Juan Leyva
5101310d51 MDL-53777 tool_mobile: Fix incorrect and untranslated string 2016-10-06 01:48:19 +02:00
Eloy Lafuente (stronk7)
adc77f07c5 Merge branch 'MDL-22078_master' of https://github.com/dmonllao/moodle 2016-10-05 12:22:07 +02:00
Damyon Wiese
9b807e6dbf MDL-55767 tool_lpimportcsv: Find existing scales on the site
The code was trying to match the imported scale to an existing scale for the site. It was
not loading the items before comparing them, so the matching always failed.
2016-10-05 14:23:10 +08:00
David Monllao
8643c576c7 MDL-22078 course: Complete proposed patch
- New site setting to define the default course duration (used to set
  the default end date for some course formats)
- End date setting out of restore
- Fix tool_uploadcourse
- Other fixes here and there
2016-10-05 12:31:05 +08:00
Rajesh Taneja
b9b474182a
MDL-55986 behat: all options are not valid for single run
Sanitize options which are valid for single run only
2016-10-05 09:39:26 +08:00
Eloy Lafuente (stronk7)
2720dce627 Merge branch 'wip-mdl-55986' of https://github.com/rajeshtaneja/moodle 2016-10-05 00:29:29 +02:00
Juan Leyva
7c1cb3bf5a MDL-54866 tool_mobile: Rename WS get_site_public_settings 2016-10-04 12:14:10 +01:00
Juan Leyva
6b4926281b MDL-54866 tool_mobile: New Web Service tool_mobile_get_config 2016-10-04 12:09:02 +01:00
Juan Leyva
5c6daf139d MDL-55059 tool_mobile: Support Smart App Banners for iOs 2016-10-04 11:49:34 +01:00
Andrew Nicols
2e80ff16dd MDL-53777 tool_mobile: Adjust langstring 2016-10-04 08:53:19 +08:00
Andrew Nicols
27ed5be84f Merge branch 'MDL-53777-master' of git://github.com/jleyva/moodle 2016-10-04 08:51:24 +08:00
Juan Leyva
0a90f6247d MDL-53777 tool_mobile: New script for launching the mobile app 2016-10-03 10:02:33 +01:00
Juan Leyva
c951f1fe58 MDL-53777 tool_mobile: New setting typeoflogin, including WS 2016-10-03 10:02:33 +01:00
Juan Leyva
8a0a7414b2 MDL-53777 tool_mobile: Move mobile settings to the admin tool 2016-10-03 10:02:32 +01:00
Rajesh Taneja
a1d92ef25d
MDL-55986 behat: Fix unit tests to use fixtures 2016-10-03 15:38:24 +08:00
Rajesh Taneja
b04ca8c8a1
MDL-55986 behat: Added option to optimize parallel runs by tags
run.php should only be used for running behat
before this patch if tags were passed, then behat.yml
was being re-written with features havings tags.
As this is not ideal, this option is now removed and
features with tags will be optimally split
by init.php when --optimize-run option is passed
2016-10-03 15:38:04 +08:00
David Monllao
c41132f075 Merge branch 'MDL-55168-master' of git://github.com/danpoltawski/moodle 2016-10-03 14:33:24 +08:00
Damyon Wiese
5e4fffa013 MDL-55767 tool_lpimportcsv: import/export competency fmwks 2016-10-03 11:47:07 +08:00
David Monllao
9b7f058cee MDL-22078 course: End date tests 2016-10-03 09:51:36 +08:00
Daniel Neis Araujo
fbcdb0d710 MDL-22078 course: add end date 2016-10-03 09:51:36 +08: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
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
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
Eloy Lafuente (stronk7)
d0deb28c24 Merge branch 'MDL-55804_master' of git://github.com/dmonllao/moodle 2016-09-29 01:14:33 +02:00
Eloy Lafuente (stronk7)
4dbddd0874 Merge branch 'MDL-46946-master-reqcusfield' of git://github.com/mudrd8mz/moodle 2016-09-28 02:12:59 +02:00
Dan Poltawski
13a18809e6 Merge branch 'MDL-55760-master' of https://github.com/StudiUM/moodle 2016-09-27 10:18:35 +01:00
David Monllao
f258a958a4 MDL-55804 tool_uploadcourse: strftime only to user input
Default value already comes as a timestamp.
2016-09-27 08:11:56 +08:00
Issam Taboubi
22690d6d71 MDL-55760 tool_lp: Wrong rating display when more than one scale set 2016-09-23 11:01:32 -04:00
Dan Poltawski
0b2dc2751f MDL-55071 css: reformat some css files we touch with stylefmt 2016-09-23 10:57:36 +01:00