mirror_php/moodle
1
0
Fork 0
mirror of https://github.com/moodle/moodle.git synced 2025-03-22 16:40:07 +01:00
Code Issues Projects Releases Wiki Activity
87,269 Commits 36 Branches 527 Tags
Commit Graph

6965 Commits

Author SHA1 Message Date
Andrew Nicols
e3b699eab7 Merge branch 'MDL-59159' of git://github.com/stronk7/moodle 2017-12-06 19:53:36 +13:00
Jun Pataleta
b908c1add2 Merge branch 'MDL-32350-master' of https://github.com/lucaboesch/moodle 2017-12-06 19:53:35 +13:00
Jun Pataleta
1396cb6346 Merge branch 'wip-MDL-60926-master' of git://github.com/marinaglancy/moodle 2017-12-06 19:53:35 +13:00
Andrew Nicols
adbe17ec68 Merge branch 'MDL-60801' of https://github.com/andrewhancox/moodle 2017-12-06 19:53:32 +13:00
Luca Bösch
fc07f6adbc MDL-32350 admin: Sort users by country ASC and DESC 2017-12-05 07:21:29 +01:00
Jun Pataleta
d8c1a57b99 Merge branch 'wip-MDL-60887-master' of git://github.com/marinaglancy/moodle 2017-12-04 18:24:15 +13:00
Marina Glancy
65a77c7381 MDL-60926 auth: do not map very long profile fields 2017-12-04 09:31:42 +08:00
Eloy Lafuente (stronk7)
e4eba4c346 MDL-59159 upgrade: clean < 3.1.0 upgrade steps 
LTS (3.5) requires previous LTS (3.1)

This just deletes all the upgrade steps previous to 3.1.0. Some
small adjustments, like adding missing MOODLE_INTERNAL or tweaking
globals can also be applied when needed.

Also includes an upgrade step to prevent upgrading from any
version < 2016052300 (v3.1.0) as anti-cheating measure.

Next commit will get rid of/deprecate all the upgradelib functions
not used anymore in codebase.
 2017-12-04 01:18:57 +01:00
Eloy Lafuente (stronk7)
4111611710 MDL-59159 environment: 3.1 (LTS) required 2017-12-04 00:27:53 +01:00
Eloy Lafuente (stronk7)
f0781f34c9 MDL-59159 environment: 3.5 base information 
This is a direct copy of the 3.4 branch to
have changes under control easier in next commits.
 2017-12-04 00:25:48 +01:00
Jun Pataleta
02146e0b21 Merge branch 'MDL-59574-master' of git://github.com/ankitagarwal/moodle 2017-11-28 19:38:23 +13:00
Ankit Agarwal
120a795b4e MDL-59574 analytics: Add model listing to enable_model cli script 2017-11-28 10:52:52 +05:30
Ankit Agarwal
556cb98d16 MDL-59574 tool_analytics: Add model listing to evaluate_model cli script 2017-11-28 10:52:52 +05:30
Marina Glancy
12a67a4266 MDL-60887 registration: allow plugins to register on custom hubs 2017-11-28 11:21:25 +08:00
sam marshall
a938e4096c MDL-60174 core_dml: fix miscellaneous incorrect recordset usage 
The new recordset support for Postgres requires transactions and
will cause errors if recordsets are not closed correctly. This
commit fixes problems that were identified during unit tests, and
via some basic code analysis, across all core code. Most of these
are incorrect usage of recordset (forgetting to close them).
 2017-11-27 11:10:33 +00:00
Andrew Hancox
1744570b2e MDL-60801 tool_uploaduser: Fix issue with defaults being ignored 2017-11-24 15:29:23 +00:00
yair.spielmann
b323508554
MDL-59512 tool_oauth2: add option for basic authentication 2017-11-17 10:15:29 +01:00
Jake Dallimore
55b2742724 Merge branch 'MDL-60741' of git://github.com/timhunt/moodle 2017-11-14 15:28:06 +08:00
Eloy Lafuente (stronk7)
6499085f36 MDL-60784 upgrade: add 3.4.0 separation line to all upgrade scripts 2017-11-12 18:43:30 +01:00
David Monllao
08641175b3 Merge branch 'MDL-60764' of git://github.com/stronk7/moodle 2017-11-10 10:20:25 +01:00
Jun Pataleta
c3925187ed Merge branch 'MDL-60758_master' of git://github.com/dmonllao/moodle 2017-11-10 17:21:15 +13:00
Eloy Lafuente (stronk7)
ba854606e6 MDL-60764 versions: bump all versions and requires near release 
version = 2017111300 release version
requires= 2017110800 current rc2 version
 2017-11-10 02:52:53 +01:00
