moodle/moodle
3
0
Fork 0
mirror of https://github.com/moodle/moodle.git synced 2025-08-09 02:46:40 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions
86450 commits 37 branches 544 tags 1.3 GiB
Commit graph

23964 commits

Author SHA1 Message Date
Andrew Nicols
e61ad18e70 Merge branch 'MDL-55356-master' of https://github.com/sammarshallou/moodle 2017-10-12 11:28:04 +08:00
Jake Dallimore
0ce9026307 Merge branch 'MDL-59106_master' of git://github.com/markn86/moodle 2017-10-12 10:53:20 +08:00
Eloy Lafuente (stronk7)
9ead15b629 MDL-60291 libraries: bump readme to actual versions 2017-10-12 00:47:22 +02:00
Eloy Lafuente (stronk7)
5fab66aad8 Merge branch 'MDL-60291-master' of git://github.com/ankitagarwal/moodle 2017-10-12 00:42:57 +02:00
sam marshall
74b7a42d0d MDL-55356 core_search: Make indexing task/CLI do context requests 2017-10-11 17:17:10 +01:00
sam marshall
eacb2bd11b MDL-55356 core_search: API to queue contexts for indexing 
New API \core_search\manager::request_index($context, $areaid = '')
adds the given context to a list which is intended to be indexed
later by the scheduled task.
 2017-10-11 17:17:07 +01:00
sam marshall
d761b3fb19 MDL-55356 core_search: API to check if indexing enabled 
New function \core_search\manager::is_indexing_enabled(), analagous
to existing is_global_search_enabled().

This replaces existing duplicated code, ready for more use in
following commits.
 2017-10-11 17:17:06 +01:00
Damyon Wiese
f4594a22ec Merge branch 'MDL-37361-master-revised' of https://github.com/snake/moodle 
Conflicts:
	lib/db/upgrade.php
	version.php
 2017-10-10 17:32:47 +08:00
Jake Dallimore
8fbc41d8d5 MDL-37361 completion: minor code fixes. 2017-10-10 17:12:09 +08:00
Jake Dallimore
86f359bf68 MDL-37361 completion: automatic completion disabled when overridden 
Changes:
- Activities with auto completion and a completion status overridden to
COMPLETION_COMPLETE are no longer processed by normal completion
triggers.
- All activities can still be completed by students when their
completion status has been overridden to COMPLETION_INCOMPLETE, via
either auto or manual triggers.
- Completion unit tests updated
 2017-10-10 17:10:49 +08:00
Eiz Eddin Al Katrib
60a6b36cd5 MDL-37361 completion: Modified and Added phpunit tests 2017-10-10 17:10:37 +08:00
Eiz Eddin Al Katrib
a39918daae MDL-37361 completion: Enabled overriding activity completion status 2017-10-10 17:10:15 +08:00
Jun Pataleta
37dcdf2202 Merge branch 'wip-MDL-58546-master' of git://github.com/marinaglancy/moodle 2017-10-10 15:26:38 +08:00
Andrew Nicols
c8ee0b642d Merge branch 'MDL-35429-master' of https://github.com/snake/moodle 2017-10-10 14:48:19 +08:00
Damyon Wiese
93effd739f Merge branch 'MDL-59889-master' of git://github.com/Dagefoerde/moodle 2017-10-10 13:05:31 +08:00
Andrew Nicols
69ed35c92a Merge branch 'MDL-59694_master' of git://github.com/dmonllao/moodle 2017-10-10 11:37:49 +08:00
Jun Pataleta
d63c2d35ec Merge branch 'MDL-60205_group_hiding_clean' of git://github.com/davosmith/moodle 2017-10-10 11:08:06 +08:00
Jun Pataleta
658982416c Merge branch 'MDL-60238-master' of git://github.com/ankitagarwal/moodle 2017-10-10 10:47:37 +08:00
Jun Pataleta
7106ac6b15 Merge branch 'MDL-60275_master' of git://github.com/dmonllao/moodle 2017-10-10 10:10:09 +08:00
Eloy Lafuente (stronk7)
4c54ac22d3 Merge branch 'm34_MDL-60318_Undefined_method_file_storage-move_to_trash' of https://github.com/scara/moodle 2017-10-09 23:11:08 +02:00
Eloy Lafuente (stronk7)
eda8027541 Merge branch 'MDL-59811-master' of git://github.com/junpataleta/moodle 2017-10-09 19:52:56 +02:00
Andrew Nicols
f3500bda4e Merge branch 'MDL-59844-master' of git://github.com/Dagefoerde/moodle 2017-10-09 13:58:49 +08:00
David Monllao
dd13fc222c MDL-59694 analytics: Track processed analysables 2017-10-09 07:47:28 +02:00
Andrew Nicols
2e30e9aa0d Merge branch 'wip-MDL-55652-master' of git://github.com/marinaglancy/moodle 2017-10-09 12:42:53 +08:00
Andrew Nicols
5be48c4514 MDL-59897 accesslib: Remove unused reset 2017-10-09 10:37:19 +08:00
Andrew Nicols
6ba5f93ea6 Merge branch 'MDL-59897-master' of https://github.com/sammarshallou/moodle 2017-10-09 10:31:34 +08:00
Jake Dallimore
54945fa728 MDL-35429 roles: teachers and managers can restore automated backups 
Changes the default for the 'moodle/restore:viewautomatedfilearea'
cap from 'Not set' to 'Allow' for the teacher and manager role
archetypes.
 2017-10-09 10:29:07 +08:00
