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
82291 commits 37 branches 540 tags 1.3 GiB
Commit graph

82291 commits

This branch
This branch
All branches
Author SHA1 Message Date
Jake Dallimore
37da62f360 MDL-54751 core_course: Create adhoc task for course module deletion 2016-11-07 07:41:59 +08:00
Jake Dallimore
048f909b07 MDL-54751 core: introduce deletion flag for course modules 
Created a flag, 'deletioninprogress' on the course_modules table to be
used when deleting course modules and course sections. Modified
modinfolib caches such that, when rebuilt, these caches hide the
relevant modules based on the value of the flag.
 2016-11-07 07:41:59 +08:00
Henning Bostelmann
f8b56ac904 MDL-55994 blog: Resolve warning messages in RSS feed generation 2016-11-06 17:38:26 +00:00
AMOS bot
55cbca98ff Automatically generated installer lang files 2016-11-07 00:04:41 +08:00
Eloy Lafuente (stronk7)
b23b9a5b38 MDL-38158 core_media: bump upgrade / version and fix filter test 2016-11-06 02:11:20 +01:00
Eloy Lafuente (stronk7)
6e29346609 Merge branch 'wip-MDL-38158-master' of https://github.com/marinaglancy/moodle 2016-11-06 02:11:19 +01:00
Juan Leyva
1f2e3279b2 MDL-56765 webservice: On new session is started unset old preferences 2016-11-04 19:33:31 +00:00
Juan Leyva
a947ecd634 MDL-56737 tool_mobile: Support private tokens in launch.php 2016-11-04 15:37:42 +00:00
Dan Poltawski
f0049415af MDL-56684 competencies: fix eslint probs in templates 2016-11-04 14:59:57 +00:00
Damyon Wiese
207136f279 MDL-56684 competencies: Boost for competency templates 
Add BS4 markup to all competencies templates. Also tweaked the template library to make it
easier in future when modifying templates and reloading.
 2016-11-04 14:45:58 +00:00
Dan Poltawski
f95c00e551 Merge branch 'wip-MDL-54986-master' of https://github.com/Beedell/moodle 2016-11-04 14:31:00 +00:00
Dan Poltawski
b7b5b35cf5 Merge branch 'MDL-56668-m' of https://github.com/micaherne/moodle 2016-11-04 14:23:10 +00:00
Dan Poltawski
246288c3f9 Merge branch 'MDL-56654-master' of git://github.com/damyon/moodle 2016-11-04 14:20:14 +00:00
Dan Poltawski
1e1e4ff8e5 Merge branch 'MDL-56535-master' of git://github.com/jleyva/moodle 2016-11-04 14:10:48 +00:00
Dan Poltawski
808005ddf9 Merge branch 'MDL-53945' of git://github.com/aolley/moodle 2016-11-04 14:07:26 +00:00
Tony Lin
ce1249be58 MDL-56731 groups: Fixes breadcrumb when returning to groups/index.php 2016-11-04 13:21:43 +00:00
Dan Poltawski
7eb34671c1 on-demand release 3.2dev+ 2016-11-04 11:20:34 +00:00
Dan Poltawski
6765172ed1 NOBUG: Fixed file access permissions 2016-11-04 11:20:33 +00:00
Eloy Lafuente (stronk7)
ba611c4d61 Merge branch 'MDL-56673-fix' of git://github.com/danpoltawski/moodle 2016-11-04 11:40:43 +01:00
Dan Poltawski
6d368fc2f6 MDL-56673 tool_templatelibrary: fix externallib backwards compat 
The function now matches the VALUE_DEFAULT option of the service.
 2016-11-04 10:38:15 +00:00
Eloy Lafuente (stronk7)
79322e0087 Merge branch 'MDL-56740-master' of git://github.com/danpoltawski/moodle 2016-11-04 11:11:32 +01:00
Marina Glancy
7e3f637301 MDL-38158 media_videojs: Add Video.JS player 2016-11-04 17:30:43 +08:00
Marina Glancy
fab11235d8 MDL-38158 core_media: Convert media players to new plugin type 
AMOS BEGIN
  MOV [siteyoutube,core_media],[pluginname,media_youtube]
  MOV [siteyoutube_desc,core_media],[pluginname_help,media_youtube]
  MOV [sitevimeo,core_media],[pluginname,media_vimeo]
  MOV [sitevimeo_desc,core_media],[pluginname_help,media_vimeo]
  MOV [html5audio,core_media],[pluginname,media_html5audio]
  MOV [html5audio_desc,core_media],[pluginname_help,media_html5audio]
  MOV [html5video,core_media],[pluginname,media_html5video]
  MOV [html5video_desc,core_media],[pluginname_help,media_html5video]
  MOV [flashanimation,core_media],[pluginname,media_swf]
  MOV [flashanimation_desc,core_media],[pluginname_help,media_swf]
AMOS END
 2016-11-04 17:30:40 +08:00
