Commit graph

5687 commits

Author SHA1 Message Date
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
Rajesh Taneja
78429cc7ef MDL-45774 behat: Fixed button name to be pressed 2015-04-14 15:32:18 +08:00
Dan Poltawski
ce54688f8e Merge branch 'MDL-49723-master' of git://github.com/lameze/moodle 2015-04-14 15:32:16 +08:00
Dan Poltawski
0627d5802c Merge branch 'wip-MDL-45774-master' of git://github.com/abgreeve/moodle 2015-04-14 15:32:13 +08:00
Nadav Kavalerchik
ada407159f MDL-40881 uploaduser: Validate profile fields unique values 2015-04-13 21:42:26 +03:00
Adrian Greeve
6e918b6437 MDL-45774 navigation: General fixes for the user navigation. 2015-04-13 15:54:24 +08:00
Simey Lameze
9b8104ce9b MDL-46963 environment: add check for antelope row format 2015-04-13 14:18:12 +08:00
Andrew Nicols
dfa966c710 Merge branch 'wip_MDL-49828_m29_tz3' of https://github.com/skodak/moodle 2015-04-13 11:01:25 +08:00
Petr Skoda
91bafd76f5 MDL-49828 timezones: improve settings performance 2015-04-12 12:38:06 +12:00
Damyon Wiese
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
Adrian Greeve
8e94fae962 MDL-49412 behat: Update to tool behat tests.
Part of MDL-45774.
2015-04-10 17:18:24 +08:00
Adrian Greeve
f3a493debe MDL-49412 tool_monitor: Minor fixes to stop errors.
Part of MDL-45774.
2015-04-10 17:18:24 +08:00
Adrian Greeve
f6564aa450 MDL-49412 behat: Update to core_admin behat tests.
Part of MDL-45774.
2015-04-10 17:18:22 +08:00
Adrian Greeve
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
Adrian Greeve
45367bdf0c MDL-49688 navigation: First review fixes and version bump.
Part of MDL-45774.
2015-04-10 17:18:03 +08:00
Adrian Greeve
e5cfbeea76 MDL-49630 admin: defaulthomepage changed to dashboard.
Part of MDL-45774.
2015-04-10 17:17:07 +08:00
Adrian Greeve
f495187da7 MDL-48935 navigation: Update the user nav breadcrumbs.
Part of MDL-45774.
2015-04-10 17:17:07 +08:00
Adrian Greeve
880c50731f MDL-48930 navigation: Using user headers in user pages.
Pages that are percieved to be in a user context are now
using a user context for the header.

Part of MDL-45774
2015-04-10 17:17:07 +08:00
Damyon Wiese
e4522f8841 MDL-48934 navigation: Update the default entries in the user menu.
Add mypreferences and remove mybadges and myfiles (You should get to the
last 2 through your dashboard).

Part of MDL-45774
2015-04-10 17:17:07 +08:00
Damyon Wiese
19b2179e94 MDL-45894 navigation: New setting had null default (shows on new install page)
Change default to ''

Part of MDL-45774
2015-04-10 17:17:06 +08:00
Adrian Greeve
c9451960e3 MDL-45894 navigation: My grades update to overview report.
Part of MDL-45774
2015-04-10 17:17:05 +08:00
Damyon Wiese
1fcad8433c MDL-49650 tool_templatelibrary: Change the format for template comments
The documentation comment for a template must now be marked with:
    @template component/templatename

For it to be read by the template library. Previously it was looking for
the first "non gpl license" comment which was a bit random.
2015-04-10 15:35:58 +08:00
Simey Lameze
0148cd852e MDL-49723 tool: deprecate guess_antolope_row_size method 2015-04-10 09:33:35 +08:00
Damyon Wiese
274d79c9d5 MDL-49650 tool_templatelibrary: New tool for browsing mustache templates 2015-04-09 11:57:56 +08:00
Andrew Nicols
78a57b259a Merge branch 'MDL-15187-master' of git://github.com/andrewnicols/moodle 2015-04-08 08:33:11 +08:00
Stephen Parry
2a34360ed9 MDL-15187 tool_uploaduser: assign system roles from CSV
Added feature to assign/unassign system roles stored in the CSV fields
sysrole1, sysrole2... Roles to be unassigned are prefixed with minus.
2015-04-08 08:32:11 +08:00
Dan Poltawski
e64f1fa1c7 Merge branch 'MDL-49740-locking-bugs' of https://github.com/brendanheywood/moodle 2015-04-07 13:08:41 +01:00
Damyon Wiese
75ece778c5 Merge branch 'MDL-49101' of https://github.com/andrewhancox/moodle
Conflicts:
	lib/db/upgrade.php
	version.php
