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

84018 commits

This branch
This branch
All branches
Author SHA1 Message Date
Jun Pataleta
f113169573 MDL-55956 calendar: Include courses parameter in subquery conditions 2017-03-08 15:30:04 +08:00
Ryan Wyllie
373029ec33 MDL-57975 core: version bump 
Part of MDL-55611
 2017-03-08 03:33:24 +00:00
Ryan Wyllie
8fa8675de8 MDL-57975 core: add userdate mustache php helper 
Part of MDL-55611
 2017-03-08 03:33:24 +00:00
Ryan Wyllie
0e5b3e282f MDL-57975 javascript: add userdate mustache js helper 
Part of MDL-55611
 2017-03-08 03:33:24 +00:00
Ryan Wyllie
b61015cfcd MDL-57975 javascript: add user_date.js 
Part of MDL-55611
 2017-03-08 03:33:23 +00:00
Ryan Wyllie
9c7ffb80d3 MDL-57975 core: test for user date external function 
Part of MDL-55611
 2017-03-08 03:33:23 +00:00
Ryan Wyllie
88c2941b26 MDL-57975 core: add get user date external function 
Part of MDL-55611
 2017-03-08 03:33:23 +00:00
John Okely
c0f70d1a7a MDL-57751 libraries: Remove <2.6 only check from load_installed_plugins 2017-03-08 08:37:36 +08:00
Dan Poltawski
228637feff Merge branch 'MDL-57990-master' of git://github.com/crazyserver/moodle 2017-03-07 14:00:07 -03:00
AMOS bot
305ecff614 Automatically generated installer lang files 2017-03-08 00:05:35 +08:00
Eloy Lafuente (stronk7)
21521604af Merge branch 'MDL-58064-master-enfix' of git://github.com/mudrd8mz/moodle 2017-03-07 16:36:54 +01:00
Dan Poltawski
6dba6a5a6a Merge branch 'MDL-57999_2' of https://github.com/zoebogner/moodle 2017-03-07 11:12:32 -03:00
Dan Poltawski
7ebe17f38a Merge branch 'wip-mdl-58056' of https://github.com/rajeshtaneja/moodle 2017-03-07 11:08:24 -03:00
Dan Poltawski
58798ecb52 Merge branch 'MDL-57361-master' of git://github.com/jleyva/moodle 2017-03-07 11:07:47 -03:00
Tim Hunt
56068f5972 MDL-58035 tool_templatelibrary: fix unit test using removed base theme 2017-03-07 13:35:06 +00:00
Tim Hunt
ea049ee618 MDL-58035 lib: log when the expected theme cannot be initialised 2017-03-07 13:29:46 +00:00
David Monllao
58f7a83036 Merge branch 'MDL-58106' of git://github.com/timhunt/moodle 2017-03-07 13:37:24 +01:00
David Monllao
2aa1855205 Merge branch 'wip-mdl-58091' of https://github.com/rajeshtaneja/moodle 2017-03-07 13:15:55 +01:00
David Monllao
68aab93ea5 Merge branch 'MDL-57280-master' of git://github.com/ryanwyllie/moodle 2017-03-07 13:13:51 +01:00
David Mudrák
e7d380ca40 MDL-58064 lang: Clarify the PHP 7.x limitations 
These are related to SQL*Server support only and affect all PHP 7
versions, not just 7.0.x. Credit goes to Eloy Lafuente for spotting
this.
 2017-03-07 13:01:27 +01:00
