mirror_php/moodle
1
0
Fork 0
mirror of https://github.com/moodle/moodle.git synced 2025-03-21 16:10:15 +01:00
Code Issues Projects Releases Wiki Activity
82,438 Commits 36 Branches 527 Tags
Commit Graph

22810 Commits

Author SHA1 Message Date
Rajesh Taneja
3b7a351d69
MDL-57494 behat: Fixed tags and removed reset in after_scenario 
1. Added missing switch_window tags
2. Fixed switch_frame tags to use switch_iframe
3. Removed reset from after_scenario.
 2016-12-22 12:42:39 +08:00
Rajesh Taneja
b3a2a33f07
MDL-57380 behat: Check for list tags and text 
after list tag span can be added on few browsers
like chrome 51.0, so test if text starts with
list tag and contains text
 2016-12-14 09:37:35 +08:00
Eloy Lafuente (stronk7)
ab73c1ddbb Merge branch 'feature/MDL-56830' of https://github.com/fwsl/moodle 2016-12-13 12:00:46 +01:00
Andrew Nicols
01c7c3d8fb Merge branch 'MDL-57213-master-2' of git://github.com/junpataleta/moodle 2016-12-13 13:06:18 +08:00
Jun Pataleta
8aedc03754 MDL-57213 navigation: Load all my course categories into navigation tree 
* Load all of the relevant course categories of the courses that a user
  is enrolled in.
 2016-12-13 11:42:11 +08:00
Eloy Lafuente (stronk7)
00759c909c Merge branch 'MDL-57319-master' of git://github.com/danpoltawski/moodle 2016-12-12 16:23:14 +01:00
Dan Poltawski
394fd5f92e Merge branch 'wip-MDL-57299-master' of git://github.com/abgreeve/moodle 2016-12-12 12:39:52 +00:00
Dan Poltawski
daab2b520f Merge branch 'wip-mdl-57314' of https://github.com/rajeshtaneja/moodle 2016-12-12 12:21:31 +00:00
Dan Poltawski
dc81fdeb3e Merge branch 'MDL-55906-grading-table-filters-not-reset-master' of https://github.com/ilya-catalyst/moodle 2016-12-12 09:06:38 +00:00
Nadav Kavalerchik
bb13339a2e
MDL-46714 Calendar: Properly order Date & Time fields in RTL mode 2016-12-12 12:38:04 +08:00
Dan Poltawski
1081de20e1 MDL-57319 outputlib: raise timeout for scss/less compilation 2016-12-09 08:46:27 +00:00
Ilya Tregubov
b6b38f77ba MDL-55906 table: Update user preferences table when reset preferences 2016-12-08 15:02:04 +11:00
Andrew Nicols
64ad7319ab Merge branch 'MDL-57278-master-5' of https://github.com/xow/moodle 2016-12-08 10:44:49 +08:00
John Okely
f853640801 MDL-57278 signup: Fix double encoding of confirmation links 2016-12-08 10:16:30 +08:00
John Okely
a6db4a68e2 MDL-57278 signup: Unit tests covering confirmation link generation 2016-12-08 10:16:29 +08:00
Rajesh Taneja
bd755b5317
MDL-57314 behat: Press enter after setting password unmask 2016-12-08 09:18:39 +08:00
Eloy Lafuente (stronk7)
383b2f9eb6 Merge branch 'wip-mdl-56642' of https://github.com/rajeshtaneja/moodle 2016-12-08 00:36:25 +01:00
Rajesh Taneja
79cb27179a
MDL-56642 dataformat: Fixed method_exits parameters 2016-12-08 07:20:21 +08:00
Dan Poltawski
ee1f658207 Merge branch 'MDL-57283_master' of git://github.com/markn86/moodle 2016-12-07 10:16:54 +00:00
Dan Poltawski
eec60baeca Merge branch 'MDL-56674-master' of https://github.com/kenneth-hendricks/moodle 2016-12-07 08:45:16 +00:00
Marina Glancy
c0ad000f46 MDL-56614 behat: corrections to new steps 2016-12-07 13:37:49 +08:00
Andrew Nicols
4b2bcd2376 Merge branch 'wip-mdl-56353' of https://github.com/rajeshtaneja/moodle 2016-12-07 11:53:34 +08:00
Rajesh Taneja
451ae0cabc
MDL-56353 behat: Added test for multi select dependency 2016-12-07 11:30:46 +08:00
Adrian Greeve
d8ecf9754e MDL-57299 Atto: Theme boost fix for manage files. 
Theme boost removed a selector that was being used
to remove used files and so the page wasn't loading
properly.
 2016-12-07 10:40:39 +08:00
