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
82,006 Commits 36 Branches 519 Tags
Commit Graph

22691 Commits

Author SHA1 Message Date
Andrew Nicols
282f0437f1 Merge branch 'wip-mdl-56898-fixup' of https://github.com/rajeshtaneja/moodle 2016-11-22 11:33:25 +08:00
Andrew Nicols
873a7e1e86 Merge branch 'MDL-56683-master' of git://github.com/damyon/moodle 2016-11-22 11:27:28 +08:00
Rajesh Taneja
45e862c4bd
MDL-56898 behat: Wait for pending JS after setting password 2016-11-22 11:20:30 +08:00
Damyon Wiese
52a51514f6 MDL-56683 theme_boost: Popovers on dynamic content 2016-11-22 10:28:25 +08:00
Andrew Nicols
d10ca75b8c Merge branch 'MDL-56407-master-2' of git://github.com/junpataleta/moodle 2016-11-22 09:06:09 +08:00
Dan Poltawski
4b631c2d87 Merge branch 'wip-mdl-56898-fix2' of https://github.com/rajeshtaneja/moodle 2016-11-21 15:07:49 +00:00
Rajesh Taneja
26fef01b6b
MDL-56898 behat: Go to a non html page to avoid any unwanted ajax calls 
After scenario is finished, go to README.txt, so
there is no JS/AJAX calls pending and site is ready
for reset before next scenario
 2016-11-21 14:16:49 +08:00
Andrew Nicols
51e8968635 Merge branch 'MDL-56612_master' of git://github.com/dmonllao/moodle 2016-11-21 13:40:00 +08:00
David Monllao
57c01bca0e MDL-56612 navigation: Remove redundant load_courses_enrolled call 2016-11-21 12:42:09 +08:00
Rajesh Taneja
65eb39c0b4
MDL-56898 behat: Increase autosavefrequency for behat tests 
We don't need editor to autosave, as this cause
unwanted ajax request
 2016-11-21 09:25:35 +08:00
Rajesh Taneja
1bce723292
MDL-56898 behat: Try data reset if it fails because of pending process 2016-11-21 09:25:35 +08:00
Jake Dallimore
0a5cafcbe9 MDL-57049 libraries: update jqueryui version in requirejs path 2016-11-21 08:57:53 +08:00
Frederic Massart
755b013fdf
MDL-56959 output: Prevent notice when csstreepostprocess is undefined 2016-11-18 15:47:32 +08:00
Dan Poltawski
099a2aee68 Merge branch 'MDL-56959-master' of git://github.com/FMCorz/moodle 2016-11-17 18:01:58 +00: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
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
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
Marina Glancy
e938ea398c MDL-57007 behat: assume all capabilities during installation 2016-11-17 13:07:09 +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
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
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
Jun Pataleta
26dca05d02 MDL-56407 message: Indicate user is blocked in message area 2016-11-17 09:11:37 +08:00
Rajesh Taneja
920d7ffadd
MDL-56865 behat: Don't set error handler for behat install 2016-11-17 08:56:54 +08:00
Mark Nielsen
6670d28fbc MDL-56978 core: fix error handling in min_fix_utf8 
Must completely suppress notice from iconv as Behat's
shutdown function uses error_get_last() which is
unable to detect if the error was suppressed or not.
 2016-11-16 08:59:15 -08:00
Eloy Lafuente (stronk7)
e7b9ea226c Merge branch 'MDL-56911-master' of git://github.com/ankitagarwal/moodle 2016-11-16 10:33:09 +01:00
Frederic Massart
35b48c7aed
MDL-56915 webdav: Increase maximum expected header size 2016-11-16 17:19:19 +08:00
Andrew Nicols
7da7c1e24a Merge branch 'wip-MDL-56603-master-v2' of git://github.com/abgreeve/moodle 2016-11-16 15:36:37 +08:00
Adrian Greeve
d3d0248afc MDL-56603 message: Added see all link to message popup. 2016-11-16 14:51:17 +08:00
Andrew Nicols
faadaedb17 Merge branch 'wip-mdl-56710' of https://github.com/rajeshtaneja/moodle 2016-11-16 14:14:26 +08:00
David Monllao
12ebaf1c6b Merge branch 'MDL-56187-master' of git://github.com/damyon/moodle 2016-11-16 13:35:38 +08:00
David Monllao
97279f8d5d Merge branch 'MDL-56139_master' of git://github.com/markn86/moodle 2016-11-16 11:51:18 +08:00
Andrew Nicols
90677673da Merge branch 'MDL-56958-master' of git://github.com/damyon/moodle 2016-11-16 11:07:20 +08:00
Mark Nelson
af5765b3fb MDL-56139 core_message: removed unused constants 2016-11-16 10:22:52 +08:00
Mark Nelson
ffd7798c96 MDL-56139 core: changes after peer review 
- No longer use the Fibonacci sequence for delaying the timeout.
  It is too aggressive.
- The backoff_timer AMD module now expects the callback AND the
  backoff function to be passed to the constructor.
- Added ability to specify polling frequency in config.php.
- Added helper function to return the cache key.
- Reworded the parameters for clarity.
 2016-11-16 10:22:52 +08:00
Ryan Wyllie
fb1469d84f MDL-56139 message: ajax poll for new messages in message area 2016-11-16 10:22:33 +08:00
David Monllao
8898725385 Merge branch 'MDL-56921_master' of https://github.com/nadavkav/moodle 2016-11-16 10:04:37 +08:00
Rajesh Taneja
4b371f9769
MDL-56710 editor: Fix box-sizing to context box 
With BS4, box-sizing is border-box and this leads to
icon not shown properly. TinyMCE toolbar should use
box-sizing as context-box
 2016-11-16 08:37:15 +08:00
Andrew Nicols
6aefea74a4 Merge branch 'MDL-55209' of https://github.com/NeillM/moodle 2016-11-16 08:24:39 +08:00
David Monllao
1c70e86b5e Merge branch 'MDL-56942-master' of git://github.com/jleyva/moodle 2016-11-16 08:09:54 +08:00
David Monllao
900a2c554e Merge branch 'm32_MDL-56917_TLS_Env_Checks_Based_On_Caps_Not_Raw_Version' of https://github.com/scara/moodle 2016-11-16 05:31:55 +08:00
Matteo Scaramuccia
ade30c673c MDL-56917 core_upgrade: Do not use the raw version to check cURL caps. 
Some Linux distros can backport features due to security issues
while keeping the same (old) version. See e.g.:
- RHEL 7, https://rhn.redhat.com/errata/RHSA-2015-2159.html
- RHEL 6, https://rhn.redhat.com/errata/RHBA-2016-0842.html
- Remi PHP 7.0.x, https://github.com/remicollet/remirepo/commit/87954ef9ca41
 2016-11-15 21:50:07 +01:00
David Monllao
2f3ae73ab0 Merge branch 'wip-MDL-56899-master' of git://github.com/marinaglancy/moodle 2016-11-15 09:07:41 +00:00
Andrew Nicols
7afc76fbd6 Merge branch 'MDL-56952-master' of git://github.com/damyon/moodle 2016-11-15 09:07:37 +00:00
Andrew Nicols
2d45ac279d Merge branch 'MDL-56823' of git://github.com/aolley/moodle 2016-11-15 09:07:36 +00:00
David Monllao
1cc10f3f67 Merge branch 'MDL-56895-master' of git://github.com/danpoltawski/moodle 2016-11-15 09:07:35 +00:00
David Monllao
0fef835188 Merge branch 'MDL-56739-master' of git://github.com/jleyva/moodle 2016-11-15 09:07:35 +00:00