mirror_php/moodle
1
0
Fork 0
mirror of https://github.com/moodle/moodle.git synced 2025-02-22 02:49:53 +01:00
Code Issues Projects Releases Wiki Activity
81,555 Commits 36 Branches 523 Tags
Commit Graph

81555 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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 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
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
David Monllao
205577718b Merge branch 'MDL-56691-master' of git://github.com/damyon/moodle 2016-11-03 08:22:25 +08:00
John Beedell
6e1e299554 MDL-54986 Quiz: Disable add button for quiz with attempts 2016-11-02 17:02:59 +00:00
Dan Poltawski
56f763b1f9 Merge branch 'MDL-55841-master' of https://github.com/xow/moodle 2016-11-02 15:24:33 +00:00
Dan Poltawski
ab64cd40b0 Merge branch 'MDL-56372_static_bind_clean_return_val' of https://github.com/BenKelada/moodle 2016-11-02 15:14:46 +00:00
Dan Poltawski
cb2b9a905c Merge branch 'MDL-55825-master' of git://github.com/junpataleta/moodle 2016-11-02 14:41:10 +00:00
Dan Poltawski
4d27d62d08 Merge branch 'wip-MDL-55927-master' of git://github.com/abgreeve/moodle 2016-11-02 14:00:29 +00:00
Dan Poltawski
930cae5bb5 MDL-56637 version: bump 2016-11-02 13:56:46 +00:00
Dan Poltawski
de8388f529 Merge branch 'MDL-56637-master' of git://github.com/dpalou/moodle 2016-11-02 13:56:22 +00:00
Dan Poltawski
867dc76f64 MDL-56582 boost: add some misisng template context 2016-11-02 13:55:05 +00:00
Dan Poltawski
c624351e97 Merge branch 'MDL-56582-master' of https://github.com/xow/moodle 2016-11-02 13:49:50 +00:00
Juan Leyva
2521afd2e8 MDL-56666 message: New WS core_message_get_user_message_preferences 2016-11-02 12:16:23 +00:00
Dan Poltawski
ebdd54f476 MDL-56161 boost: fix confict resolution mistake 2016-11-02 10:20:34 +00:00
Dan Poltawski
e5c726353f MDL-56161 boost: add missing example context 2016-11-02 10:14:00 +00:00
Dan Poltawski
540b01b60d Merge branch 'MDL-56161-master' of git://github.com/damyon/moodle 2016-11-02 09:36:09 +00:00
Dan Poltawski
25b0727e50 Merge branch 'MDL-56433-master' of git://github.com/damyon/moodle 2016-11-02 09:33:28 +00:00
Dan Poltawski
b4b8d4fcc2 Merge branch 'MDL-56621-master-fix' of http://github.com/damyon/moodle 2016-11-02 09:03:05 +00:00
Damyon Wiese
d8cfd61145 MDL-56582 theme_boost: Insert a proxy div for settings menu 
This forces text in the page to wrap around the settings cog. Also
notifications background color goes underneath the div for the
settings cog - so we give it a background color.
 2016-11-02 15:40:17 +08:00
Andrew Nicols
0c6fa2e9a8 Merge branch 'MDL-56698-master' of git://github.com/damyon/moodle 2016-11-02 15:34:06 +08:00
Damyon Wiese
a5d4b54890 MDL-56698 mod_feedback: Make it look ok in boost 2016-11-02 15:25:18 +08:00
Simey Lameze
1d9356d7e9 MDL-56671 mod_scorm: fix styling issues on scorm module 2016-11-02 14:57:13 +08:00
David Monllao
d27db408b9 Merge branch 'MDL-56677-master' of git://github.com/lameze/moodle 2016-11-02 14:55:00 +08:00
Damyon Wiese
b07981e1e1 MDL-56621 forms: Give a default value if format not set 
For forms with a text area, we need to provide a default for the format.
This only affects boost because it is export_for_template.
 2016-11-02 14:42:33 +08:00
Andrew Nicols
8fa816e0b0 Merge branch 'wip-mdl-56273' of https://github.com/rajeshtaneja/moodle 2016-11-02 14:30:08 +08:00
Rajesh Taneja
4a910b9aa6
MDL-56273 cache: Fixed initialise call 
After store is created, it should be checked if
it's ready before calling initialise
 2016-11-02 14:26:50 +08:00
Simey Lameze
4bd9a67bf1 MDL-56677 core_cohort: fix style issues on cohort search fields 2016-11-02 14:10:24 +08:00
Andrew Nicols
e84e836889 Merge branch 'MDL-56634-master' of git://github.com/ankitagarwal/moodle 2016-11-02 14:01:15 +08:00
David Monllao
93dfcf3274 Merge branch 'MDL-56670-master' of git://github.com/lameze/moodle 2016-11-02 13:29:46 +08:00