Andrew Nicols
e4621f0775 Merge branch 'wip-MDL-56642-master' of git://github.com/marinaglancy/moodle 2016-12-07 10:00:30 +08:00
Andrew Nicols
75af0aa680 Merge branch 'MDL-57266' of git://github.com/stronk7/moodle 2016-12-07 09:53:16 +08:00
Marina Glancy
1491f21554 MDL-56642 dataformat: set temp dir 
Thanks to Chien Wen-Chang for proposing a patch
 2016-12-07 09:30:14 +08:00
Dan Poltawski
369382f7bf Merge branch 'MDL-56233-32-mocksubmit' of https://github.com/roperto/moodle 2016-12-06 12:42:00 +00:00
Dan Poltawski
7cdc6974d4 Merge branch 'MDL-56971-m' of https://github.com/micaherne/moodle 2016-12-06 11:08:08 +00:00
Grzegorz Ziółek
3118ff6f41 MDL-56830 config_log: Add block plugin visibility changes to config_log. 2016-12-06 11:29:02 +01:00
Andrew Nicols
3bb4ad7521 Merge branch 'MDL-57137_question_category_with_parent_category' of https://github.com/melihovv/moodle 2016-12-06 14:52:32 +08:00
Mark Nelson
07af06df96 MDL-57283 core: fixed function call on null 2016-12-06 14:12:42 +08:00
Marina Glancy
e5287f9b3b MDL-56614 behat: navigate without navigation and admin blocks 2016-12-06 11:49:14 +08:00
Marina Glancy
ebcff7e256 MDL-56614 behat: new steps for navigation without blocks 2016-12-06 11:49:11 +08:00
Eloy Lafuente (stronk7)
75c57a08fb MDL-57266 upgrade: add 3.2.0 separation line to all upgrade scripts 2016-12-05 17:10:20 +01:00
Daniel Thee Roperto
518eb19337 MDL-56233 forms library: Fixed form identifier when mocking a form. 
If the plugin is using namespaces instead of frankenstyle class name,
get_called_class() will return 'type\name' instead of 'type_name'.

Added code to replace backslashes to underscores and fix that issue.
 2016-12-05 11:27:05 +11:00
Rajesh Taneja
54348ea6d7
MDL-57232 behat: Add blocks in boost theme 
Currently behat in boost depend on blocks
so make sure we have them.
 2016-12-02 22:48:13 +08:00
David Monllao
76e337ab96 Merge branch 'MDL-57232-master' of git://github.com/damyon/moodle 2016-12-02 14:20:17 +08:00
David Monllao
80ee8a3eb0 Merge branch 'MDL-57209-master' of git://github.com/crmpicco/moodle 2016-12-02 13:26:56 +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
666b9fcb6a MDL-57243 search: Correct todo doc 2016-12-02 10:53:52 +08:00
Andrew Nicols
ddcb68b284 Merge branch 'MDL-57243_master' of git://github.com/dmonllao/moodle 2016-12-02 10:49:34 +08:00
David Monllao
5f654ea2c0 MDL-57243 search: Note about search area base classes relocation 2016-12-02 09:51:05 +08:00
Dan Poltawski
a8bac97613 Merge branch 'MDL-57194-master' of git://github.com/lameze/moodle 2016-12-01 12:20:01 +00:00
Frederic Massart
36e6789b27
MDL-57101 filter: Load globally available filters on every page 
Previous commits were overlooked, they should have passed the
system context to filter_manager::setup_page_for_fitlers(), the
page context was passed instead. Regardless, the processing of
the latter is too excessive for what we need, but, more importantly,
it does not return "Off, but available" filters which we also need.
 2016-12-01 14:51:40 +08:00
Simey Lameze
7d17256a75 MDL-57194 core_charts: Allow colors to be overridden by setting 2016-12-01 14:44:00 +08:00
Andrew Nicols
995c6d2787 Merge branch 'MDL-57206-master' of https://github.com/snake/moodle 2016-12-01 12:21:25 +08:00
Jake Dallimore
bb316e0764 MDL-57206 core: describe newly introduced hooks in upgrade.txt 
Added a description and example for the
<component>_course_module_background_deletion_recommended hook.
 2016-12-01 08:25:28 +08:00
Andrew Nicols
b95107ca83 Merge branch 'MDL-57205-master' of git://github.com/damyon/moodle 2016-11-30 15:03:43 +08:00
Andrew Nicols
432ed35484 Merge branch 'MDL-57127-master' of git://github.com/FMCorz/moodle 2016-11-30 14:27:23 +08:00