David Mudrák
394034ec6e
MDL-50631 cli: Display the Moodle ASCII logo in the CLI installer header
2015-06-17 22:48:14 +02:00
Andrew Nicols
951bd98f73
Merge branch 'wip-MDL-50222-master' of git://github.com/marinaglancy/moodle
2015-06-15 15:16:30 +08:00
David Monllao
e87acc8386
Merge branch 'MDL-48618-master' of git://github.com/FMCorz/moodle
2015-06-11 14:20:56 +08:00
Frederic Massart
ebea19cb26
MDL-48618 grades: Handling of inconsistencies due to min/max grades
2015-06-10 12:33:41 +08:00
Eloy Lafuente (stronk7)
7d91e86452
Merge branch 'm30_MDL-50415_Add_PHP_Variables_In_PHPInfo_Admin_Page' of https://github.com/scara/moodle
2015-06-09 20:35:02 +02:00
Marina Glancy
2bf60e22f7
MDL-50222 admin: do not use deprecated print_textarea()
2015-06-08 17:10:58 +08:00
David Monllao
5c73688b4a
MDL-50408 tool_log: Extra deprecation tip
...
Adding a debugging message and returning alternative data to keep backwards
compatibility as get_readers is a widely used function.
2015-06-08 15:56:23 +08:00
Dan Poltawski
f73b04871a
Merge branch 'MDL-50155' of https://github.com/andrewhancox/moodle
2015-06-02 12:08:24 +01:00
Dan Poltawski
5ffb982d25
Merge branch 'MDL-49707-master' of git://github.com/ankitagarwal/moodle
2015-06-01 10:09:06 +01:00
Ankit Agarwal
2639cdf0b0
MDL-49707 inbound: localpart should be < 15
2015-06-01 10:06:16 +05:30
Matteo Scaramuccia
7b9f73ee10
MDL-50415 Admin: added the PHP Variables section in the PHPinfo page.
2015-05-30 07:04:46 +02:00
Martin Mastny
96a2e00d42
MDL-39319 langimport: Javascript confirmation when uninstalling
2015-05-29 13:08:33 +08:00
Martin Mastny
6ddf92c774
MDL-39319 langimport: Able to delete more languages at once
2015-05-29 13:08:33 +08:00
David Monllao
de6b4e9dac
Merge branch 'MDL-50340-master' of git://github.com/ankitagarwal/moodle
2015-05-27 11:58:22 +08:00
Eloy Lafuente (stronk7)
777cb3ece8
Merge branch 'wip-mdl-49772' of https://github.com/rajeshtaneja/moodle
2015-05-26 18:48:03 +02:00
Ankit Agarwal
2d3fcda8ec
MDL-50340 adminstration: Fix restore course links
2015-05-25 11:11:20 +05:30
Rajesh Taneja
91a96d402a
MDL-49772 behat: Added support to updatestep file by parallel run
2015-05-21 13:24:29 +08:00
Andrew Hancox
b3834b3632
MDL-50155 core: Move and rename common settings config page
...
AMOS BEGIN
CPY [commonsettings,admin],[commonactivitysettings,admin]
AMOS END
2015-05-18 14:48:01 +01:00
Adrian Greeve
1fc2bb35e6
MDL-49742 lib: Removed additional names on tables for sorting.
...
When additional names are disabled, they are no longer shown as
sortable headings in the enrolment and admin user tables.
2015-05-15 15:29:52 +08:00
Eloy Lafuente (stronk7)
b758ab3053
MDL-50183 upgrade: add 2.9.0 separation line to all upgrade scripts
2015-05-12 00:21:05 +02:00
Adrian Greeve
a19c4b8dd0
MDL-50039 tool_monitor: Behat update to fix selection error
2015-05-07 13:13:04 +08:00
Adrian Greeve
0f510be763
MDL-50039 tool_monitor: Additional checks for subscription.
...
Additional capability checks are now in place to stop unauthorised
users from accessing the event monitor subscription page.
Thanks to Eloy Lafuente for creating a gist with ideas of tackling
No site level capability to the rule subscription.
2015-05-07 13:13:04 +08:00
Dan Poltawski
57fc76ab92
Merge branch 'MDL-50102' of git://github.com/stronk7/moodle
2015-05-06 10:50:35 +01:00
Damyon Wiese
917bd02be5
MDL-49870 tool_templatelibrary: Allow docs in parent template only.
...
If the mustache comment containing the docs for the template is
not found in the theme overridden template, search the original
core/plugin template for the docs.
2015-05-06 14:54:56 +08:00
Eloy Lafuente (stronk7)
26ea380d24
MDL-50102 versions: bump all versions and requires near release
...
version = planned 2015051100 release version
requires= current 2015050500 rc1 version
Note: On purpose, the course format social wrong version (2015102100)
has been kept unmodified. Looking forward a solution right now.
2015-05-05 17:43:19 +02:00
Damyon Wiese
410034eef0
MDL-50085 templates: Minor fixes from peer review
...
* rename get_filename to get_filepath
* phpdocs fixes
* improve formatting of exceptions
* lang string improvement
2015-05-05 03:19:39 +02:00
Damyon Wiese
fcc383db0f
MDL-50085 Mustache : Strictly define the search paths for templates.
...
This change moves several repeated sections of code that was searching
for templates and valid template locations to a new class. It adds
unit tests for the new class and verifies subsystem support for templates.
2015-05-05 03:19:25 +02:00
David Monllao
9996e8954b
Merge branch 'wip-MDL-49846-master-fix' of git://github.com/abgreeve/moodle
2015-05-04 14:57:18 +08:00
David Monllao
3994812f38
Merge branch 'wip-mdl-50042' of git://github.com/rajeshtaneja/moodle
2015-05-04 14:16:09 +08:00
Adrian Greeve
bdf899a503
MDL-49846 tool_monitor: Context simplification and clean up.
...
Removed some unnecessary variables and simplified the context
usage in the index.php page.
2015-05-04 14:05:44 +08:00
Andrew Nicols
6e9abef568
Merge branch 'MDL-49983-master' of git://github.com/xow/moodle
2015-05-04 12:39:48 +08:00
John Okely
4887d15228
MDL-49983 navigation: Remove 'my' from user context navigation
2015-05-04 12:38:50 +08:00
Adrian Greeve
19452c99d7
MDL-49846 tool_monitor: Subscription page now filters on site events.
2015-05-04 12:29:54 +08:00
David Monllao
600596fd6a
Merge branch 'MDL-49840-master' of git://github.com/andrewnicols/moodle
2015-05-01 11:05:59 +08:00
Rajesh Taneja
7fb84d75ee
MDL-50042 behat: Use double quotes to avoid symfony adding it
2015-04-30 16:42:11 +08:00
Frederic Massart
ca6f3a8b5f
MDL-49911 admin: Prevent notices when updatenotifications is disabled
2015-04-28 10:13:36 +01:00
Dan Poltawski
6e28c039cb
Merge branch 'MDL-49956_getstring' of https://github.com/andyjdavis/moodle
2015-04-27 11:03:32 +01:00
Andrew Davis
28343f0e12
MDL-49956 admin: removed unused get_string() params
2015-04-24 08:33:38 +08:00
Frederic Massart
e14388e3a7
MDL-49972 preferences: Fix incorrect title and headings
2015-04-23 16:05:00 +08:00
Andrew Nicols
6866527275
MDL-40811 uploaduser: Optimise testuser code
2015-04-21 11:34:00 +08:00
Andrew Nicols
7464939f6d
Merge branch 'MDL-40881_master' of https://github.com/nadavkav/moodle
2015-04-21 11:17:16 +08:00
Rajesh Taneja
0fe86bbdbb
MDL-49799 behat: replaced asd.com with example.com
...
asd.com is a valid domain, we should use reserved domain names for testing
2015-04-20 11:21:20 +08:00
Rajesh Taneja
f8b71928d2
MDL-49456 behat: Use proper dir separator to support different os
2015-04-17 11:48:37 +08:00
Dan Poltawski
1d81e1afc0
Merge branch 'MDL-49842-master' of git://github.com/xow/moodle
2015-04-16 10:30:28 +01:00
David Monllao
960c0ec405
Merge branch 'wip-mdl-49456' of git://github.com/rajeshtaneja/moodle
2015-04-16 16:39:20 +08:00
Rajesh Taneja
72bac0d3f2
MDL-49456 behat: Fixed following issues in parallel run
...
1. Parallel run without feature should exit with success
2. Updated exit codes to be more clear for each process
3. Fixed wwwroot and dataroot while executing with tags
4. Added support for running scenario/feature
5. Added support for or'ing tags
6. Added support for running single behat site
7. Fixed wrong example in help
8. Use parallel run only when parallel > 1
9. Exit showing behat site is not installed
10. Exit with error, if not a valid option
11. Added usage in help to explain how to use command
12. run.php should be able to run from any path
13. Pass all arguments to single run
2015-04-16 15:44:25 +08:00
John Okely
65903c7607
MDL-49842 install: Set front page summary to '' after cli install
...
This is to prevent front page summary from appearing as a 'new setting'
after the first upgrade of a site installed via cli.
2015-04-16 11:49:22 +08:00
David Monllao
7187ec30cb
Merge branch 'MDL-49377-master-updatemsg' of git://github.com/mudrd8mz/moodle
2015-04-16 09:44:10 +08:00
Andrew Nicols
a910e3885a
MDL-49840 testing: Ensure that composer dependencies are updated
...
We should ensure that composer dependencies are present before running
phpunit and behat. We should also ensure that they match the versions in
the composer.lock file.
Doing so ensures that we have a consistency across the board amongst
testers. All testers are a specific commit will be using the same version
of composer.lock and the same version of the relevant tools.
2015-04-16 09:00:03 +08:00
David Monllao
e256b59702
Merge branch 'MDL-46963-master' of git://github.com/lameze/moodle
2015-04-15 13:35:37 +08:00