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
82291 commits 37 branches 540 tags 1.3 GiB
Commit graph

6495 commits

Author SHA1 Message Date
Dan Poltawski
1acd568793 MDL-56553 usertours: fix apostrophe use 2016-12-02 09:22:42 +00:00
David Monllao
b9278260c7 MDL-56553 usertours: Removing trailing ^M 2016-12-02 16:23:03 +08:00
Ryan Wyllie
1459415f93 MDL-56553 tool_usertours: change add a block step to position right 2016-12-02 07:53:07 +00:00
David Monllao
76e337ab96 Merge branch 'MDL-57232-master' of git://github.com/damyon/moodle 2016-12-02 14:20:17 +08:00
Damyon Wiese
9d1402abd8 MDL-57232 blocks: Split undeletableblocktypes 
There are 2 kinds of blocks that are undeletable. Those required by the
theme and those protected via the admin page ui. We only want the theme
ones to be auto created site wide if they don't exist - so we need to
rename the theme ones and split the logic.
 2016-12-02 12:32:03 +08:00
Andrew Nicols
8f5de6f268 Merge branch 'MDL-56553-master-2' of git://github.com/ryanwyllie/moodle 2016-12-01 14:31:45 +08:00
Ryan Wyllie
10df630ee8 MDL-56553 tool_usertours: add admin and course tours 2016-12-01 00:44:29 +00:00
Ryan Wyllie
3eb3d916cb MDL-56553 tool_usertours: allow tours to be shipped with Moodle 2016-12-01 00:36:02 +00:00
Dan Poltawski
ce7149b10c MDL-57197 js: fix AMD module warnings 
In 3.2 we are free of AMD lint warnings, unfortunately we can't expose
them through grunt yet due to
"File ignored because of a matching ignore pattern. Use "--no-ignore" to
override"

ps. this isn't related to MDL-57197 at all, i'm just a Rebel
 2016-11-30 13:50:38 +00:00
Dan Poltawski
a9b85245f2 Merge branch 'MDL-52199-incoming-nice-fail' of https://github.com/brendanheywood/moodle 2016-11-30 09:52:35 +00:00
Eloy Lafuente (stronk7)
04649747a4 MDL-57197 versions: bump all versions and requires near release 
version = 2016120500 release version
requires= 2016112900 current rc4 version
 2016-11-29 22:57:05 +01:00
Dan Poltawski
1f5fbd1696 Merge branch 'wip-mdl-56659' of https://github.com/rajeshtaneja/moodle 2016-11-25 11:17:36 +00:00
Rajesh Taneja
dfa707c994
MDL-56659 core: No need for noscript tag and set size later 
1. BrowserKitDriver::setValue only checks if the element is
   disabled. It still is able to set value on hidden elements
   So there is no need for noscript tag in password unmask
2. Set size on hidden field is not valid html, so set it later
   when text element is displayed
 2016-11-25 12:09:37 +08:00
Ryan Wyllie
af46d1dd23 MDL-57094 admin_tool: fix subscription behat tests 2016-11-25 02:24:33 +00:00
Dan Poltawski
9cc9690575 Merge branch 'MDL-57102-master' of git://github.com/jleyva/moodle 2016-11-24 10:43:21 +00:00
Dan Poltawski
304e8a8d0c Merge branch 'wip-MDL-56586-master-2' of git://github.com/marinaglancy/moodle 2016-11-24 09:30:29 +00:00
Andrew Nicols
4213f7e236 Merge branch 'wip-MDL-57019-fix' of https://github.com/marinaglancy/moodle 2016-11-24 15:09:43 +08:00
Marina Glancy
b1e5624ad9 MDL-56586 blocks: Fix mess with links to permissions 
problem 1: links to blocks permissions changes were missing in boost
problem 2: when modifying link from dashboard user is returned to profile ('returnurl' passed but not respected)
problem 3: link to check permissions missing from category management page
fix: instead of respecting both 'return' and 'returnurl' parameter use only 'returnurl'
fix: use 'popup' layout when modifying permissions for a block
 2016-11-24 14:24:59 +08:00
