a4da15d472
MDL-56532 behat: Fixed language string
2016-10-26 08:14:58 +08:00
c9636ddd51
MDL-56542 lang: Merge English strings from the en_fix language pack
2016-10-25 20:12:52 +02:00
bab82353f6
Merge branch 'MDL-56444' of https://github.com/mr-russ/moodle
2016-10-25 18:56:00 +02:00
274c5837e7
Merge branch 'MDL-56536-master' of git://github.com/jleyva/moodle
2016-10-25 10:12:54 +01:00
737e3c3b67
Merge branch 'MDL-56487-master' of git://github.com/andrewnicols/moodle
2016-10-25 08:42:58 +01:00
5c39800880
Merge branch 'wip-mdl-53048' of https://github.com/rajeshtaneja/moodle
2016-10-25 14:00:29 +08:00
0579372b70
Merge branch 'MDL-56552_master' of git://github.com/dmonllao/moodle
2016-10-25 06:45:15 +01:00
39946dc135
MDL-53048 behat: Fixed unmasked password field to select
2016-10-25 13:23:36 +08:00
f5b07540c7
Merge branch 'MDL-56532-master' of git://github.com/andrewnicols/moodle
2016-10-25 12:43:36 +08:00
0add237ef5
Merge branch 'MDL-56516-master' of git://github.com/andrewnicols/moodle
2016-10-25 12:37:44 +08:00
14d9b4fd85
MDL-56532 tool_usertours: Correct langstring uses for top/bottom
2016-10-25 12:15:34 +08:00
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
6db92c6c37
MDL-56516 tool_usertous: Remove eroneous test
2016-10-25 08:54:33 +08:00
67b49f27a4
MDL-56516 tool_usertours: Adjust tour query for MySQL
2016-10-25 08:39:36 +08:00
d6ab5917fa
Merge branch 'MDL-56532-master' of git://github.com/andrewnicols/moodle
2016-10-24 20:05:03 +02:00
b37895a13a
Merge branch 'MDL-56531-master' of git://github.com/andrewnicols/moodle
2016-10-24 15:43:27 +01:00
c6698a4f0f
MDL-56532 tool_usertours: Improve help for step editing
2016-10-24 21:21:44 +08:00
3f41a803e7
MDL-56531 tool_usertours: Run step title/content through filters
2016-10-24 21:18:10 +08:00
a809969691
Merge branch 'MDL-56350-master' of git://github.com/andrewnicols/moodle
2016-10-24 09:17:52 +01:00
8823be0b60
Merge branch 'MDL-56516-master' of git://github.com/andrewnicols/moodle
2016-10-24 15:41:34 +08:00
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
93432c781e
MDL-56552 tool_mobile: No phpunit timing issues
2016-10-24 12:57:52 +08:00
1093e43bda
MDL-56516 tool_usertours: Cache tours and steps
2016-10-24 11:34:10 +08:00
5d5e30c64d
MDL-56536 tool_mobile: Add logos to the get_public_config WS
2016-10-21 10:30:59 +01:00
ba5c5083c5
MDL-55074 theme_boost: Behat fixes for latest theme changes
...
Fix I edit profile steps
Apply fixed header in css
Remove transitions from menus for behat
Be more specific about some "I follow" steps
Navigation path changes
"Current course" node removed from nav tree
Adapt tests because there are no default blocks
Force some space between action menu items
2016-10-21 16:06:54 +08:00
741c2d4617
MDL-56350 tool_usertours: Apply aria-hidden to other page elements
...
Note: This patch is in the upstream library.
2016-10-21 12:41:44 +08:00
d430a7c336
MDL-55074 navigation: Menu and nav changes
...
"Grades" belongs in the navigation block, not the settings block.
Course / Activity menus should not include a link to the full settings page list, if it is the same as the menu.
Competencies belongs in the navigation block not the settings block.
2016-10-21 12:40:05 +08:00
b7daff836d
MDL-56487 tool_usertours: Sort blocks alphabetically
2016-10-21 10:53:21 +08:00
31c3b7a2e1
MDL-52777 tool_usertours: Stop testing pending upgrades
2016-10-20 14:51:57 +08:00
aea13e1c26
MDL-52777 tool_usertours: Fix matching tour test
2016-10-20 14:51:57 +08:00
55dba8058f
MDL-52777 tool_usertours: Only return tours with steps
2016-10-20 13:44:18 +08:00
0de42ff66a
MDL-56444 logstore: Stop gc during memory size test.
2016-10-20 15:56:42 +11:00
c4d5fb53ce
MDL-52777 tool_usertours: Only check plugin for needs update
...
The moodle_needs_upgrade() function includes every version.php in Moodle
which poses a performance issue, especially when called on every page.
2016-10-20 11:16:54 +08:00
a8dded9bfc
MDL-52777 tool_usertours: Correct & to && in test
2016-10-20 09:54:26 +08:00
68855baecd
MDL-52777 tool_usertours: Prepare target data when displaying form
2016-10-19 15:40:53 +08:00
42bb3f8b66
MDL-52777 tool_usertours: Less strict comparison for tour ID
2016-10-19 14:57:13 +08:00
a42a5e21eb
MDL-52777 tool_usertours: Remove unused template
2016-10-19 13:26:54 +08:00
cfc561d0de
MDL-52777 usertours: Toothpaste for tabs again
2016-10-19 10:58:21 +08:00
91aeb866e0
MDL-52777 usertours: Replacing tabs by spaces
...
Also dos2unix to svgs just in case.
2016-10-19 10:40:40 +08:00
2c2dde28f2
MDL-52777 usertours: Remove empty styles file
2016-10-19 10:34:12 +08:00
c66027cf4e
Merge branch 'MDL-52777-master' of git://github.com/andrewnicols/moodle
2016-10-19 09:59:27 +08:00
001fc061bd
MDL-52777 tool_usertours: Add the new User Tours plugin
2016-10-19 09:48:03 +08:00
01bc6a35bc
Merge branch 'wip-mdl-55924' of https://github.com/rajeshtaneja/moodle
2016-10-18 13:22:56 +01:00
846baba950
Merge branch 'wip-mdl-55746' of https://github.com/rajeshtaneja/moodle
2016-10-18 12:37:32 +01:00
43d8e805bb
MDL-56159 webservice: Tolerate exceptions in the get_autologin_key ws
2016-10-18 09:44:10 +01:00
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
dd8f30dd4f
Merge branch 'wip-mdl-56299-fix' of https://github.com/rajeshtaneja/moodle
2016-10-13 19:35:48 +02:00
d4b28e0b16
MDL-56299 behat: Popover doesn't work with phantomjs
2016-10-13 19:35:47 +02:00
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
403b817857
Merge branch 'wip-mdl-55522' of https://github.com/rajeshtaneja/moodle
2016-10-13 19:32:04 +02:00
Rajesh Taneja