2015-04-07 17:27:17 +08:00
Andrew Hancox
6398ff5387 MDL-49101 core: Add a global admin setting config->requiremodintro
Removed requiremodintro setting from all core activity plugins and replace
with a single global setting.
Deprecated moodleform_mod::add_intro_editor and replaced with
moodleform_mod::standard_intro_elements
2015-04-07 10:11:53 +01:00
Petr Skoda
d6e7a63d9a MDL-49684 timezones: rewrite timezone support
This patch replaces all homegrown timezone
stuff with standard PHP date/time code.

The main change is the introduction of core_date
class that returns normalised user and server
timezones. From now on nobody should be using
$CFG->timezone or $user->timezone directly!

Other new features and fixes:
* admins are prompted for timezone during install
* editing of other users is finally fixed
* timezones are displayed in user profile
* new $this->setTimezone() in phpunit
* time locale is now automatically reset in phpunit
* timezone is now automatically reset in phpunit
* phpunit has Australia/Perth as default timezone
2015-04-06 13:53:51 +12:00
Brendan Heywood
894f36abf9 MDL-49740 Lock: Fixed task lock release bugs 2015-04-03 11:13:03 +11:00
Rajesh Taneja
345c6a1ac0 MDL-49513 behat: Updated step name to match new step 2015-04-02 11:08:21 +02:00
Andrew Nicols
df15759724 Merge branch 'wip-mdl-49513' of https://github.com/rajeshtaneja/moodle 2015-04-02 11:06:27 +02:00
Rajesh Taneja
bed97c39eb MDL-49513 behat: Set admin config using php api
Added a new set to set config using set_config() api
to make steps faster and more efficient
2015-04-01 14:25:23 +08:00
Andrew Nicols
6efd119da2 Merge branch 'MDL-49695_master' of git://github.com/markn86/moodle 2015-03-31 15:14:45 +08:00
Andrew Nicols
ea3a71faf7 MDL-49294 logging: Improve cleanup tests 2015-03-31 14:11:25 +08:00
Andrew Nicols
78045f6583 Merge branch 'log_cleanup_29' of https://github.com/tlevi/moodle 2015-03-31 12:56:31 +08:00
David Mudrák
657cb5ab62 MDL-49377 admin: Recommend keeping the site updated to latest version 2015-03-30 23:15:54 +02:00
Simey Lameze
1bd4b9fcb4 MDL-49114 environment: add slasharguments warning message 2015-03-30 10:15:04 +08:00
Mark Nelson
0f523b2b58 MDL-49695 tool_behat: fixed URL 2015-03-27 16:50:39 -07:00
Tony Levi
3e45fb4151 MDL-49294 logging: Cleanup runs in smaller chunks
Just running a huge log cleanup will probably cause big problems on large sites.
So we break this down into smaller day-by-day chunks until reaching the target.
2015-03-26 12:00:06 +10:30
David Monllao
1c78065ad6 Merge branch 'MDL_45619_m29v5' of git://github.com/sbourget/moodle 2015-03-25 09:38:24 +08:00
Dan Poltawski
4c243a24ab Merge branch 'MDL-49622' of https://github.com/stronk7/moodle 2015-03-24 15:15:44 +00:00
Dan Poltawski
23137001c5 Merge branch 'wip-mdl-49374' of https://github.com/rajeshtaneja/moodle 2015-03-24 13:36:59 +00:00
Eloy Lafuente (stronk7)
50fccc4249 MDL-49622 behat: better handling of profile and tags
This solves some minor annoyances in the run.php script:

A) profile is checked properly, independently of everything else.
B) cli tags get precedence over profile tags.

Indicentally, this also causes run.php to support both profile and
tag in command line together. Previously the use of profile did
invalidate the use of tags.
2015-03-22 11:39:53 +01:00