mirror_php/moodle
1
0
Fork 0
mirror of https://github.com/moodle/moodle.git synced 2025-03-15 13:10:08 +01:00
Code Issues Projects Releases Wiki Activity
83,073 Commits 36 Branches 523 Tags
Commit Graph

83073 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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 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
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
Dan Poltawski
892ceeb74e Merge branch 'MDL-57362-master' of git://github.com/ankitagarwal/moodle 2017-03-06 10:27:10 -03: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
Luca Bösch
15de9ec847 MDL-57932 core: Serve the Moodle logo as SVG 
The Moodle logo in the login page footer is served in SVG format.

Signed-off-by: Luca Bösch <luca.beosch@bfh.ch>
 2017-03-04 18:54:35 +01:00
gthomas2
353e78765a MDL-58052 behat: user session function - use to edit current profile 2017-03-03 13:57:01 +00: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
Adrian Greeve
d630c0e37b MDL-57485 themes: Set images to default display type. 
Imported images in atto would no longer hold a URL
tag around it. display: block was the culprit.
 2017-03-03 11:15:23 +08:00
Ankit Agarwal
4d76de6fbf MDL-55859 assign_editpdf: cleanup htmlfile in case of errors 2017-03-02 21:23:02 +05:30
Cameron Ball
e40d5048ca
MDL-57321 theme_boost: Remove extra quotation mark 2017-03-02 16:01:01 +08:00
Russell Smith
f3789f2fb3 MDL-45584 cache: Make identifiers part of the cache creation. 
It is now safe to cache a reference to a cache and expect consistent results.

Changing identifiers altered cache results where a reference was
held to the cache. Identifiers have been set to be cached with
identifiers included so the caches are separate.

As a consequence of this it was identified that invalidation events
and identifiers don't easily work together as an event can't determine
which identifiers should be used for cache invalidation.  So invalidation
events have been made incompatible with identifiers being set.  No core
code used this combination as it's not possible to understand any expected
behaviour.

Event invalidation for application and session caches was centralised to the same
location.  The only difference was the name of the lastinvalidation variable. This
improves support and consistency of invalidation code.
 2017-03-02 11:06:17 +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