mirror_php/moodle
1
0
Fork 0
mirror of https://github.com/moodle/moodle.git synced 2025-01-19 06:18:28 +01:00
Code Issues Projects Releases Wiki Activity
80,132 Commits 36 Branches 519 Tags
Commit Graph

6227 Commits

Author SHA1 Message Date
Rajesh Taneja
544de35bc3
MDL-55379 phpunit: Preserve config option if passed 2016-09-22 10:45:47 +08:00
Andrew Nicols
91d52985c5 Merge branch 'MDL-51361' of https://github.com/bostelm/moodle 2016-09-20 11:58:24 +08:00
Eloy Lafuente (stronk7)
0f4b338fbb Merge branch 'wip-mdl-55379' of https://github.com/rajeshtaneja/moodle 2016-09-20 02:06:32 +02:00
Dan Poltawski
daa571af9f Merge branch 'MDL-55944' of https://github.com/mr-russ/moodle 2016-09-19 11:25:12 +01:00
David Monllao
9b0cc781c5 Merge branch 'MDL-48766-master' of git://github.com/danpoltawski/moodle 2016-09-19 16:38:17 +08:00
Dan Poltawski
3fad0f1a24 MDL-48766 iplookup: Update to geoip2 db to support ipv6 
The previous maxmind geoip database is now legacy and the GeoIP2
version supports ipv6.
 2016-09-19 08:59:39 +01:00
Damyon Wiese
644fcbb629 MDL-55837 themes: base and canvas themes removed 
Look for them in the plugins DB if you still need them.
 2016-09-19 13:35:13 +08:00
Henning Bostelmann
4151ed984a MDL-51361 backup: Adding default settings for course import 
Also adding "calendar events" and "competencies" default setting for other backup modes.
 2016-09-18 23:39:57 +01:00
Russell Smith
74ee9d29d2 MDL-55944 testing: Reduce sleep usage. 
Remove sleep() and replace with waiting for a second to roll over,
this results in a simpler call the guarantee time() has moved forward
 2016-09-14 09:49:30 +10:00
Rajesh Taneja
1b319d3d3b
MDL-55379 phpunit: Fix dir separator for cli commands 2016-09-12 09:48:40 +08:00
David Monllao
a74218d464 Merge branch 'MDL-55661-master-enfix' of git://github.com/mudrd8mz/moodle 2016-08-29 14:40:03 +08:00
Dan Poltawski
05fd5c4d34 MDL-55072 tests: work around reset bug 2016-08-25 16:04:42 +01:00
Helen Foster
b61b927356 MDL-55661 lang: Merge English strings from the en_fix language pack 2016-08-25 14:38:07 +02:00
Rajesh Taneja
14f3abee2e
MDL-55072 behat: Changed option to run-with-theme 2016-08-25 08:36:08 +08:00
Rajesh Taneja
3037458049 MDL-55072 behat: Fixed behat_selectors to be removed from contexts 2016-08-24 13:24:34 +08:00
David Monllao
30daa61475 Merge branch 'wip-mdl-55072' of https://github.com/rajeshtaneja/moodle 2016-08-24 09:26:29 +08:00
Rajesh Taneja
b4bc4286bb
MDL-55072 behat: Allow behat_selectors to be overridden 
if theme/tests/behat/behat_theme_{THEME_NAME}_behat_selectors.php
file exits, and has class with same file name then we will
call behat_theme_{THEME_NAME}_behat_selectors::register_moodle_selectors()
to register theme specific selectors. If they are different
then core then they will override
 2016-08-24 09:13:13 +08:00
Rajesh Taneja
5aa9b5cee3
MDL-55072 behat: Added support for overriding theme tests 2016-08-24 08:57:15 +08:00
Dan Poltawski
080f292ed7 Merge branch 'MDL-55273-cookie-secure-default' of https://github.com/brendanheywood/moodle 2016-08-22 15:25:15 +01:00
Brendan Heywood
657ddbf592 MDL-55273 admin: Change $CFG->cookiesecure default to on 2016-08-22 09:20:32 +10:00
Adrian Greeve
4ae0691169 MDL-22183 lib: Time settings removed for stats cron. 
Old settings that should be ignored have been removed from the
statistics cron code.
 2016-08-18 10:13:31 +08:00
Andrew Nicols
b4bb1e65dc Merge branch 'MDL-55445-master-2nd' of git://github.com/FMCorz/moodle 2016-08-17 11:25:24 +08:00
Frederic Massart
2258b4dc41
MDL-55445 core: New setting to host the logos 2016-08-17 10:26:31 +08:00
Andrew Nicols
9d8a3055c0 Merge branch 'MDL-55272' of https://github.com/mr-russ/moodle 2016-08-16 14:55:49 +08:00
Russell Smith
6a3acc84de MDL-55272 lib: Improve test course create performance 
Use core functions that are faster for test file creation.
To support large requests for hashes, the core hash function
must support large hashes without recursion.  PHP has a default
recursion depth of 100 and long hashes don't support this.

Remove transactions as they create performance problems for larger
courses and doesn't introduce significant benefit for developers.

Performance changes meant the times were much faster, a reasonable
guess was taken on performance of an average machine.
 2016-08-16 12:00:21 +10:00
