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

83039 commits

This branch
This branch
All branches
Author SHA1 Message Date
Jun Pataleta
f52459bbbe MDL-55956 calendar: Show only one of duplicate events relevant to user 
If there are multiple, non-repeating events with the same module name,
instance and event type. The most specific event or the event with the
highest priority will be shown.
The ordering of event priorities:
  User override events > Group override events > Course events.
If there are no user override events and there are multiple group
overrides for an event, then the one with the highest priority will be
shown.
 2017-03-07 11:33:17 +08:00
Jun Pataleta
98239b2df8 MDL-55956 mod: Set event priority for activity overrides 
Set the event priority of the following activity overrides:
* mod_assign
* mod_lesson
* mod_quiz
Always create separate events for start and end dates of activities.
 2017-03-07 11:33:13 +08:00
Jun Pataleta
ca75ec4fe0 MDL-55956 db: Add priority column for event table 
* New priority column in order to enable the rendering of a single,
relevant calendar event for a module that has user/group overrides.
* Insert refresh_mod_calendar_events_task record to task_adhoc
table to upgrade existing calendar events for mod plugins via cron
after upgrade process.
 2017-03-06 16:15:26 +08:00
Jun Pataleta
37d0c7c7fd MDL-55956 core: New adhoc task refresh_mod_calendar_events_task 
* New adhoc task that loops over mod plugins and calls the
<modname>_refresh_events() hook, if available.
 2017-03-06 16:12:07 +08:00
Jun Pataleta
efe2497623 MDL-55956 mod: New function *_get_group_override_priorities() 
New module functions quiz_get_group_override_priorities() and
lesson_get_group_override_priorities() to calculate the priorities
of group overrides for a quiz/lesson activity.
 2017-03-06 16:10:54 +08:00
Eloy Lafuente (stronk7)
3c45d26f58 weekly release 3.3dev 2017-03-03 10:33:35 +01:00
Eloy Lafuente (stronk7)
a516247092 Merge branch 'install_master' of https://git.in.moodle.com/amosbot/moodle-install 2017-03-03 10:33:30 +01:00
Cameron Ball
e40d5048ca
MDL-57321 theme_boost: Remove extra quotation mark 2017-03-02 16:01:01 +08:00
Andrew Nicols
1b70f778fd MDL-53978 tool_usertours: No tours for guest or no user 2017-03-02 10:24:06 +08:00
Andrew Nicols
50dcc8af9c MDL-53978 core: Do not run callbacks if upgrade is running 2017-03-02 10:24:05 +08:00
Eloy Lafuente (stronk7)
bb9716ccd6 Merge branch 'MDL-57321-master' of git://github.com/cameron1729/moodle 2017-03-02 00:00:37 +01:00
Cameron Ball
df21e24f26
MDL-57321 theme_boost: Remove duplicate aria-labelledby attribute 2017-03-01 11:35:50 +08:00
Cameron Ball
32778e73de
MDL-57321 theme_boost: Fix improperly nested ul elements in footer 2017-03-01 11:35:50 +08:00
Cameron Ball
c77cdbd704
MDL-57321 theme_boost: Use div instead of span for dropdown items 2017-03-01 11:35:49 +08:00
Cameron Ball
f6d94dc01f
MDL-57321 theme_boost: Consistently apply attributes on elements 2017-03-01 11:35:44 +08:00
Andrew Nicols
7b0a41447a Merge branch 'MDL-58072_master_tabtree_mustache' of https://github.com/mchurchward/moodle 2017-03-01 11:09:38 +08:00
Eloy Lafuente (stronk7)
b0253c3323 Merge branch 'wip-MDL-48228-master-v2' of git://github.com/abgreeve/moodle 2017-03-01 02:56:56 +01:00
Eloy Lafuente (stronk7)
b239dfd9aa Merge branch 'MDL-53978-master-fix' of https://github.com/andrewnicols/moodle 2017-03-01 02:46:06 +01:00
Andrew Nicols
e890de5531 Merge branch 'm33_MDL-57789_Add_Cache_Control_Immutable_Support' of https://github.com/scara/moodle 2017-03-01 09:31:45 +08:00
Andrew Nicols
5d86494808 MDL-53978 core: Improve cache usage when no callbacks are defined 2017-03-01 09:18:13 +08:00
Adrian Greeve
8c1288dbdb MDL-48228 database: Unit test addition and update. 2017-03-01 09:03:12 +08:00
Adrian Greeve
0bbefd81cd MDL-48228 database: Make utf8mb4 the default character set for mysql. 
Thanks to Jetha Chan for providing the initial patch that this is
based on.
 2017-03-01 09:03:12 +08:00
