de6b4e9dac
Merge branch 'MDL-50340-master' of git://github.com/ankitagarwal/moodle
2015-05-27 11:58:22 +08:00
777cb3ece8
Merge branch 'wip-mdl-49772' of https://github.com/rajeshtaneja/moodle
2015-05-26 18:48:03 +02:00
2d3fcda8ec
MDL-50340 adminstration: Fix restore course links
2015-05-25 11:11:20 +05:30
91a96d402a
MDL-49772 behat: Added support to updatestep file by parallel run
2015-05-21 13:24:29 +08:00
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
b758ab3053
MDL-50183 upgrade: add 2.9.0 separation line to all upgrade scripts
2015-05-12 00:21:05 +02:00
a19c4b8dd0
MDL-50039 tool_monitor: Behat update to fix selection error
2015-05-07 13:13:04 +08:00
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
57fc76ab92
Merge branch 'MDL-50102' of git://github.com/stronk7/moodle
2015-05-06 10:50:35 +01:00
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
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
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
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
9996e8954b
Merge branch 'wip-MDL-49846-master-fix' of git://github.com/abgreeve/moodle
2015-05-04 14:57:18 +08:00
3994812f38
Merge branch 'wip-mdl-50042' of git://github.com/rajeshtaneja/moodle
2015-05-04 14:16:09 +08:00
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
6e9abef568
Merge branch 'MDL-49983-master' of git://github.com/xow/moodle
2015-05-04 12:39:48 +08:00
4887d15228
MDL-49983 navigation: Remove 'my' from user context navigation
2015-05-04 12:38:50 +08:00
19452c99d7
MDL-49846 tool_monitor: Subscription page now filters on site events.
2015-05-04 12:29:54 +08:00
600596fd6a
Merge branch 'MDL-49840-master' of git://github.com/andrewnicols/moodle
2015-05-01 11:05:59 +08:00
7fb84d75ee
MDL-50042 behat: Use double quotes to avoid symfony adding it
2015-04-30 16:42:11 +08:00
ca6f3a8b5f
MDL-49911 admin: Prevent notices when updatenotifications is disabled
2015-04-28 10:13:36 +01:00
6e28c039cb
Merge branch 'MDL-49956_getstring' of https://github.com/andyjdavis/moodle
2015-04-27 11:03:32 +01:00
28343f0e12
MDL-49956 admin: removed unused get_string() params
2015-04-24 08:33:38 +08:00
e14388e3a7
MDL-49972 preferences: Fix incorrect title and headings
2015-04-23 16:05:00 +08:00
6866527275
MDL-40811 uploaduser: Optimise testuser code
2015-04-21 11:34:00 +08:00
7464939f6d
Merge branch 'MDL-40881_master' of https://github.com/nadavkav/moodle
2015-04-21 11:17:16 +08:00
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
f8b71928d2
MDL-49456 behat: Use proper dir separator to support different os
2015-04-17 11:48:37 +08:00
1d81e1afc0
Merge branch 'MDL-49842-master' of git://github.com/xow/moodle
2015-04-16 10:30:28 +01:00
960c0ec405
Merge branch 'wip-mdl-49456' of git://github.com/rajeshtaneja/moodle
2015-04-16 16:39:20 +08:00
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
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
7187ec30cb
Merge branch 'MDL-49377-master-updatemsg' of git://github.com/mudrd8mz/moodle
2015-04-16 09:44:10 +08:00
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
e256b59702
Merge branch 'MDL-46963-master' of git://github.com/lameze/moodle
2015-04-15 13:35:37 +08:00
78429cc7ef
MDL-45774 behat: Fixed button name to be pressed
2015-04-14 15:32:18 +08:00
ce54688f8e
Merge branch 'MDL-49723-master' of git://github.com/lameze/moodle
2015-04-14 15:32:16 +08:00
0627d5802c
Merge branch 'wip-MDL-45774-master' of git://github.com/abgreeve/moodle
2015-04-14 15:32:13 +08:00
ada407159f
MDL-40881 uploaduser: Validate profile fields unique values
2015-04-13 21:42:26 +03:00
6e918b6437
MDL-45774 navigation: General fixes for the user navigation.
2015-04-13 15:54:24 +08:00
9b8104ce9b
MDL-46963 environment: add check for antelope row format
2015-04-13 14:18:12 +08:00
dfa966c710
Merge branch 'wip_MDL-49828_m29_tz3' of https://github.com/skodak/moodle
2015-04-13 11:01:25 +08:00
91bafd76f5
MDL-49828 timezones: improve settings performance
2015-04-12 12:38:06 +12:00
46a2fbc4b7
MDL-49412 Navigation: Remaining behat fixed for nav branch
...
Behat is passing after this change.
Part of MDL-45774.
2015-04-10 17:19:28 +08:00
8e94fae962
MDL-49412 behat: Update to tool behat tests.
...
Part of MDL-45774.
2015-04-10 17:18:24 +08:00
f3a493debe
MDL-49412 tool_monitor: Minor fixes to stop errors.
...
Part of MDL-45774.
2015-04-10 17:18:24 +08:00
f6564aa450
MDL-49412 behat: Update to core_admin behat tests.
...
Part of MDL-45774.
2015-04-10 17:18:22 +08:00
25c634df29
MDL-49726 navigation: Update event monitor subscription.
...
It is now possible for users with the right permissions
to subscribe to events. The link is on the preferences page.
Part of MDL-45774.
2015-04-10 17:18:22 +08:00
45367bdf0c
MDL-49688 navigation: First review fixes and version bump.
...
Part of MDL-45774.
2015-04-10 17:18:03 +08:00
David Monllao