Commit Graph

6462 Commits

Author SHA1 Message Date
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
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
Dan Poltawski d5d6eda93c Merge branch 'MDL-55777-master' of git://github.com/ankitagarwal/moodle 2016-11-10 13:46:10 +00:00
Simey Lameze 2e1c739a28 MDL-56652 core_roles: Add BS4 styling to define roles form 2016-11-10 16:46:54 +08:00
David Monllao 8b3a8fa707 Merge branch 'wip-mdl-56397' of https://github.com/rajeshtaneja/moodle 2016-11-10 13:46:37 +08:00
Ankit Agarwal f2330472f0 MDL-55777 installation: Check libcurl version on install 2016-11-10 10:16:19 +05:30
Andrew Nicols 002ea88630 Merge branch 'MDL-54646-master' of git://github.com/junpataleta/moodle 2016-11-10 11:46:59 +08:00
Tomasz Muras ff1fc4d9f4 MDL-54646 tags: Hide manage tags in menu if tags disabled. 2016-11-10 10:59:06 +08:00
Andrew Nicols b8af6c1ef0 Merge branch 'MDL-56585-master' of git://github.com/danpoltawski/moodle 2016-11-10 09:53:28 +08:00
Dan Poltawski 2c212753fe MDL-56585 tool_lpimportcsv: adjust help popups 2016-11-09 16:11:41 +00:00
Dan Poltawski 224789b79c Merge branch 'MDL-56863-master' of git://github.com/jleyva/moodle 2016-11-09 14:38:26 +00:00
Juan Leyva 678555b499 MDL-56863 tool_mobile: Capture moodle_exception in get_autologin_key 2016-11-09 13:20:49 +00:00
Andrew Nicols 55a3911408 Merge branch 'MDL-56726-master-cfgadmin' of git://github.com/mudrd8mz/moodle 2016-11-09 14:37:47 +08:00
David Monllao 4e2ae9caee Merge branch 'MDL-56596-master-fix' of git://github.com/andrewnicols/moodle 2016-11-09 14:35:41 +08:00
David Monllao 33788800ec Merge branch 'MDL-56133' of https://github.com/NeillM/moodle 2016-11-09 14:23:50 +08:00
Andrew Nicols f2dab83445 MDL-56596 tool_usertours: Update to tours v0.9.9 2016-11-09 14:10:31 +08:00
Rajesh Taneja bd955bfea7 MDL-56397 behat: updated composer.lock to use behat 3.2.2
Behat 3.2.2 fixes transformation issue
2016-11-09 13:31:22 +08:00
Andrew Nicols 43bdbbf682 Merge branch 'MDL-56607-master' of git://github.com/jleyva/moodle 2016-11-09 09:39:48 +08:00
Damyon Wiese 3ae54e045a MDL-56845 admin: Change default for adminlinkcategories
Change the default for adminlinkcategories from false to true because it
helps navigate the site admin settings in boost.
2016-11-09 09:37:37 +08:00
David Monllao 0cbfb7ff2a Merge branch 'MDL-56409-master' of git://github.com/ankitagarwal/moodle 2016-11-09 08:36:36 +08:00
Dan Poltawski 231e2ec99a Merge branch 'MDL-56555-master' of git://github.com/andrewnicols/moodle 2016-11-08 17:56:12 +00:00