mirror_php/moodle
1
0
Fork 0
mirror of https://github.com/moodle/moodle.git synced 2025-03-28 19:42:56 +01:00
Code Issues Projects Releases Wiki Activity
87,006 Commits 36 Branches 527 Tags
Commit Graph

87006 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Damyon Wiese
41080050b0 Merge branch 'MDL-60558-master' of git://github.com/andrewnicols/moodle 2017-11-02 13:03:35 +08:00
Damyon Wiese
ae348e78a0 Merge branch 'MDL-59982_master' of git://github.com/markn86/moodle 2017-11-02 12:21:39 +08:00
Damyon Wiese
71fc06aae5 Merge branch 'MDL-60645-master' of git://github.com/andrewnicols/moodle 2017-11-02 12:10:04 +08:00
Andrew Nicols
e3491a093a MDL-60558 calendar: Upcoming block should use the right template 2017-11-02 11:55:49 +08:00
Andrew Nicols
a0a78199b8 MDL-60558 calendar: Add event metadata to upcoming template 2017-11-02 11:55:49 +08:00
Andrew Nicols
d523cbcb26 MDL-60558 calendar: Upcoming should support categories 2017-11-02 11:54:43 +08:00
Andrew Nicols
5c9acb8164 MDL-60558 calendar: Adjust URL change 
The URL change belongs in the calendar_view, not the view_manager.
The view_manager is responsibe for updating the view, not for the
resultant actions from it.

This also changes to use pushState so as not to overwrite the current
location in history.
 2017-11-02 11:54:13 +08:00
Andrew Nicols
8242027da3 MDL-60558 calendar: Move edit event to CRUD 2017-11-02 11:53:52 +08:00
Andrew Nicols
fd2f1ae146 MDL-60558 calendar: Remove old SELECTORS 2017-11-02 11:53:49 +08:00
Andrew Nicols
c8419f87c0 MDL-60558 calendar: Harden event link detection 2017-11-02 11:53:26 +08:00
Damyon Wiese
4837fea0aa Merge branch 'MDL-60619-master' of https://github.com/snake/moodle 2017-11-02 11:51:35 +08:00
Damyon Wiese
671440d708 Merge branch 'MDL-60576-master' of git://github.com/andrewnicols/moodle 2017-11-02 11:38:57 +08:00
Andrew Nicols
6c3f463dbd MDL-60558 calendar: Move the summary modal to view_manager 2017-11-02 10:56:00 +08:00
Damyon Wiese
fca7e60c81 Merge branch 'MDL-60655-master' of git://github.com/junpataleta/moodle 2017-11-02 10:45:07 +08:00
Jake Dallimore
1e83eec993 Merge branch 'MDL-60555-master' of https://github.com/sammarshallou/moodle 2017-11-02 10:40:43 +08:00
Jake Dallimore
216bb33940 Merge branch 'master_MDL-60007' of https://github.com/CengageEng/moodle 2017-11-02 08:50:42 +08:00
Andrew Nicols
58280ae0b8 Merge branch 'wip-MDL-60515-master' of git://github.com/abgreeve/moodle 2017-11-02 08:47:17 +08:00
Andrew Nicols
0df5c743ad MDL-60361 calendar: Make eventtype functionality a trait 2017-11-02 07:57:44 +08: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
Eloy Lafuente (stronk7)
c8e7777766 on-demand release 3.4beta+ 2017-11-01 13:40:07 +01:00
Eloy Lafuente (stronk7)
d25f1c3c3c Merge branch 'MDL-60503-master' of git://github.com/damyon/moodle 2017-11-01 10:41:48 +01:00
Adrian Greeve
ab2095fb0f MDL-60515 groups: Behat test for viewing the group description. 2017-11-01 15:24:38 +08:00
Adrian Greeve
6b839f3222 MDL-60515 groups: Group details template change. 
The group details template has been changed to be
simpler and is styled a bit nicer.
 2017-11-01 15:24:38 +08:00