Marina Glancy
3c73b26c4b MDL-38158 core_media: more correct semantic for html5 video audio tags 2016-11-04 17:30:31 +08:00
Jun Pataleta
ac67c97ccb MDL-55825 enrol_lti: Fix display of unenrol count on sync 2016-11-04 09:21:02 +00:00
Dan Poltawski
2fe28e0dc3 MDL-56740 geoip tests: update to a more reliable ipv6 location 
Hopefully. It's quite difficult for us to test this funcionality with
altering data sets. Hoping this UCLA v6 address will be more reliable.
 2016-11-04 08:52:40 +00:00
David Monllao
d3c6ad5892 Merge branch 'MDL-46903-master-fix' of git://github.com/junpataleta/moodle 2016-11-04 14:23:16 +08:00
Andrew Nicols
f5ddff27af Merge branch 'MDL-56673-master-fix1' of http://github.com/damyon/moodle 2016-11-04 13:57:16 +08:00
Jun Pataleta
17f63d18a5 MDL-46903 mod_scorm: Apply alias to compare text column 2016-11-04 13:32:24 +08:00
Andrew Nicols
70aa00de87 MDL-56748 cache: Removes cache definition instances in purge_store 
Previously a purge_store was only purging caches but it was leaving a
reference to the store instance for the cache definition.

As a result, the cache was never cleared away correctly and, in cases
where the cache store makes a TCP connection to a backend system, the
number of open sockets was increasing for each store instance.

After a complete purge, as found in the unit test reset, the cache
definitions should be both purged and removed.

This change should also lead to a drop in memory consumption for unit
tests as there will no longer be references to unused definition stores.
 2016-11-04 13:26:46 +08:00
Damyon Wiese
a11c74d186 MDL-56673 tool_templatelibrary: Don't show templates from other themes 2016-11-04 12:52:38 +08:00
Andrew Nicols
da31fc5bff Merge branch 'MDL-56576_master-fix' of git://github.com/dmonllao/moodle 2016-11-04 08:28:08 +08:00
David Monllao
e1074d6ffd Merge branch 'master_MDL-46903' of https://github.com/danmarsden/moodle 2016-11-04 08:24:43 +08:00
David Monllao
629d3e5770 MDL-56576 theme_boost: Add save-settings param to admin search 2016-11-04 08:16:58 +08:00
Adam Olley
4bd8e65273 MDL-53945 mnet: Use moodle_url to provide string with url 
Using moodle_url where possible is preferable to hardcoding uri's as
moodle_url is able to take care of alot of the formatting for us.

In this instance, it handles the $CFG->admin url path for us.
 2016-11-04 09:10:31 +10:30
Michael Aherne
fc60769302 MDL-56668 competencies: Correct namespacing of coding_exception 2016-11-03 13:59:13 +00:00
David Mudrák
abcd53444b MDL-56726 admin: Fix some hard-coded paths to the admin directory 2016-11-03 09:54:28 +01:00
David Monllao
8b0064d5e7 Merge branch 'MDL-56576-master' of git://github.com/damyon/moodle 2016-11-03 15:14:41 +08:00
Andrew Nicols
11bafc2b21 Merge branch 'MDL-56641-master' of git://github.com/damyon/moodle 2016-11-03 15:07:01 +08:00
Andrew Nicols
eff0a3e97f Merge branch 'MDL-56677_master-fix' of git://github.com/dmonllao/moodle 2016-11-03 14:56:32 +08:00
David Monllao
34ef8fa13a Merge branch 'MDL-56481-master' of git://github.com/junpataleta/moodle 2016-11-03 14:51:51 +08:00
David Monllao
18bb2883ce MDL-56677 cohort: Fix cohort search box misalignment 2016-11-03 14:33:07 +08:00
Tim Lock
6e10972bec MDL-56481 tool_lpmigrate: Fix notice when cancelling framework migration 2016-11-03 14:16:36 +08:00
Jun Pataleta
3c7387722d MDL-56720 tool_lp: Do not push empty values to IDs array 2016-11-03 14:09:40 +08:00
Andrew Nicols
bc378b50ec Merge branch 'wip-MDL-44467-master' of git://github.com/abgreeve/moodle 2016-11-03 14:08:21 +08:00
David Monllao
5d0299e275 Merge branch 'MDL-56666-master' of git://github.com/jleyva/moodle 2016-11-03 10:28:59 +08:00
Damyon Wiese
057e1a1f6d MDL-56576 admin: Cannot edit blocks on search page 
Admin search page was processing the blocks delete request before the blocks
could process it.

Added a hidden field to the search results form so it can be sure the form submission
was for saving admin settings.
 2016-11-03 09:40:53 +08:00
Damyon Wiese
2a7c540c48 MDL-56641 admin: Managers can access search page 2016-11-03 09:36:33 +08:00
Damyon Wiese
5ae35b9dee MDL-56654 blogs: Display RSS link in the page 2016-11-03 09:22:51 +08:00
Adam Olley
20ec56504f MDL-53945 mnet: replace hardcoded admin dir with cfg 
Several places in admin/mnet pull in required files using a hardcoded
admin dir string, as this is configurable it needs to use $CFG->admin
instead.

Places where the url is passed through moodle_url don't need to be
updated as that already automatically translates the urls for us.
 2016-11-03 11:12:32 +10:30