mirror_php/moodle
1
0
Fork 0
mirror of https://github.com/moodle/moodle.git synced 2025-04-13 20:42:22 +02:00
Code Issues Projects Releases Wiki Activity
93,728 Commits 37 Branches 536 Tags
Commit Graph

7821 Commits

Author SHA1 Message Date
Adrian Greeve
467af62e35 Merge branch 'MDL-65067_master' of https://github.com/dmonllao/moodle 2019-05-22 16:29:52 +08:00
Andrew Nicols
97d791bf3a Merge branch 'MDL-65590-master' of git://github.com/rezaies/moodle 2019-05-22 13:52:14 +08:00
Jun Pataleta
f8a6990a46 Merge branch 'MDL-65591-master' of git://github.com/rezaies/moodle 2019-05-22 11:06:31 +08:00
Shamim Rezaie
26206ddc78 MDL-65590 tool_customlang: Escape html on the standard text field 2019-05-21 14:20:16 +10:00
Eloy Lafuente (stronk7)
3572a25cc3 MDL-65644 upgrade: add 3.7.0 separation line to all upgrade scripts 2019-05-20 19:35:05 +02:00
Shamim Rezaie
1806f70cbb MDL-65591 tool_customlang: Re-adding the save buttons at the bottom 2019-05-21 02:20:20 +10:00
David Monllaó
a9db4f903d MDL-65067 tool_analytics: Limit update_end_date to format_weeks 2019-05-17 16:57:46 +02:00
Jake Dallimore
d08358b866 Merge branch 'MDL-65619-master' of git://github.com/aanabit/moodle 2019-05-16 15:14:27 +08:00
Amaia Anabitarte
92717f89a5 MDL-65619 core_message: Don't unset default notification preferences 
Default notification preferences are not kept when a notification provider is disabled.
 2019-05-15 18:40:13 +02:00
Jun Pataleta
64d680c271 Merge branch 'MDL-65583_master' of git://github.com/dmonllao/moodle 2019-05-15 15:57:05 +08:00
David Monllaó
a1fb183df0 MDL-65583 tool_analytics: Model name from a data attribute 
The credit and the patch using this approach goes to David Mudrák.
 2019-05-13 22:54:28 +02:00
Eloy Lafuente (stronk7)
c9a1a6341c MDL-65571 versions: bump all versions and requires near release 
version = 2019052000 release version
requires= 2019051100 current beta (week6roll2) version
 2019-05-12 23:46:34 +02:00
Jun Pataleta
f49c1dcd4a Merge branch 'MDL-65540-master' of git://github.com/andrewnicols/moodle 2019-05-10 15:59:16 +08:00
Eloy Lafuente (stronk7)
08d40829e9 Merge branch 'MDL-65423-master' of git://github.com/jleyva/moodle 2019-05-09 21:48:26 +02:00
Eloy Lafuente (stronk7)
0eda82e1d6 Merge branch 'MDL-29320-master' of git://github.com/junpataleta/moodle 2019-05-09 19:49:31 +02:00
Sara Arjona
8b0c8764b4 Merge branch 'MDL-65518-master' of git://github.com/damyon/moodle 2019-05-09 16:19:05 +02:00
Shamim Rezaie
9902e215a9 MDL-65540 tool_dataprivacy: Explicit component name in the str helper 2019-05-09 15:24:50 +08:00
Damyon Wiese
d48a52ddb1 MDL-65518 badges: Admin settings warning 
If the backpack is changed to Open Badges V2 backpack,
attempt the authenticate with the site settings and return a warning
if it fails.
 2019-05-09 14:56:21 +08:00
Jun Pataleta
f32b6961c9 Merge branch 'MDL-65141-master' of git://github.com/jleyva/moodle 2019-05-09 12:29:25 +08:00
Michael Hawkins
cbe5c5fed4 MDL-61738 messageinbound: Fix quota checks & filesize for email uploads 
Private files uploaded by email will now honour the file quota limit,
because the filesize is set correctly and checked against users'
remaining personal quota limit. Previously, attachment size was always
set to zero, and quota was checked against the draft area (this is
not valid for email uploads, because each file is moved out of the
draft area as it is processed, so multiple files totalling greater
than the remaining quota would still pass the check).
 2019-05-08 17:54:44 +02:00
Mathew May
a282fc23ea MDL-44484 admin: Remove existing user theme check 2019-05-08 16:14:26 +12:00
Jun Pataleta
6861c4f06e Merge branch 'MDL-44484-master' of https://github.com/Chocolate-lightning/moodle 2019-05-08 10:53:37 +08:00
Mathew May
e6ce167bb7 MDL-44484 admin: Theme can be null and create user 2019-05-08 14:44:30 +12:00
Eloy Lafuente (stronk7)
9b0aec2d65 MDL-65154 competencies: FF 47 does not digest null/missing JS params 
So we are defaulting to 0 when the page is initially called,
instead of current null. That's exactly the same behavior
than when you pick "No filters applied" from the filter menu.