Marina Glancy
b0842f61f4 MDL-57019 behat: new step to navigate to gradebook section 2016-11-24 12:46:27 +08:00
Rajesh Taneja
b3502be320
MDL-56898 behat: Ensure we have button in viewport and page is stable 2016-11-24 07:27:19 +08:00
Juan Leyva
851b291998 MDL-57102 tool_mobile: Return launchurl when sign-up enabled 2016-11-23 19:35:08 +00:00
Andrew Nicols
a954685767 Merge branch 'MDL-56988-master' of git://github.com/lameze/moodle 2016-11-23 15:53:49 +08:00
Simey Lameze
270b2e443c MDL-56988 report: review and apply boosty styles to all reports 2016-11-23 15:30:32 +08:00
Andrew Nicols
44cf94a877 Merge branch 'wip-MDL-57019-master' of git://github.com/marinaglancy/moodle 2016-11-23 11:54:16 +08:00
David Monllao
42cf4a3470 Merge branch 'MDL-57023-master' of git://github.com/andrewnicols/moodle 2016-11-22 10:23:21 +08:00
Brendan Heywood
3d8fbf39f7 MDL-52199 core_message: IMAP errors passed to task api 2016-11-22 12:44:30 +11:00
Andrew Nicols
aacdf8e280 MDL-57023 tool_usertours: Ensure that the tour key is unique 
The tour key was already unique, but this change makes it unique to the
current user too.
 2016-11-22 09:05:31 +08:00
Andrew Nicols
aabebc7516 MDL-57023 tool_usertours: Update to v0.9.10 
This new version of the library brings with it storage of the current
step number in the browser session storage.

This allows the page to reload whilst viewing a tour and have the tour
continue.
 2016-11-22 09:05:31 +08:00
David Monllao
30f023b1b3 Merge branch 'MDL-56975-master' of git://github.com/jleyva/moodle 2016-11-21 13:15:40 +08:00
David Monllao
7d432be4e9 Merge branch 'MDL-57017-master' of git://github.com/andrewnicols/moodle 2016-11-21 12:40:26 +08:00
Marina Glancy
fc14932c40 MDL-57019 core_grades: change default navigation to tabs 
without navigation block in boost it is not easy to navigation between gradebook sections
 2016-11-21 09:31:49 +08:00
Juan Leyva
02bb0c0637 MDL-56975 tool_mobile: Fix page set_url 2016-11-19 18:15:59 +00:00
Andrew Nicols
cb3f67364d Merge branch 'MDL-56463_master-fix2' of git://github.com/dmonllao/moodle 2016-11-18 11:02:19 +08:00
David Monllao
b14a04e0a4 MDL-56463 tool_mobile: Set object properties always in same order 
There are differences in http://php.net/manual/en/function.list.php
between PHP 5 and in PHP 7. They neither recommend to rely on the new order
as it may change again in future.
 2016-11-18 08:50:08 +08:00
David Monllao
f209d76b0d Merge branch 'MDL-57015' of git://github.com/stronk7/moodle 2016-11-17 20:23:20 +08:00
David Monllao
237af2ba61 Merge branch 'MDL-56734-master' of git://github.com/lameze/moodle 2016-11-17 15:10:52 +08:00
Andrew Nicols
79f15159da Merge branch 'wip-MDL-57007-master' of git://github.com/marinaglancy/moodle 2016-11-17 14:36:02 +08:00
David Monllao
c35ef2e9a0 Merge branch 'MDL-56463_master-fix' of git://github.com/dmonllao/moodle 2016-11-17 13:27:21 +08:00
David Monllao
96abc5f1cd MDL-56763 tool_mobile: Unit test fix 
Checking external_format_text return instead of just using SITE->summary
 2016-11-17 13:25:54 +08:00
Simey Lameze
d78207b6c3 MDL-56734 tool_lp: add competency frameworks repo button 2016-11-17 13:15:56 +08:00
David Monllao
d41b1ba49e Merge branch 'MDL-56463-master' of git://github.com/jleyva/moodle 2016-11-17 13:10:23 +08:00
Marina Glancy
e938ea398c MDL-57007 behat: assume all capabilities during installation 2016-11-17 13:07:09 +08:00
Andrew Nicols
c6b4421524 MDL-57017 tool_usertours: Allow targetting of the frontpage 2016-11-17 10:23:00 +08:00
Eloy Lafuente (stronk7)
7336ba40d5 MDL-57015 tests: Use preventResetByRollback() if test uses transactions 2016-11-17 02:41:31 +01:00
Juan Leyva
e2fe3bc081 MDL-56463 tool_mobile: Apply text formatting to tool_mobile WS 2016-11-16 14:54:37 +00:00
Eloy Lafuente (stronk7)
751122dbc0 Merge branch 'MDL-56908-master' of git://github.com/danpoltawski/moodle 2016-11-16 11:18:15 +01:00
David Monllao
e466786f78 Merge branch 'master_MDL-56358' of git://github.com/danmarsden/moodle 2016-11-16 08:33:45 +08:00
Dan Poltawski
d25f96b766 MDL-56908 upgrade: bootstrap styling for settings save button 2016-11-15 12:51:14 +00:00
Dan Poltawski
efe57105d6 Merge branch 'MDL-56903-master-enfix' of git://github.com/mudrd8mz/moodle 2016-11-15 10:42:36 +00:00
Helen Foster
7f6accd448 MDL-56903 lang: Merge English strings from the en_fix language pack 2016-11-15 11:19:48 +01:00