mirror_php/moodle
1
0
Fork 0
mirror of https://github.com/moodle/moodle.git synced 2025-03-25 01:50:55 +01:00
Code Issues Projects Releases Wiki Activity
90,113 Commits 36 Branches 527 Tags
Commit Graph

90113 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
David Monllao
4f855defce Merge branch 'wip-MDL-63165-master' of https://github.com/Beedell/moodle 2018-08-28 12:28:25 +02:00
Jake Dallimore
efbbbf3373 Merge branch 'MDL-63101-master' of git://github.com/andrewnicols/moodle 2018-08-28 16:55:07 +08:00
Jake Dallimore
240f437a4d Merge branch 'MDL-63086-master' of git://github.com/andrewnicols/moodle 2018-08-28 08:47:43 +08:00
Andrew Nicols
75ad50cba0 Merge branch 'MDL-62782-master' of git://github.com/damyon/moodle 2018-08-28 07:06:22 +08:00
Eloy Lafuente (stronk7)
ed0d19e7b9 Merge branch 'MDL-62989-master' of git://github.com/mihailges/moodle 2018-08-27 17:51:20 +02:00
Jun Pataleta
1b070cfe41 MDL-63187 tool_dataprivacy: Behat fixes for confirmation lang strings 2018-08-27 22:34:33 +08:00
David Monllao
76e9e2f9c0 Merge branch 'MDL-63174-master-emptyusername' of git://github.com/mudrd8mz/moodle 2018-08-27 15:06:55 +02:00
David Monllao
c682ea4fd1 Merge branch 'MDL-63179-master' of https://github.com/lucaboesch/moodle 2018-08-27 12:21:00 +02:00
David Monllao
0d9ddf210c MDL-63187 tool_dataprivacy: Update delete purpose and category lang strings 2018-08-27 12:11:53 +02:00
David Monllao
b8122ba333 Merge branch 'MDL-63187-master' of git://github.com/junpataleta/moodle 2018-08-27 11:54:24 +02:00
David Monllao
ed20d9dbe9 Merge branch 'MDL-63210_master' of git://github.com/markn86/moodle 2018-08-27 11:46:27 +02:00
David Monllao
39d5bf09eb Merge branch 'MDL-63234-master' of git://github.com/andrewnicols/moodle 2018-08-27 11:32:09 +02:00
David Monllao
12f767820a Merge branch 'MDL-62867-missing_colon_in_query' of https://github.com/bitumin/moodle 2018-08-27 11:22:27 +02:00
Andrew Nicols
111c6a5661 MDL-63086 block_rss_client: Move skip time calculation to task 2018-08-27 15:49:27 +08:00
Andrew Nicols
fdab90a7d4 Merge branch 'MDL-53024-master' of git://github.com/damyon/moodle 2018-08-27 15:45:57 +08:00
Andrew Nicols
0a197875df MDL-63101 cache: Improve accuracy of cache event invalidation 2018-08-27 14:43:42 +08:00
Andrew Nicols
16159f2223 Merge branch 'MDL-59169-master' of https://github.com/nwp90/moodle 2018-08-27 09:43:30 +08:00
Andrew Nicols
1a5a0b9b5f MDL-63234 blocks_recent_activity; Ensure courselib is loaded 2018-08-25 08:39:03 +08:00
John Beedell
d0a60444a1 MDL-63165 Question: xml import of question categories 2018-08-24 15:20:18 +01:00
Mitxel Moriana
d2029eff28 MDL-62867 tags: Fix missing colon in sql placeholder 
Due to a missing colon in an sql query field value placeholder
the calculation of the ordering field for a newly added tag
was ignoring itemid.
 2018-08-24 14:59:13 +02:00
Luca Bösch
2711941cb9 MDL-63179 enrol_self: String and @return tag corrected. 2018-08-24 13:38:19 +02:00
Mihail Geshoski
d6e8841313 MDL-62989 privacy: Improve data request order for users 2018-08-24 15:32:34 +08:00
Jake Dallimore
8df868e9e0 weekly release 3.6dev 2018-08-24 13:08:47 +08:00
Mark Nelson
ce1db1f7db MDL-63210 core: convert for loop to forEach in JS 2018-08-24 11:31:32 +08:00
Eloy Lafuente (stronk7)
a20ff7089c Merge branch 'MDL-63028-master' of git://github.com/bmbrands/moodle 2018-08-23 12:48:41 +02:00
Bas Brands
4a5ceb215f MDL-63028 Theme boost: fix footer maintenance page 2018-08-23 10:55:26 +02:00
Jun Pataleta
e477bed27b MDL-63187 tool_dataprivacy: Improve confirm message lang strings 
* Updated the delete confirmation messages so that the category/purpose
names are shown in italics. This makes it easier for the privacy officer
to see the category/purpose that is being deleted.
 2018-08-23 16:53:03 +08:00
