mirror_php/moodle
1
0
Fork 0
mirror of https://github.com/moodle/moodle.git synced 2025-01-19 06:18:28 +01:00
Code Issues Projects Releases Wiki Activity
81,922 Commits 36 Branches 519 Tags
Commit Graph

81922 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Juan Leyva
d0da94cdf4 MDL-56974 auth_email: Incorrect param type for redirect in sign_up WS 2016-11-19 18:21:56 +00:00
Dan Poltawski
cd4a6b8b0b Moodle release 3.2rc1 v3.2.0-rc1 2016-11-18 10:06:20 +00:00
Dan Poltawski
644444829a Merge branch 'install_master' of https://git.in.moodle.com/amosbot/moodle-install 2016-11-18 10:06:18 +00:00
Dan Poltawski
ff308ab4fb Merge branch 'MDL-56959-master-fixup' of https://github.com/FMCorz/moodle 2016-11-18 07:53:31 +00:00
Frederic Massart
755b013fdf
MDL-56959 output: Prevent notice when csstreepostprocess is undefined 2016-11-18 15:47:32 +08: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
aab30ea828 Merge branch 'MDL-55869_m32v1' of https://github.com/sbourget/moodle 2016-11-18 09:16:06 +08:00
David Monllao
74c21d51d0 Merge branch 'MDL-55566_m32v1' of https://github.com/sbourget/moodle 2016-11-18 09:05:13 +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
Andrew Nicols
8a668f75a8 Merge branch 'MDL-56989-master' of git://github.com/danpoltawski/moodle 2016-11-18 07:55:42 +08:00
Andrew Nicols
3e5a1d8029 Merge branch 'MDL-57004-master' of git://github.com/ankitagarwal/moodle 2016-11-18 07:27:15 +08:00
Dan Poltawski
099a2aee68 Merge branch 'MDL-56959-master' of git://github.com/FMCorz/moodle 2016-11-17 18:01:58 +00:00
AMOS bot
a7c01b5876 Automatically generated installer lang files 2016-11-18 00:06:34 +08:00
David Monllao
e23e6c2f64 Merge branch 'MDL-56826-master-fix1' of git://github.com/damyon/moodle 2016-11-17 20:25:31 +08:00
David Monllao
f209d76b0d Merge branch 'MDL-57015' of git://github.com/stronk7/moodle 2016-11-17 20:23:20 +08:00
Dan Poltawski
abdffed5fc Merge branch 'wip-MDL-56869-master' of https://github.com/marinaglancy/moodle 2016-11-17 11:32:49 +00:00
Ankit Agarwal
40e24fda5b MDL-57004: boost: Show action menu on section pages 2016-11-17 16:31:50 +05:30
Dan Poltawski
486fac73f2 Merge branch 'MDL-56467_master' of git://github.com/markn86/moodle 2016-11-17 10:15:51 +00:00
Dan Poltawski
a0c3ab0b30 Merge branch 'MDL-56767-master-fix' of https://github.com/lameze/moodle 2016-11-17 08:51:18 +00:00
Damyon Wiese
009c57d730 MDL-56826 question: Add bootstrap styles to question preview 2016-11-17 16:14:34 +08:00
David Monllao
820a43510f Merge branch 'MDL-56763-master' of git://github.com/lameze/moodle 2016-11-17 16:10:01 +08:00
Frederic Massart
493ef66ecd
MDL-56959 theme: Inherit the parent CSS tree post processor 2016-11-17 15:18:29 +08:00
Frederic Massart
41b973bcbb
MDL-56959 theme: SCSS file is inherited from parent 
Also added support for the SCSS property to be a Closure
and return content rather than simply being the name of a file.
 2016-11-17 15:18:29 +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
Andrew Nicols
2f0cd733be Merge branch 'MDL-56822-master' of git://github.com/cameron1729/moodle 2016-11-17 14:33:39 +08:00
David Monllao
4006e187f3 MDL-56826 version: Increase version after history rewrite 2016-11-17 14:25:52 +08:00
David Monllao
98f43f1b08 Merge branch 'MDL-56826-master' of git://github.com/damyon/moodle 2016-11-17 14:24:59 +08:00
Damyon Wiese
12d6dfc1ce MDL-56826 questions: Add styling for boost theme 
Changes include:
* question: Add bootstrap classes to buttons and selects so they look consistent.