David Monllao
9a2e5ad36c Merge branch 'wip-MDL-57485-master' of git://github.com/abgreeve/moodle 2017-03-07 12:15:46 +01:00
David Monllao
02c7f6e888 Merge branch 'MDL-58057-master' of https://github.com/snake/moodle 2017-03-07 12:09:00 +01:00
David Monllao
996731dded Merge branch 'MDL-45584_master' of git://github.com/markn86/moodle 2017-03-07 12:00:01 +01:00
Dan Poltawski
a7fc1af138 MDL-58040 blocks: add upgrade.txt note 2017-03-07 07:46:38 -03:00
Dan Poltawski
a3da85e42e Merge branch 'MDL-58040' of git://github.com/timhunt/moodle 2017-03-07 07:43:46 -03:00
Dan Poltawski
44c4f148da Merge branch 'MDL-55859-master' of git://github.com/ankitagarwal/moodle 2017-03-07 07:02:33 -03:00
Dan Poltawski
473efd8d53 Merge branch 'MDL-58052_behat_get_session_user' of https://github.com/gthomas2/moodle 2017-03-07 06:54:37 -03:00
Dan Poltawski
d04310cb21 Merge branch 'MDL-57362-master' of git://github.com/ankitagarwal/moodle 2017-03-07 06:47:38 -03:00
Ankit Agarwal
0884ddea86 MDL-57362 assign: Fix permission checks 2017-03-07 12:43:30 +05:30
Andrew Nicols
0c90bfe39b Merge branch 'MDL-57972-master' of git://github.com/ryanwyllie/moodle 2017-03-07 14:35:00 +08:00
Ryan Wyllie
75378ded5f MDL-57972 mustache: add shortentext template helper 
Part of MDL-55611
 2017-03-07 06:33:56 +00:00
Ryan Wyllie
180f5f23a6 MDL-57972 javascript: add upgrade instructions for truncate.js 
Part of MDL-55611
 2017-03-07 06:33:56 +00:00
Ryan Wyllie
7172b33e24 MDL-57972 javascript: Change truncate.js behaviour 
Updated truncate.js to behave closer to the moodle implementation of
shorten_text.

Part of MDL-55611
 2017-03-07 05:22:38 +00:00
Ryan Wyllie
d74d91f49a MDL-57972 javascript: Add truncate.js third party lib 
Part of MDL-55611
 2017-03-07 05:22:34 +00:00
Andrew Nicols
342af35ab8 Merge branch 'MDL-55956-master-5' of git://github.com/junpataleta/moodle 2017-03-07 12:07:50 +08:00
Jun Pataleta
f7a9bca847 MDL-55956 mod_assign: Remove calendar events with 'open' eventtype 
Remove creation of calendar events for mod_assign with
eventtype = 'open'. Since mod_assign instance creation only creates a
calendar event for the due date, there's no point in creating an override
event for an event type that does not exist.
 2017-03-07 11:33:17 +08:00
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
Jake Dallimore
e858840437 MDL-58057 core_files: properly trim curl whitelist config when fetching 2017-03-07 09:49:22 +08:00
Ryan Wyllie
b6563dcfc3 MDL-57975 javascript: add sessionstorage.js 
Part of MDL-55611
 2017-03-07 01:29:13 +00:00
Andrew Nicols
29ce005862 MDL-55528 admin: Add a new generic admin setting type 2017-03-07 08:22:42 +08:00
Dan Poltawski
113d58a9f7 MDL-57932 version: bump for new icon 2017-03-06 13:54:32 -03:00
Dan Poltawski
99ad8199d8 Merge branch 'MDL-57932-core-moodle-logo-svg' of https://github.com/lucaboesch/moodle 2017-03-06 13:51:07 -03:00
Dan Poltawski
8b9196d7d2 Merge branch 'MDL-57887-nginx-username-logging' of https://github.com/brendanheywood/moodle 2017-03-06 13:43:38 -03:00
gthomas2
1b5c0dd8d4 MDL-57913 auth_db: Add scheduled task for syncing users 2017-03-06 13:49:15 +00:00
Dan Poltawski
892ceeb74e Merge branch 'MDL-57362-master' of git://github.com/ankitagarwal/moodle 2017-03-06 10:27:10 -03:00
gthomas2
958dbe499a MDL-57631 enrol_ldap: Add sheduled task 2017-03-06 13:24:00 +00: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