Andrew Nicols
2c6771d793 Merge branch 'MDL-57281-master-fix' of https://github.com/andrewnicols/moodle 2018-08-23 15:47:28 +08:00
Andrew Nicols
67984597fb MDL-57281 question: Correct path to Quiz admin in test 2018-08-23 15:44:23 +08:00
Jake Dallimore
a37a616213 Merge branch 'MDL-57281-master-fix' of https://github.com/andrewnicols/moodle 2018-08-23 08:20:13 +08:00
Andrew Nicols
e8449116ef MDL-57281 enrol_lti: Nav to Published as LTI tools 2018-08-23 08:08:59 +08:00
Víctor Déniz Falcón
5a4b4c06ec MDL-57281 behat: Fix some goutte tests (cannot click on li) 
Simply they are not needed, without JS everything is expanded.
 2018-08-22 18:34:50 +02:00
Jake Dallimore
7e93539cf6 MDL-36255 core_grade: fix to ensure correct context used for filters 
Some grade object (outcomes,scales) can be created at site or course
context, so this patch just makes sure we use the respective context
when applying format_string to the name in the get_name() function.
 2018-08-22 17:55:50 +08:00
Damyon Wiese
334db37769 MDL-53024 assign: Remove incorrect logic in query 
We are simplifying this query so it will return grades if the attempt matches
the submission attempt, or there is no submission. The case where there is a grade
but no submission can happen only for group assignments.
 2018-08-22 12:59:10 +08:00
Andrew Nicols
d5bf22ecd1 Merge branch 'MDL-62660' of https://github.com/stronk7/moodle 2018-08-22 08:02:47 +08:00
Eloy Lafuente (stronk7)
726c0ab9a3 MDL-62660 xmldb: fix tool_dataprivacy_request_>status to int(2) 
So the new defined statuses fit in the column for all databases.
 2018-08-21 23:57:35 +02:00
Eloy Lafuente (stronk7)
3a6f371640 Merge branch 'MDL-63028-master' of git://github.com/bmbrands/moodle 2018-08-21 19:23:37 +02:00
Jun Pataleta
9193226522 MDL-63187 tool_dataprivacy: Behat tests for purposes/categories CRUD 2018-08-21 16:34:29 +08:00
Jun Pataleta
bcff8dfb3f MDL-63187 tool_dataprivacy: Fix delete button text 
* No need to add the purpose/category name for the delete button itself
* Fix delete confirmation lang strings.
* Add button titles to Add purpose/category buttons so they can be
  clicked on when running Behat tests.
 2018-08-21 16:18:55 +08:00
Jake Dallimore
805ce3de79 Merge branch 'MDL-36255-master' of https://github.com/lucaboesch/moodle 2018-08-21 16:04:17 +08:00
Jake Dallimore
e9f1946ca1 Merge branch 'MDL-62534-master' of https://github.com/mackensen/moodle 2018-08-21 11:43:56 +08:00
Andrew Nicols
440dad627f Merge branch 'MDL-62660-master' of git://github.com/junpataleta/moodle 2018-08-21 11:09:33 +08:00
Andrew Nicols
9adf5f0595 Merge branch 'MDL-57281-master' of https://github.com/vmdef/moodle 2018-08-21 10:49:10 +08:00
Jun Pataleta
4ecb1c6221 MDL-62660 tool_dataprivacy: Behat fix for data deletion 2018-08-21 10:27:21 +08:00
Jun Pataleta
237c85d303 MDL-62660 tool_dataprivacy: CI fixes 2018-08-21 09:28:48 +08:00
Andrew Nicols
13b4a1f4bb Merge branch 'MDL-63131-master' of https://github.com/sammarshallou/moodle 2018-08-21 08:57:17 +08:00
sam marshall
b5311ce466 MDL-63131 Web services: Callback to allow web service overrides 2018-08-20 15:32:34 +01:00
Charles Fulton
4a34a26aa9 MDL-62534 course formats: do not purge empty sections on upgrade 2018-08-20 09:11:01 -04:00
Víctor Déniz Falcón
02fda279ed MDL-57281 behat: deprecated step definition I navigate to node in 
Definition step deprecated and affected tests modified.
 2018-08-20 12:53:26 +01:00
Michael Hawkins
a1e1cf63fd MDL-62660 tool_dataprivacy: Behat additions for deletion and data expiry 2018-08-20 15:31:20 +08:00