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
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
Andrew Davis
f47e4eb4a0
MDL-49070 core_registration: improved site registration scheduled task
2015-03-20 14:22:39 +08: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
Eloy Lafuente (stronk7)
a606eed6a5
Merge branch 'behat_parallel_extraopts' of https://github.com/tlevi/moodle
2015-03-19 12:24:55 +01:00
Tony Levi
d9b3bb0f87
MDL-49531 behat: Fix parallel runner with extraopts
2015-03-16 16:34:43 +10:30
Gary Krige
8098d21b52
MDL-49309 user: sort cohorts by name in bulk user actions
2015-03-13 12:29:39 +02:00
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
David Monllao
42d81ef740
Merge branch 'MDL-49298-master' of git://github.com/merrill-oakland/moodle
...
Conflicts:
version.php
2015-03-11 08:33:23 +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
Dan Poltawski
a0941ad0af
Merge branch 'wip-mdl-39752' of https://github.com/rajeshtaneja/moodle
2015-03-10 08:08:51 +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
Mark Nelson
71611510a0
MDL-46064 install: prevent install/upgrade with MyISAM
2015-03-05 22:29:34 -08:00
Eric Merrill
c803fa6855
MDL-49298 backup: Make tgz file format standard for backups
2015-03-05 10:07:58 -05:00
Marina Glancy
a1ec48c9e8
MDL-45619 repository: corrections to uninstall, display link
2015-03-04 18:42:16 -05:00
Eloy Lafuente (stronk7)
de2f05d50d
Merge branch 'MDL-49379_master' of git://github.com/markn86/moodle
2015-03-04 10:46:18 +01:00
Mark Nelson
05536ad165
MDL-49379 core_webservice: fixed ability to edit services
2015-03-04 01:36:45 -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 Nicols
4b38a19aec
Merge branch 'MDL-49164_old_rego' of https://github.com/andyjdavis/moodle
2015-03-04 08:57:00 +08:00
Andrew Davis
858e92fefe
MDL-49164 admin: removed unused registration config setting
2015-03-04 08:50:39 +08:00
Andrew Davis
3efd707d63
MDL-48975 core_registration: altered registration strings
2015-02-26 19:38:30 +01:00
Dan Poltawski
73d8a50d73
Merge branch 'master-18177' of https://github.com/timpricecatalyst/moodle-1
2015-02-24 11:18:37 +00:00
Andrew Nicols
2eaf309d16
Merge branch 'MDL-49008_lang_vanish' of https://github.com/andyjdavis/moodle
2015-02-24 11:07:05 +08:00