Dan Poltawski
8d37a33b16 Merge branch 'wip-MDL-55494-master' of git://github.com/marinaglancy/moodle 2016-08-15 13:15:15 +01:00
Andrew Nicols
51d85c7c6c MDL-46214 event: Support deprecation of events 
This patch adds two new functions to the event base to allow deprecation of
the individual events, without entirely removing them from the UI.

This is different to our normal deprecation procedure because all events
must support display of historical data. It must also be possible to view
the event information in the event monitor.
 2016-08-15 09:17:02 +08:00
Marina Glancy
951f77006a MDL-55494 tool_monitor: ignore only tool_monitor and logstore_legacy 
previously any plugin type ending with _monitor or _legacy would be ignored
 2016-08-12 13:40:28 +08:00
Andrew Nicols
f1c6194f3d Merge branch 'MDL-55480-master' of git://github.com/FMCorz/moodle 2016-08-09 13:50:55 +08:00
Dan Poltawski
0c4ccf73d9 Merge branch 'wip-MDL-55418-master' of https://github.com/marinaglancy/moodle 2016-08-08 10:33:46 +01:00
fhuebler
269bcf7e97
MDL-55480 competency: Added missing closing tag 2016-08-08 11:00:22 +08:00
Russell Smith
bdca62ac6d MDL-55292 performance: Allow Tideways profiler extension. 
PHP7 doesn't have any default XHProf support and all other
investigated forks don't have stable PHP7.  Tideways is under
active development and is easy to install.  The data format
is compatible with XHProf so it is a drop-in replacement in that way.
 2016-08-04 21:10:03 +10:00
Eloy Lafuente (stronk7)
a9b1af901b Merge branch 'MDL-55166-master-blocksettings' of git://github.com/mudrd8mz/moodle 2016-08-03 00:33:58 +02:00
Marina Glancy
134494e07a MDL-55418 behat: correct exception class name 2016-08-02 17:45:12 +08:00
David Mudrák
0d7c417175 MDL-55166 admin: Fix display of misleading debug warning on manage block 
Blocks can declare has_config() as true without actually using the
default node in the admin tree. Typical use case is when the block
injects its settings to other parts of the admin tree and it assigns
null to its $setting node in its settings.php file.

As Janek L.B. correctly spotted, this led to false debugging message
on admin/blocks.php as the code interpreted it as missing settings.php
file.

The patch adds explicit file existence test for this rare case.
 2016-07-27 23:15:48 +02:00
Eloy Lafuente (stronk7)
ddf1d5c692 Merge branch 'MDL-55244-master' of git://github.com/danpoltawski/moodle 2016-07-27 00:19:40 +02:00
David Monllao
837cec00f9 Merge branch 'wip-mdl-55091-m' of https://github.com/rajeshtaneja/moodle 
Conflicts:
	lib/upgrade.txt
 2016-07-26 10:14:30 +08:00
Rajesh Taneja
52f3e060e4
MDL-55091 phpunit: Following has been deprecated. 
1. getMock()
2. setExpectedException()
3. checkForUnintentionallyCoveredCode renamed to beStrictAboutCoversAnnotation
4. beStrictAboutTestSize renamed to enforceTimeLimit
5. UnitTestCase class is now fully removed.
 2016-07-26 10:11:30 +08:00
David Monllao
854695ee3f Merge branch 'MDL-51242-master' of git://github.com/andrewnicols/moodle 2016-07-26 02:40:35 +08:00
Dan Poltawski
3a0bc0fdc4 MDL-55244 js: build changes 
There should be no changes to minified code
 2016-07-25 07:58:05 +01:00
Dan Poltawski
5bb4f444de MDL-55244 js: fix problems with eslint --fix 
eslint --fix '**/yui/src/**/*.js'
 2016-07-25 07:53:05 +01:00
David Monllao
379ca98642 MDL-55287 search: Check that an engine has been selected 2016-07-21 18:40:29 +02:00
Dan Poltawski
29dcec6803 Merge branch 'MDL-55206-master' of git://github.com/junpataleta/moodle 2016-07-19 10:52:13 +01:00
Jun Pataleta
49ccaee5a9 MDL-55206 admin: Some code cleanup 
* Removed unnecessary TODOs.
* Changed message prompt case to sentence case.
 2016-07-15 14:44:35 +08:00
Jun Pataleta
36b88f2486 MDL-55206 admin: Remove div tags in password policy error message 2016-07-15 14:40:54 +08:00
Anant
e370e069a7 MDL-55141 task: Add CLI debugging for tasks 2016-07-14 09:24:52 -07:00
Eloy Lafuente (stronk7)
5968add63f Merge branch 'MDL-55083_master' of https://github.com/tunele/moodle 2016-07-13 00:09:08 +02:00
tunele
f029401b36 MDL-55083 admin: provide friendly error in case phpxml is missing 2016-07-12 23:35:15 +02:00
David Monllao
eb4f0d9c84 Merge branch 'MDL-54771-master' of git://github.com/cameron1729/moodle 2016-07-12 14:53:32 +02:00
David Monllao
b60d4fca13 Merge branch 'MDL-55048-master' of git://github.com/danpoltawski/moodle 2016-07-12 12:20:35 +02:00