* mod_quiz: Add bootstrap styles to report form elements

* question: Add bootstrap classes to question form elements

* And remove the success/fail styles from boost because they conflict badly
with the quiz plugin styles (making unreadable text).

* quiz: nav block buttons had black background

* quiz: Add bootstrap styles to quiz navigation buttons

* qtype_ddmarker: Remove bullets from list

Edit form coordinates preview had list bullets for each coordinate.

* boost: Prevent menu scrolling on quiz edit

* mod_quiz: Add bootstrap styles to edit quiz fields

Pagination and max grades forms.

* quiz: Undo some custom styles on review options

These checkboxes were laid out in a fake grid with no responsiveness
that conflicts with the bootstrap form-inline templates. Reset the
custom style to bootstrap default.

* quiz: Fix unit tests for boost changes

* qtype_ddwtos: Accurate positioning of drop targets

* questions: Make the review page responsive

* question: bootstrap 4 compatibility

.alert in bs4 contains no colours by default, you need to mix it with
one of the context classes to get some change in colours, borders etc.
 2016-11-17 14:20:52 +08:00
Simey Lameze
25ca6f1638 MDL-56763 theme_boost: ignore boostrap popover rtl scss 
Because Bootstrap Javascript does is not expecting to be flipped, it breaks the popover on RTL languages.
We already swap the directions on the help icon template so popover scss rules can be ignored.
 2016-11-17 14:19:49 +08:00
Simey Lameze
7508e218d2 MDL-56767 theme_boost: change remember username checkbox to bs4 style 2016-11-17 13:36:21 +08:00
Andrew Nicols
3d15dfc9d2 Merge branch 'MDL-56221' of https://github.com/bostelm/moodle 2016-11-17 13:31:33 +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
David Monllao
29dfbb422f Merge branch 'MDL-56842-master' of git://github.com/danpoltawski/moodle 2016-11-17 12:28:34 +08:00
David Monllao
9ecf0674ff Merge branch 'MDL-56870-master-v2' of https://github.com/snake/moodle 2016-11-17 12:18:26 +08:00
Cameron Ball
b5b7af96bb
MDL-56822 messaging: Hide notification icons on site policy screen 
If we have the nofications and messaging popovers displaying on the
policy confirmation screen we hit an exception since the webservices
won't work if the policy hasn't been agreed to.

This patch simply stops them from showing if the site policy hasn't
been agreed to.
 2016-11-17 12:10:52 +08:00
Andrew Nicols
76acac80eb Merge branch 'MDL-56978_iconv' of https://github.com/mrmark/moodle 2016-11-17 11:20:39 +08:00
Jake Dallimore
a428cf4ac8 MDL-56870 lib: block access to deleted module in require_login 2016-11-17 10:57:13 +08:00
David Monllao
0915860e51 Merge branch 'MDL-52186-master' of git://github.com/junpataleta/moodle 2016-11-17 10:42:08 +08:00
Jun Pataleta
b62bebbf1c MDL-52186 enrol_meta: Sync only active enrol_meta instances 
Thanks to Peter Klinka for the solution!
 2016-11-17 10:40:54 +08:00
David Monllao
75166d0627 Merge branch 'wip-mdl-56865' of https://github.com/rajeshtaneja/moodle 2016-11-17 10:35:38 +08:00
David Monllao
6dc3a5b699 Merge branch 'MDL-56915-master' of git://github.com/FMCorz/moodle 2016-11-17 10:32:00 +08:00
Andrew Nicols
50e16a67ab Merge branch 'MDL-56767-master' of git://github.com/danpoltawski/moodle 2016-11-17 10:07:35 +08:00
Eloy Lafuente (stronk7)
7336ba40d5 MDL-57015 tests: Use preventResetByRollback() if test uses transactions 2016-11-17 02:41:31 +01:00
David Monllao
a813b0c3dc Merge branch 'MDL-56999-master' of git://github.com/damyon/moodle 2016-11-17 09:31:07 +08:00
Rajesh Taneja
920d7ffadd
MDL-56865 behat: Don't set error handler for behat install 2016-11-17 08:56:54 +08:00