Dan Poltawski
64ec975e19
Merge branch 'MDL-55082-master' of git://github.com/merrill-oakland/moodle
2016-07-11 15:20:48 +01:00
Dan Poltawski
7d650df727
Merge branch 'MDL-55128-master' of git://github.com/jleyva/moodle
2016-07-11 13:33:23 +01:00
Dan Poltawski
ad3f8cd18c
MDL-54944 eslint: make the .eslintrc default stricter
...
Instead of using the more rollup-tolerant config for all files, make the
configuration stricter by default but lower in grunt for yui modules.
This means that manual runs (prechecker) or editor integrations will
flag up the errors as well as grunt.
Also add ignore lines to the core files so that eslint isn't noisy when
not running with grunt.
2016-07-11 12:44:34 +01:00
Eloy Lafuente (stronk7)
ed2d12a125
Merge branch 'MDL-54955-master' of git://github.com/jleyva/moodle
2016-07-05 21:15:31 +02:00
Eloy Lafuente (stronk7)
e51f7a6a20
Merge branch 'MDL-49244-master' of git://github.com/jleyva/moodle
2016-07-05 20:16:44 +02:00
Juan Leyva
8908432fab
MDL-55128 course: Fix param type for shortname
2016-07-05 09:50:32 +01:00
Juan Leyva
7c4e686f94
MDL-54943 webservice: New WS core_course_get_activities_overview
2016-07-05 09:10:13 +01:00
Juan Leyva
6a1131e2c2
MDL-55019 webservice: Course summary text should not be cleaned
2016-07-04 14:51:14 +01:00
Eric Merrill
55b62370aa
MDL-55082 search: Update core areas to return results in time ASC order
2016-06-30 11:11:35 -04:00
Juan Leyva
b8b1be1554
MDL-49244 course: Clean parameters in core_course_get_categories
2016-06-30 13:26:54 +01:00
Juan Leyva
9df9f1f096
MDL-54104 webservice: Return section number in WS get_course_contents
2016-06-24 13:55:04 +01:00
Rajesh Taneja
f34ab57411
MDL-53399 behat: Activity chooser link is removed.
2016-06-22 09:07:31 +08:00
Rajesh Taneja
f0be6b892e
MDL-54940 behat: No need to press save
...
Previous step press save button, so no need to press again
2016-06-21 18:53:03 +08:00
Andrew Nicols
0871afcd5f
Merge branch 'MDL-54940-master' of https://github.com/LukeCarrier/moodle
2016-06-21 11:53:05 +08:00
Andrew Nicols
c6d20e61e3
Merge branch 'wip-MDL-53399' of https://github.com/JoeyAndres/moodle
2016-06-21 09:03:48 +08:00
Andrew Nicols
da871bb4c1
Merge branch 'wip-MDL-53292-master' of https://github.com/marinaglancy/moodle
2016-06-21 08:46:38 +08:00
Eloy Lafuente (stronk7)
795150c550
Merge branch 'MDL-37554-master-test' of git://github.com/cameron1729/moodle
2016-06-21 00:03:45 +02:00
Juan Leyva
d889b58747
MDL-54955 webservice: Apply external_format_string in course names
2016-06-20 13:16:52 +01:00
Andrew Nicols
0256b7a620
Merge branch 'MDL-51163-master' of git://github.com/cameron1729/moodle
2016-06-20 11:09:47 +08:00
Luke Carrier
a48f2d3d90
MDL-54940 behat: use the fixed step
2016-06-19 17:22:17 +01:00
Luke Carrier
3ceaea2638
MDL-54940 behat: rectify section edit regression in MDL-53381
2016-06-19 17:11:31 +01:00
Andrew Nicols
d91b6854e9
Merge branch 'MDL-45762-master' of https://github.com/xow/moodle
2016-06-16 09:04:16 +01:00
Dan Poltawski
0fd08fc7e5
Merge branch 'MDL-35628' of https://github.com/mr-russ/moodle
2016-06-16 09:04:12 +01:00
Andrew Nicols
45a0932a9e
Merge branch 'MDL-54797' of git://github.com/aolley/moodle
2016-06-16 09:04:07 +01:00
Guy Thomas
8e61e0f9b9
MDL-45762 course: Error when accessing a conditionally hidden section
...
Show a nice error when the user accidentally views a section
that is conditionally hidden. Otherwise, continue to show
original error when section is just hidden to them.
2016-06-15 09:53:35 +08:00
Marina Glancy
8fef061da4
MDL-53292 core: deprecate callback delete_course
2016-06-13 10:48:06 +08:00
Cameron Ball
3f897b1966
MDL-51163 course: Remove course/category.php
2016-06-13 10:24:15 +08:00
eWallah
6ae9dbc2aa
MDL-37554 activities select all option
2016-06-13 10:22:16 +08:00
Dan Poltawski
834f1b66d4
MDL-54890 course: remove erranous duplicated switch label
...
Detected by eslint rule 'no-duplicate-case'
2016-06-10 10:06:28 +01:00
Russell Smith
1fcf0ca8a5
MDL-35628 performance: Remove dirname() where possible.
...
dirname() is a slow function compared with __DIR__ and using
'/../'. Moodle has a large number of legacy files that are included
each time a page loads and is not able to use an autoloader as it is
functional code. This allows those required includes to perform as
best as possible in this situation.
2016-06-10 08:06:49 +10:00
Dan Poltawski
015b4d22a2
Merge branch 'MDL-54820-master' of git://github.com/jleyva/moodle
2016-06-06 14:09:59 +01:00
Juan Leyva
72ac2aacfa
MDL-54820 webservice: Fix regression in core_course_search_courses
...
Regression caused by MDL-51324
2016-06-03 12:56:11 +02:00
Joey Andres
fdac806aef
MDL-53399 core: "activity chooser off/on" in user preference
...
- Created a "Course preferences" for user preference. This
is where "activity chooser off/on" option is moved.
- Changed the lib/navigationlib.php to have a new user preference
section, which is "Course preferences".
- Removed the "activity chooser" toggle codes in javascript.
2016-06-03 00:46:16 -06:00
Adam Olley
e9f7c4a4b2
MDL-54797 course: Add indexed field to condition of delete query
...
Deleting records from the course_completion_criteria table goes much
faster when we include the indexed course field in the delete query.
2016-06-02 15:43:30 +09:30
Marina Glancy
5e717d10b4
MDL-54557 course: treat section summary as contents
2016-06-02 12:56:34 +08:00
Dan Poltawski
c56d14be37
Merge branch 'MDL-54627_master' of git://github.com/dmonllao/moodle
2016-05-19 10:59:06 +01:00
David Monllao
505ce88467
MDL-54627 search: Ensure that all format_string strings are text.
...
All user input that is usually displayed through format_strings with
filters like mulitlang applied should be converted to text as well.
2016-05-19 13:16:01 +08:00
Eloy Lafuente (stronk7)
1abca11e0a
MDL-54638 versions: bump all versions and requires near release
...
version = 2016052300 release version
requires= 2016051900 current rc1 version
2016-05-19 02:16:15 +02:00
Michael Aherne
39257eb39c
MDL-54600 phpunit: fixed classname to follow frankenstyle
2016-05-17 17:16:11 +08:00
Jake Dallimore
f418d89957
MDL-54128 mod_lti: Add help for custom LTI tools in activity picker
2016-05-16 10:07:29 +08:00
Andrew Nicols
e53d7e7c04
Merge branch 'MDL-50063' of git://github.com/stronk7/moodle
2016-05-13 18:12:32 +08:00
Eloy Lafuente (stronk7)
07a069f1c0
MDL-50063 unittests: Remove some unnecesary gc_collect_cycles()
...
Now backup and restore operations free logger resources calling
to the destroy() method. This commit ensures:
1) That gc_collect_cycles() is not used anymore in backup-related tests.
2) That all backup and restore controllers in test do always call
to the detroy() method.
3) Some unset() calls, needed to make gc_collect_cycles() are not used
anymore.
2016-05-13 02:50:45 +02:00
David Monllao
724703d3e1
MDL-53170 search: Specify core_course mycourses search level
2016-05-11 17:22:24 +08:00
Eloy Lafuente (stronk7)
fa1e76d563
Merge branch 'MDL-53170_master' of git://github.com/dmonllao/moodle
2016-05-10 18:54:57 +02:00
David Monllao
e314b35471
MDL-53170 search: New area for my courses
...
Thanks to Skylar Kelty for the initial implementation.
2016-05-10 18:15:42 +08:00
David Monllao
33b60a4720
Merge branch 'MDL-54034-master' of git://github.com/FMCorz/moodle
2016-05-09 07:46:53 +08:00
Frederic Massart
1d0140757a
MDL-54034 ajax: Apply filters in ajax requests
...
This also clarified that developers can decide to force filters
to be ignored when using external_format_text, though they cannot
force filters to be turned on as the clients should be able to
opt-out from filtering should they want to.
2016-05-06 17:59:41 +08:00
Frederic Massart
440b4c54ca
MDL-53957 form: Support frontpage for selection in course element
2016-05-06 09:27:31 +08:00
Frederic Massart
f824aceb50
MDL-51369 course: Adding tests to cover restoring course info
2016-05-06 09:27:27 +08:00
Dan Poltawski
1019a8f1ca
Merge branch 'MDL-53904-master' of git://github.com/marinaglancy/moodle
2016-05-02 10:16:27 +01:00