Commit graph

3950 commits

Author SHA1 Message Date
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
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
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
Dan Poltawski
4c243a24ab Merge branch 'MDL-49622' of https://github.com/stronk7/moodle 2015-03-24 15:15:44 +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
Rajesh Taneja
c87881b0bd MDL-49374 behat: Get install or re-install error code after composer
After composer is installed make sure we just process only
install or re-install
2015-03-20 13:35:13 +08:00
Tony Levi
d9b3bb0f87 MDL-49531 behat: Fix parallel runner with extraopts 2015-03-16 16:34:43 +10:30
David Monllao
5803e36cc5 MDL-48595 logstore_standard: Fixing unit tests comparing performance
Adding also an extra userid checking as databases
may include userid = 0 records.
2015-03-12 14:17:29 +08:00
Jetha Chan
728e272851 MDL-49224 tooL_generator: fallback to "Test course <x>" when no fullname specified 2015-03-11 15:25:34 +08:00
Eloy Lafuente (stronk7)
3bafe5ebee Merge branch 'MDL-49224-master' of git://github.com/jethac/moodle 2015-03-11 00:16:01 +01:00
Dan Poltawski
6755498637 Merge branch 'MDL-48595_master' of git://github.com/dmonllao/moodle
Conflicts:
	version.php
2015-03-10 09:59:28 +00:00
David Monllao
59aebbed70 MDL-48595 logstore: Replacing references to deprecated interfaces 2015-03-09 08:25:37 +08:00
David Monllao
1cfce08e63 MDL-48595 logstore: Adding new interfaces
sql_reader and sql_internal_table_reader.
2015-03-09 08:25:37 +08:00
Rajesh Taneja
5b9e6b5526 MDL-39752 behat: Added support for behat_wwwroot and behat_dataroot 2015-03-09 07:49:25 +08:00
Rajesh Taneja
b1c36d966e MDL-39752 behat: for drop option don't have to pass parallel option 2015-03-09 07:11:57 +08:00
Rajesh Taneja
b32b2284fe MDL-39752 behat: Show output of failed install process 2015-03-09 07:11:57 +08:00
Rajesh Taneja
1bff616611 MDL-39752 behat: Added Fromrun and torun for running on multiple vms
https://circleci.com
2015-03-09 07:11:56 +08:00
Rajesh Taneja
ef95c163e4 MDL-39752 behat: Don't package default step count with moodle 2015-03-09 07:11:56 +08:00
Rajesh Taneja
027212b034 MDL-39752 behat: Use symfony2/process 2015-03-09 06:52:54 +08:00
Rajesh Taneja
3c71c15c26 MDL-39752 behat: Modified following for parallel run:
1. Create behat datadir within behat_dataroot not at same level
2. Define suffix for link and not use hard-coded values
3. Renamed ns_parallel to run.php
4. Rename variables to best understand them
5. Added support for each run to specify db, prefix, rerun and profile.
6. Showing number of steps in each line of parallel run.
2015-03-09 06:52:54 +08:00
Tony Levi
08e7f97ee4 MDL-39752 behat: Parallel execution support 2015-03-09 06:52:54 +08:00
Jetha Chan
343b11a3fa MDL-49224 course: allow setting fullname and summary in course generator 2015-03-04 11:46:57 +08:00
Andrew Davis
4a85b4c0d0 MDL-49008 lang: removed preemptive deleting of old language files 2015-02-22 19:58:57 +01:00
Andrew Davis
323f95b222 MDL-49008 lang: made lang update error reporting work 2015-02-22 19:58:57 +01:00
Rajesh Taneja
96e4202c3e MDL-48841 admin: Behat table row should start with first row 2015-02-18 15:30:37 +08:00
David Monllao
c8171c1d72 Merge branch 'MDL-48841-master' of git://github.com/lucisgit/moodle 2015-02-17 14:23:22 +08:00
Ruslan Kabalin
d1bb9ea917 MDL-48841 admin: Fix scheduled task reset to defaults finctionality.
It is safe to make fields as non-required, because form validation will not
pass through any empty field anyway.
2015-02-11 11:19:27 +00:00
Eloy Lafuente (stronk7)
83ab09a001 Merge branch 'MDL-49058-master' of git://github.com/jethac/moodle 2015-02-10 13:09:38 +01:00
Jetha Chan
8753653bdb MDL-49058 tool_timezoneimport: better styling 2015-02-05 15:47:47 +08:00
Dan Poltawski
685b6681db Merge branch 'MDL-48945-master' of https://github.com/sammarshallou/moodle 2015-02-03 13:55:10 +00:00
Dan Poltawski
8a5f6a0f9a Merge branch 'wip-mdl-49002' of https://github.com/rajeshtaneja/moodle 2015-02-03 13:16:52 +00:00
Eloy Lafuente (stronk7)
e3b3173357 MDL-48920 tool_generator: fix unit tests 2015-02-03 13:24:50 +01:00
Andrew Nicols
71439af9d5 Merge branch 'MDL-48920-master' of git://github.com/FMCorz/moodle 2015-02-03 16:11:08 +08:00
Rajesh Taneja
2b44d328c3 MDL-49002 behat: Added @_file_upload tag to avoid random fails 2015-01-30 09:00:36 +08:00
sam marshall
a79970a295 MDL-48945 tool_filetypes: Added verification to description setting. 2015-01-29 11:44:50 +00:00
Eloy Lafuente (stronk7)
61b31b4e10 Merge branch 'MDL-48383-master' of git://github.com/FMCorz/moodle 2015-01-27 12:01:04 +01:00
Andrew Nicols
6d5381a38f Merge branch 'MDL-47871_master' of https://github.com/markn86/moodle 2015-01-27 13:09:29 +08:00
Mark Nelson
bb286b6d5f MDL-47871 tool_monitor: allow teachers to duplicate site rules 2015-01-26 19:32:59 -08:00
Frederic Massart
517e0111f3 MDL-48920 tool_generator: Use 'real' names during course generation 2015-01-27 11:26:56 +08:00
David Mudrák
ef86599e99 MDL-48493 admin: Fix PHP warning thrown if unable to detect component
The method detect_plugin_component() returns false or string. The
normalize_component() expects strings only. Passing false to it
(typically when the plugin does not declare its component) caused the
PHP warning.

Credit goes to Ankit Agarwal for spotting this during testing.
2015-01-22 10:02:01 +01:00