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
86,439 Commits 36 Branches 519 Tags
Commit Graph

86439 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Jake Dallimore
c36907bf5a Merge branch 'MDL-59106_master-fix2' of git://github.com/dmonllao/moodle 2017-10-12 10:54:47 +08:00
Jake Dallimore
cb9a803d80 Merge branch 'MDL-59106_master-fix' of git://github.com/dmonllao/moodle 2017-10-12 10:54:25 +08:00
Jake Dallimore
0ce9026307 Merge branch 'MDL-59106_master' of git://github.com/markn86/moodle 2017-10-12 10:53:20 +08:00
Jun Pataleta
5bc84e9f17 Merge branch 'MDL-59921-master-fix2' of git://github.com/lameze/moodle 2017-10-12 09:49:49 +08:00
Simey Lameze
2ab3787e18 MDL-59921 calendar: remove disabledIf from group select 2017-10-12 09:19:43 +08:00
Eloy Lafuente (stronk7)
b43a99ad92 Merge branch 'MDL-60209-master-mathjaxlib' of git://github.com/mudrd8mz/moodle 2017-10-12 01:52:47 +02: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
Eloy Lafuente (stronk7)
ae2ae5f46f Merge branch 'MDL-60301-master' of git://github.com/ankitagarwal/moodle 2017-10-12 00:37:11 +02:00
Eloy Lafuente (stronk7)
a9d3910d70 Merge branch 'MDL-60302-master' of git://github.com/jleyva/moodle 2017-10-11 21:14:54 +02:00
Eloy Lafuente (stronk7)
e9802809f4 Merge branch 'MDL-60357-master' of https://github.com/sammarshallou/moodle 2017-10-11 20:49:01 +02:00
Simey Lameze
4aae2cb19e MDL-59921 core_calendar: remove unnecessary behat step 2017-10-11 16:37:46 +08:00
Simey Lameze
580a168a15 MDL-59921 calendar: fix wrong array assumptions 2017-10-11 16:26:51 +08:00
Jun Pataleta
1b3f3d5761 Merge branch 'MDL-60090-master' of git://github.com/andrewnicols/moodle 2017-10-11 15:58:46 +08:00
Andrew Nicols
a7ed05e720 MDL-60090 calendar: Add eventtype icon and truncate 2017-10-11 14:03:01 +08:00
Damyon Wiese
3f94d19060 Merge branch 'MDL-60092-master' of git://github.com/lameze/moodle 2017-10-11 14:02:52 +08:00
Simey Lameze
ca14f182fc MDL-60092 calendar: add missing upcoming view logic 2017-10-11 11:42:41 +08:00
Jun Pataleta
8c0f6e5419 Merge branch 'MDL-59921-master' of git://github.com/lameze/moodle 2017-10-11 11:07:14 +08:00
Simey Lameze
0108fdfa70 MDL-59921 calendar: fix missing course error on event form 2017-10-11 10:03:42 +08:00
Andrew Nicols
544321235d Merge branch 'master_MDL-60276' of https://github.com/CengageEng/moodle 2017-10-11 09:38:47 +08:00
Eloy Lafuente (stronk7)
0a073e9d42 Merge branch 'MDL-60300' of https://github.com/NeillM/moodle 2017-10-11 01:39:55 +02:00
Eloy Lafuente (stronk7)
7b90f69db3 Merge branch 'MDL-60309-master-boostbackground' of git://github.com/mudrd8mz/moodle 2017-10-11 01:34:17 +02:00
Eloy Lafuente (stronk7)
1fee16f4f9 Merge branch 'MDL-60346-master' of https://github.com/sammarshallou/moodle 2017-10-11 01:03:06 +02:00
Eloy Lafuente (stronk7)
559d5c3894 Merge branch 'MDL-60364' of https://github.com/NeillM/moodle 2017-10-11 01:00:13 +02:00
Eloy Lafuente (stronk7)
f8a86c157d Merge branch 'MDL-55358-master' of https://github.com/davidknu/moodle 2017-10-11 00:00:10 +02:00
Eloy Lafuente (stronk7)
70aeddcaf4 Merge branch 'MDL-60002-save-and-show-next' of https://github.com/abalbanyan/moodle 2017-10-10 20:14:42 +02:00
Eloy Lafuente (stronk7)
ae2f169a08 Merge branch 'MDL-60046-master' of git://github.com/damyon/moodle 2017-10-10 19:10:52 +02:00
Juan Leyva
011c5ae476 MDL-60396 mod_workshop: Add checks for maximum gradeover 2017-10-10 17:04:57 +02:00
David Monllao
d4fc830c6f MDL-59106 report_insights: Order prediction values 2017-10-10 12:49:24 +02:00
David Monllao
ce017edd2f MDL-59106 report_insights: Fix predicted value styling 2017-10-10 12:33:26 +02: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
Damyon Wiese
32d641c009 Merge branch 'MDL-60092-master' of git://github.com/lameze/moodle 2017-10-10 17:17:56 +08:00
Jake Dallimore
b08337c35e MDL-37361 completion: Consolidate icon logic and clarify web service 
- Icon generation logic moved to the course renderer.
- Web service should return the completion info only, not HTML.
- JS modified to handle icon rendering in relevant cases.
 2017-10-10 17:12:22 +08:00
Jake Dallimore
8fbc41d8d5 MDL-37361 completion: minor code fixes. 2017-10-10 17:12:09 +08:00
Jake Dallimore
194f142274 MDL-37361 completion: accessibility fixes for completion overrides 
- Fixed aria-roles for links acting as status override buttons
- Used custom_interaction_events for better activation handling
- Replaced core/notification with AMD modal which facilitates better
onhide focus control when cancelling or confirming the action.
 2017-10-10 17:11:48 +08:00
Jake Dallimore
77165c9c83 MDL-37361 behat: added a test covering the activity completion report 2017-10-10 17:11:32 +08:00
Jake Dallimore
6f4adc6be4 MDL-37361 completion: make completion overrides visible to students 
- Set icons in the course/renderer
- Use 'set' in lang strings for simplicity
- Code style fixes
 2017-10-10 17:11:13 +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
7a87627b16 Merge branch 'MDL-59921-master' of git://github.com/lameze/moodle 2017-10-10 16:19:36 +08:00
Simey Lameze
7522ed1f23 MDL-59921 core_calendar: fix phpunit failures on event form 2017-10-10 15:50:46 +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
Simey Lameze
de6d57cfd8 MDL-59921 core_calendar: fix event form behat failures 2017-10-10 15:22:45 +08:00
Andrew Nicols
c8ee0b642d Merge branch 'MDL-35429-master' of https://github.com/snake/moodle 2017-10-10 14:48:19 +08:00
Simey Lameze
4259387ebb MDL-60092 core_calendar: remove unused calendar_get_upcoming method 2017-10-10 13:55:35 +08:00
Simey Lameze
522b84be04 MDL-60092 block_calendar_upcoming: convert to template 2017-10-10 13:55:35 +08:00
Simey Lameze
666d03e119 MDL-60092 core_calendar: new upcoming mini template 2017-10-10 13:55:29 +08:00
Jun Pataleta
e34196d6ef Merge branch 'MDL-59921-master' of git://github.com/lameze/moodle 2017-10-10 13:30:34 +08:00
Damyon Wiese
93effd739f Merge branch 'MDL-59889-master' of git://github.com/Dagefoerde/moodle 2017-10-10 13:05:31 +08:00