Jake Dallimore
521d900f06 MDL-35429 restore: fixed downloading of automated backup files 2017-10-09 10:29:07 +08:00
Jun Pataleta
4047fccba7 MDL-59811 enrol: Move get_user_enrolment_actions logic to parent class 
* These duplicated implementations can be simplified where the logic
  can be moved to enrol_plugin::get_user_enrolment_actions() method
  itself.
 2017-10-09 10:29:02 +08:00
Andrew Nicols
9f2bb19a47 Merge branch 'MDL-60012_form_neq_regression' of git://github.com/davosmith/moodle 2017-10-09 10:13:30 +08:00
sam marshall
46f7b264a3 MDL-59897 Accesslib: get_user_capability_course is slow 2017-10-06 13:57:55 +01:00
Jan Dageförde
99e632c446
MDL-59889 oauth2: Remove check for storing new refresh token 2017-10-06 14:49:17 +02:00
Jan Dageförde
d5c60ac815
MDL-59844 webdav: Add bearer auth method to WebDAV requests 2017-10-06 14:47:41 +02:00
Mark Nelson
235da74e0b MDL-59106 core: added fields to 'analytics_predictions' table 2017-10-06 17:28:37 +08:00
Jake Dallimore
6d88e204cf NOBUG: Fixed file access permissions 2017-10-06 14:34:29 +08:00
David Monllao
e08c74f5bc MDL-59630 analytics: Unit tests fixes 2017-10-05 17:38:17 +02:00
Andrew Nicols
3ea4f446bc MDL-60096 calendar: Add JS for day view 2017-10-05 16:54:47 +08:00
Andrew Nicols
1afd3c72aa Merge branch 'MDL-59630_master' of git://github.com/dmonllao/moodle 2017-10-05 14:56:57 +08:00
Jun Pataleta
96c27b3658 Merge branch 'MDL-59751-master-v2' of git://github.com/lameze/moodle 2017-10-05 14:53:31 +08:00
Simey Lameze
e830643858 MDL-59751 core_calendar: add get_calendar_upcoming_view webservice 2017-10-05 14:22:55 +08:00
Eloy Lafuente (stronk7)
b6f370112d MDL-59890 upgrade: bump redirect_if_major_update_required 2017-10-04 22:17:25 +02:00
Jun Pataleta
48a3a50aa4 MDL-59890 behat: Revert to checking if isset instead of not empty 
Reverting changes made by commit
1957d33996
 2017-10-04 14:24:15 +08:00
Derek Henderson
a8fe168e08 MDL-55652 grades: Added timemodified as index grade tables 
Added timemodified to grade_categories_history,
grade_items_history, grade_outcomes_history,and scale_history.
 2017-10-04 12:07:01 +08:00
Jun Pataleta
cd7cd9d9c1 Merge branch 'MDL-59890-master' of git://github.com/andrewnicols/moodle 2017-10-04 11:19:33 +08:00
Andrew Nicols
1957d33996 MDL-59890 behat: Check empty not isset for switchids 2017-10-04 11:16:06 +08:00
Andrew Nicols
fb3c0fc38b MDL-59890 calendar: Allow event creation in behat 2017-10-04 11:16:06 +08:00
Eloy Lafuente (stronk7)
e092ec3117 Merge branch 'MDL-33174-master' of https://github.com/matt-catalyst/moodle 2017-10-03 23:01:45 +02:00
Eloy Lafuente (stronk7)
4536f3084d Merge branch 'MDL-59273-master' of https://github.com/lucisgit/moodle 2017-10-03 22:38:13 +02:00
Eloy Lafuente (stronk7)
9376583e4f Merge branch 'MDL-59883-master' of git://github.com/andrewnicols/moodle 2017-10-03 20:58:23 +02:00
Eloy Lafuente (stronk7)
34ecee16bb Merge branch 'MDL-59882-master' of git://github.com/andrewnicols/moodle 2017-10-03 20:48:28 +02:00