Jake Dallimore
f5b63fc829 Merge branch 'MDL-60760_master' of git://github.com/dmonllao/moodle 2017-11-10 09:32:17 +08:00
David Monllao
20305a8a8f MDL-60758 tool_analytics: Skip guess start if higher than guess end 2017-11-09 17:11:34 +01:00
David Monllao
5da020169e MDL-60760 tool_analytics: No onlycli link for managers 2017-11-09 17:05:08 +01:00
Tim Hunt
d00007bc45 MDL-60741 purgecaches: did not correctly setup the admin page 
Note that, admin_externalpage_setup does the right capability check.
 2017-11-08 14:30:27 +00:00
Jake Dallimore
5243e93661 Merge branch 'MDL-59256_master' of git://github.com/dmonllao/moodle 2017-11-07 16:03:43 +08:00
David Monllao
76f98c3bd5 MDL-59256 analytics: Move get_activities method to CoI scope 
CoI = community of inquiry model
 2017-11-07 08:14:49 +01:00
Jun Pataleta
a56833d49d Merge branch 'MDL-60611' of git://github.com/stronk7/moodle 2017-11-07 10:14:24 +13:00
Eloy Lafuente (stronk7)
801a372dad MDL-60611 phpunit: switch to namespaced phunit classes 2017-11-02 23:45:34 +01:00
David Monllao
59aff5f949 Merge branch 'MDL-60634-master' of git://github.com/jleyva/moodle 2017-11-02 13:24:58 +01:00
Jun Pataleta
e8da33d86e MDL-60655 tool_httpsreplace: Use \core_text string functions 2017-11-02 10:42:33 +13:00
Jun Pataleta
02331dcd48 MDL-60655 tool_httpsreplace: Use appropriate classes for PHPDocs params 2017-11-02 10:42:33 +13:00
Juan Leyva
098b16fb13 MDL-60634 tool_mobile: Change page used for https test 
We need to do the HTTPS check using a page that:
- Does not redirect (login/index.php may redirect because of auth
plugins)
- Does not return moodle exceptions (some custom exceptions handlers
may launch custom HTTP errors)
 2017-10-31 11:57:25 +01:00
Andrew Nicols
065a754111 Merge branch 'MDL-60575-master' of https://github.com/snake/moodle 2017-10-31 10:05:38 +08:00
Jake Dallimore
ed44df22a8 MDL-60575 lang: Change registration string to html from markdown 2017-10-31 07:30:33 +08:00
Jun Pataleta
526d354991 Merge branch 'MDL-60572-master' of git://github.com/jleyva/moodle 2017-10-30 10:10:34 +13:00
Juan Leyva
6078d420bf MDL-60572 admin: Enforce URLs in forgottenpasswordurl setting 
Also display warnings for admins.
 2017-10-27 11:15:01 +02:00
Juan Leyva
2479a7c446 MDL-60572 admin: Fix forgottenpasswordurl for WS 
We should expect URLs in that field.
The tool_mobile change is to not break the WS response if
forgottenpasswordurl does not contain a URL.
 2017-10-27 11:12:32 +02:00
Andrew Nicols
4d03dbf13d Merge branch 'wip-MDL-60543-master' of git://github.com/marinaglancy/moodle 2017-10-26 14:19:43 +08:00
Damyon Wiese
7dfc9ea6b3 Merge branch 'wip-MDL-60390-fix' of https://github.com/marinaglancy/moodle 2017-10-26 12:52:11 +08:00
Marina Glancy
69e89f4a82 MDL-60390 tool_messageinboud: not strict index comparision 
This is something that changed in the upgraded Horde library. structure->findBody() returns string but structure->contentTypeMap is indexed with ints
 2017-10-26 12:44:51 +08:00
Marina Glancy
786d9cd3a1 MDL-60543 env: Moodle 3.2 and 3.3 do no support PHP7.2 2017-10-25 09:02:22 +08:00
Jake Dallimore
ab94608ffb Merge branch 'MDL-60537-master' of git://github.com/andrewnicols/moodle 2017-10-23 14:28:51 +08:00
John Okely
7eb50b3290 MDL-42834 admin: Remove wwwroot if used with moodle_url 2017-10-23 12:25:36 +08:00
John Okely
672f483670 MDL-42834 admin: Removal of httpswwwroot 2017-10-23 12:25:36 +08:00
John Okely
cd1eb7ce9c MDL-42834 admin: Upgrade script and warning for loginhttps sites 2017-10-23 12:25:36 +08:00
John Okely
4b501ec96b MDL-42834 admin: Deprecate https_required and verify_https_required 2017-10-23 12:25:35 +08:00
John Okely
b58764ff99 MDL-42834 admin: Remove loginhttps 2017-10-23 12:25:35 +08:00
Andrew Nicols
d743dd70cc MDL-60537 tool_httpsreplace: Fix behat following langstring 2017-10-23 08:25:55 +08:00