mirror_php/moodle
1
0
Fork 0
mirror of https://github.com/moodle/moodle.git synced 2025-01-18 22:08:20 +01:00
Code Issues Projects Releases Wiki Activity
82,152 Commits 36 Branches 519 Tags
Commit Graph

6481 Commits

Author SHA1 Message Date
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
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
David Monllao
92ba7648fe Merge branch 'MDL-56905-master' of git://github.com/jleyva/moodle 2016-11-15 09:07:37 +00:00
David Monllao
0fef835188 Merge branch 'MDL-56739-master' of git://github.com/jleyva/moodle 2016-11-15 09:07:35 +00:00
Dan Poltawski
ea70612b00 Merge branch 'MDL-56435-master' of git://github.com/damyon/moodle 2016-11-14 10:10:54 +00:00
Andrew Nicols
125bd58ff9 Merge branch 'MDL-56657-master' of git://github.com/damyon/moodle 2016-11-14 15:46:31 +08:00
Damyon Wiese
2f3f8e45da MDL-56657 admin: Style all admin/role pages for boost 2016-11-14 15:11:15 +08:00
Andrew Nicols
87264a2022 Merge branch 'MDL-56845-master' of git://github.com/damyon/moodle 2016-11-14 14:44:07 +08:00
Damyon Wiese
7b02521c39 MDL-56435 boost: Better styling for competencies in boost 
Changes
    - add custom-select to all select fields
    - add btn btn-primary/secondary to all buttons
    - add list-inline to all lists with inline class
    - style dropdowns like a bootstrap menu
    - add col-md-6 to span6
 2016-11-14 10:31:01 +08:00
Juan Leyva
5222cb1ce8 MDL-56905 tool_mobile: Return private tokens just after log-in 2016-11-11 15:21:01 +00:00
Juan Leyva
b5f3e90e1c MDL-56739 auth: Support launching the app upon user confirm 2016-11-11 15:06:36 +00:00
Dan Poltawski
e9eec33560 Merge branch 'MDL-56602-master-upgrade' of git://github.com/andrewnicols/moodle 2016-11-11 10:22:20 +00:00
Andrew Nicols
ea10a0319b MDL-56602 core: Lock themerev during upgrade 
This also changes install to use a fixed themerev.
 2016-11-11 14:15:00 +08:00
Simey Lameze
51f3693cdb MDL-55121 environment: check for unsuported php version 7.1 2016-11-11 12:37:07 +08:00
Dan Poltawski
e3cc23ae86 Merge branch 'MDL-56720-master' of git://github.com/junpataleta/moodle 2016-11-10 15:00:21 +00:00
Dan Poltawski
f41218d9fd Merge branch 'MDL-56652-master' of git://github.com/lameze/moodle 2016-11-10 14:37:00 +00:00