Note that other browsers seems to accept perfectly the missing param
but FF 47.0.1 does not.
 2019-05-07 23:20:38 +02:00
Eloy Lafuente (stronk7)
7726bec6b3 Merge branch 'MDL-63262-master' of git://github.com/damyon/moodle 2019-05-07 16:26:40 +08:00
Sara Arjona
d302d12592 Merge branch 'MDL-65396-master' of https://github.com/lucaboesch/moodle 2019-05-07 16:24:38 +08:00
Jun Pataleta
6498f438a5 Merge branch 'MDL-65153-master' of git://github.com/damyon/moodle 2019-05-07 16:24:37 +08:00
Daniel Neis Araujo
09df597597 MDL-44484 admin: Allow theme field in upload users tool 2019-05-07 12:17:05 +12:00
Damyon Wiese
89da9b4900 MDL-65154 competencies: Filter course competencies 
Add an activity filter to the course competencies screen.
 2019-05-06 09:34:25 +08:00
Luca Bösch
6747ae1416 MDL-65396 theme_boost: Style duration chooser pulldown select. 2019-05-04 11:03:37 +02:00
Damyon Wiese
aae219acce MDL-63262 badges: Add badgr.io 
Upgrade the support for Open Badges 2 to support a real open badges 2 backpack.
Moodle can only talk to one backpack at a time, so after switching backpacks, users
will have to manually disconnect and then reconnect their backpack to the new one.

This commit combines several changes:
* Split classes into badges namespace
* Publish expiry data with a badge
* Publish badge alignments in badges exported to the backpack.
* Export the criteria for a badge to the backpack.
 2019-05-03 15:00:00 +08:00
Jun Pataleta
70cbc37755 Merge branch 'MDL-52828-master' of git://github.com/damyon/moodle 2019-05-03 10:59:42 +08:00
Jun Pataleta
e4fcd07e3e Merge branch 'MDL-65446-master' of https://github.com/ryanwyllie/moodle 2019-05-02 15:00:41 +08:00
Eloy Lafuente (stronk7)
550778cdb6 Merge branch 'MDL-65459-master' of https://github.com/sammarshallou/moodle 2019-05-02 00:24:46 +02:00
sam marshall
ef3f92c70a MDL-65459 Logging: Missed two points relying on non-JSON log format 2019-05-01 12:11:17 +01:00
Adrian Greeve
53c792b119 Merge branch 'MDL-64959_master' of https://github.com/abhimanyuZ/moodle 2019-05-01 14:30:00 +08:00
Jun Pataleta
f22d0153c2 Merge branch 'MDL-65260' of https://github.com/timhunt/moodle 2019-05-01 10:22:32 +08:00
Damyon Wiese
27737ae666 MDL-52828 competencies: Filter by activity 
On the competency breakdown report, allow filter by competencies linked to an activity.
 2019-05-01 09:58:22 +08:00
Eloy Lafuente (stronk7)
09ab093dce Merge branch 'MDL-65397-master-enfix' of git://github.com/mudrd8mz/moodle 2019-05-01 01:42:55 +02:00
Juan Leyva
8c5850a501 MDL-65141 tool_mobile: Return all the language translations 2019-04-30 14:30:51 +02:00
Juan Leyva
f72a482843 MDL-65423 tool_mobile: Fix incorrect option value 2019-04-30 13:38:38 +02:00
Jun Pataleta
5a158f82bb MDL-29320 admin: Improve test for multiple accounts with same email 
* Use Scenario Outlines
* More coverage:
  - Test for email case-sensitivity
  - Updating user profile as admin
  - Updating own user profile
 2019-04-30 16:19:14 +08:00
Ryan Wyllie
c32af3a710 MDL-65446 admin: fix admin email option for cli install 2019-04-30 13:29:56 +08:00
David Mudrák
234b37046f MDL-65397 lang: Use the new strings in Behat scenarios 2019-04-29 11:47:10 +02:00
Helen Foster
f1264719f4 MDL-65397 lang: Import fixed English strings (en_fix) 
Significant string changes:

* direct:view,gradeimport_direct - wording corrected from 'CSV' to
  'spreadsheet'
* limitanswers_help,mod_choice - additional wording added explaining how
  the setting works with groups
* pluginname,customfield_text  - 'Text field' plugin renamed to
  'Short text'
 2019-04-29 11:46:26 +02:00
David Monllaó
a89077e49f MDL-57900 analytics: Site info settings 2019-04-29 09:29:03 +02:00
Eloy Lafuente (stronk7)
c495b17c5f MDL-60418 Behat: Fix missing $installurl 2019-04-25 23:38:01 +02:00
Eloy Lafuente (stronk7)
c080369cb9 Merge branch 'MDL-60418' of git://github.com/timhunt/moodle 2019-04-25 23:25:51 +02:00
Tim Hunt
d1ac356a8b MDL-60418 Behat: Fix broken docs links in Behat code. 2019-04-25 21:32:48 +01:00
David Monllaó
45c8b226be Merge branch 'MDL-64782-master' of git://github.com/rezaies/moodle 2019-04-24 17:37:45 +02:00