Eloy Lafuente (stronk7)
dd6b41a5c7 Merge branch 'MDL-58071-master' of git://github.com/jleyva/moodle 2017-02-28 22:57:09 +01:00
Eloy Lafuente (stronk7)
211843420d Merge branch 'MDL-55980-master' of https://github.com/sammarshallou/moodle 2017-02-28 22:11:16 +01:00
Eloy Lafuente (stronk7)
1e8af13516 Merge branch 'MDL-55762-master' of git://github.com/ankitagarwal/moodle 2017-02-28 20:38:56 +01:00
David Monllao
f3221d8d79 Merge branch 'wip-MDL-51833-master' of git://github.com/abgreeve/moodle 2017-02-28 11:29:33 +01:00
Andrew Nicols
b6cab2b505 Merge branch 'MDL-58038-master-3' of https://github.com/snake/moodle 2017-02-28 12:19:33 +08:00
Jake Dallimore
9e44cec27f MDL-58038 email: make sure all allowedemaildomain entries are respected 
Fixes a bug with exploding the config var, in which trailing carriage
returns were causing string matches to fail.
 2017-02-28 12:17:52 +08:00
Andrew Nicols
3c395fe486 Merge branch 'master' of git.in.moodle.com:moodle/integration; branch 'MDL-35980-master' of git://github.com/snake/moodle 2017-02-28 10:33:40 +08:00
Jake Dallimore
2671500dee MDL-35980 behat: fix link text in submission_comments feature 2017-02-28 10:23:21 +08:00
Andrew Nicols
d83be33f3d MDL-55547 tool_monitor: Coding style fixes 2017-02-28 09:43:21 +08:00
Andrew Nicols
d28357fbca Merge branch 'wip-MDL-55547-master' of git://github.com/marinaglancy/moodle 2017-02-28 09:43:14 +08:00
Eloy Lafuente (stronk7)
7002b7c320 Merge branch 'MDL-58041_master' of https://github.com/sam-moodle/moodle 2017-02-28 02:29:17 +01:00
Eloy Lafuente (stronk7)
b4472fb459 Merge branch 'MDL-57524_master' of https://github.com/nadavkav/moodle 2017-02-28 02:24:08 +01:00
Eloy Lafuente (stronk7)
06fb1df811 Merge branch 'MDL-58030' of git://github.com/aolley/moodle 2017-02-27 22:47:14 +01:00
Andrew Nicols
d21b71fb1a MDL-53978 usertours: Coding style fix 2017-02-27 15:21:36 +08:00
Andrew Nicols
d9a5f82086 Merge branch 'MDL-53978-render-callbacks' of https://github.com/brendanheywood/moodle 2017-02-27 15:20:28 +08:00
Andrew Nicols
71cc1e529d Merge branch 'MDL-50719-fast-locks' of https://github.com/brendanheywood/moodle 2017-02-27 13:42:55 +08:00
Andrew Nicols
696099b94f Merge branch 'MDL-35980-master' of git://github.com/snake/moodle 2017-02-27 11:58:23 +08:00
Ankit Agarwal
1f3556b010 MDL-55762 assignpdf: Handle errored pages better 2017-02-27 09:24:07 +05:30
Ankit Agarwal
b6d06a5f78 MDL-55762 assignpdf: Fix bug in phpdocs 2017-02-27 09:24:07 +05:30
Andrew Nicols
50d567767c Merge branch 'MDL-58032-master' of git://github.com/ankitagarwal/moodle 2017-02-27 11:45:30 +08:00
Andrew Nicols
b117fb3db9 MDL-33483 repository: Coding style tidyup 2017-02-27 11:31:00 +08:00
Andrew Nicols
eccbea3dd0 Merge branch 'MDL-33483_m33v2' of https://github.com/sbourget/moodle 2017-02-27 10:40:21 +08:00
Adrian Greeve
7c8afa8ff8 MDL-51833 tool_monitor: Improve access check for monitor. 2017-02-27 08:59:45 +08:00
Matteo Scaramuccia
203c5bce27 MDL-57789 files: Reviewed lifetime value 2017-02-25 23:42:37 +01:00
Matteo Scaramuccia
ed0a1cd708 MDL-57789 files: Use immutable Cache-Control extension. 2017-02-25 23:42:35 +01:00
Matteo Scaramuccia
f2de8226a8 MDL-57789 files: Used if-then instead of ternary operators 2017-02-25 23:36:07 +01:00
Matteo Scaramuccia
7338ce0182 MDL-57789 files: Let send_stored_file() rely on send_file(). 2017-02-25 23:36:04 +01:00
Nadav Kavalerchik
f9c1a7515a MDL-57524 theme_boost: Fix ignored input size on admin pages 2017-02-24 21:52:41 +02:00