Damyon Wiese
66242b95e0 MDL-60503 npm: Lock required node 8.9.x (LTS) 2017-11-01 14:52:16 +08:00
Mark Nelson
9a428ae012 MDL-59982 core_user: allow user to use filters from same category 2017-11-01 12:55:17 +08:00
Daniel Thee Roperto
b8243e4164 MDL-58047 gradebook: fix sort by submission order. 2017-11-01 15:12:48 +11:00
Damyon Wiese
14a1672cff Merge branch 'MDL-52037-master-fix' of https://github.com/andrewnicols/moodle 2017-11-01 11:14:50 +08:00
Andrew Nicols
89cf38c6d9 MDL-52037 theme: Correct question feedback width 
This relates to the cloze question answer when hovered.
 2017-11-01 11:12:16 +08:00
Andrew Nicols
43a1e9a2a5 MDL-60645 calendar: Add missing clean classes 2017-11-01 09:36:15 +08:00
sam marshall
82735dec4d MDL-60555 core_search: Change unit tests to use fake time 
Using real time caused rare failures. I've changed it to use fake
measurement for the indexing timeouts, which were unit-tested.
 2017-10-31 14:48:09 +00:00
Vervoort, Claude
76f11421a4 MDL-60007 mod lti: allow delete without content-type 2017-10-31 09:57:38 -04:00
Juan Leyva
1b0978abf3 MDL-60433 mod_data: Fix strict check for groupid 2017-10-31 13:24:07 +01: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
David Monllao
4916c9bb66 MDL-52037 theme: Update compiled css 2017-10-31 11:00:59 +01:00
Luca Bösch
8fcb479246 MDL-52037 questions: „Whether correct“-feedback marks adaptive width 2017-10-31 10:42:49 +01:00
Jun Pataleta
73ec9b4778 Merge branch 'MDL-60635-master' of git://github.com/andrewnicols/moodle 2017-10-31 21:30:01 +13:00
Jake Dallimore
9cca2db570 Merge branch 'MDL-60472_master' of git://github.com/markn86/moodle 2017-10-31 15:18:37 +08:00
Jake Dallimore
9daa5874a0 Merge branch 'MDL-60607' of git://github.com/timhunt/moodle 2017-10-31 12:57:36 +08:00
Andrew Nicols
60829fbe6d Merge branch 'MDL-60631_master' of git://github.com/dmonllao/moodle 2017-10-31 12:08:01 +08:00
Mark Nelson
9f33d5ac6e MDL-60472 core_user: filter by group id when specified in URL 2017-10-31 12:05:13 +08:00
Jun Pataleta
1cc7a14ce4 Merge branch 'MDL-59936-int-fix-1' of github.com:ryanwyllie/moodle 2017-10-31 16:02:50 +13:00
Jun Pataleta
958c9c17ca Merge branch 'MDL-57560-master' of git://github.com/damyon/moodle 2017-10-31 15:40:19 +13:00
Ryan Wyllie
4397da0c4d MDL-59936 boost: improve focus outline on modal header 2017-10-31 02:38:29 +00:00
Andrew Nicols
d8966238dd Merge branch 'wip-MDL-60569-master' of git://github.com/marinaglancy/moodle 2017-10-31 10:15:56 +08:00
Andrew Nicols
065a754111 Merge branch 'MDL-60575-master' of https://github.com/snake/moodle 2017-10-31 10:05:38 +08:00
Andrew Nicols
3e4de62607 Merge branch 'MDL-60139' of git://github.com/timhunt/moodle 2017-10-31 09:14:32 +08:00
Andrew Nicols
a37faf9c70 MDL-60635 calendar: Fix end of month issue with previous/next month 
This reverts to the previous way in which this was calculated.
 2017-10-31 08:51:50 +08:00
Andrew Nicols
aba60237cd Merge branch 'MDL-60522-master' of https://github.com/Kathrin84/moodle 2017-10-31 08:12:31 +08:00
Jake Dallimore
5836baf593 MDL-60619 core: fix autocomplete suggestions css for RTL 2017-10-31 07:44:05 +08:00