moodle/moodle
3
0
Fork 0
mirror of https://github.com/moodle/moodle.git synced 2025-08-10 11:26:41 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions
82349 commits 37 branches 544 tags 1.3 GiB
Commit graph

82349 commits

This branch
This branch
All branches
Author SHA1 Message Date
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
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
Neill Magill
bd305a3973 MDL-55209 coursecat: Should be able to remove category idnumber 
Users should be able to remove an idnumber from a category, before this
change when trying to delete an idnumber users would be told it already
existed.

This change also stops 0 from being allowed multiple times as an idnumber.
 2016-11-02 09:50:34 +00:00
Neill Magill
c10bfee49f MDL-55209 coursecat: Should be able to remove category idnumber test 
A user should be able to remove an idnumber from a category, also 0
should not be allowed multiple times.
 2016-11-02 09:50:30 +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
a053229f0f MDL-56690 theme_boost: Allow menus to scroll in the header 
The header is fixed - so if menus in the header are longer than the page, you can't scroll
to the bottom of the menu. This sets max height on the menus to the viewport height - the navbar height and sets them to scroll
auto.
 2016-11-02 15:48:49 +08: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
Damyon Wiese
88e709ae43 MDL-56699 boost: Don't break when activities use onclick in nav 
Boost templates were not nicely rendering onclick handlers in the navbar.
 2016-11-02 13:35:54 +08:00
David Monllao
93dfcf3274 Merge branch 'MDL-56670-master' of git://github.com/lameze/moodle 2016-11-02 13:29:46 +08:00
Simey Lameze
6e4b3752f2 MDL-56670 mod_lesson: adds padding to end of lesson links 2016-11-02 13:12:32 +08:00
David Monllao
eaef8faa61 Merge branch 'MDL-56323-master' of git://github.com/l-campbell/moodle 2016-11-02 13:12:07 +08:00
David Monllao
e14f5db6a0 Merge branch 'wip-MDL-55930-master' of https://github.com/Beedell/moodle 2016-11-02 12:49:46 +08:00
David Monllao
cf0450185e Merge branch 'wip_MDL-55913_master' of git://github.com/gjb2048/moodle 2016-11-02 12:41:48 +08:00
Ankit Agarwal
9d72acb7ed MDL-56634 webservices: Remove script from api desc and clean desc printing 2016-11-02 10:06:05 +05:30
David Monllao
a5f53db190 Merge branch 'MDL-43796_master_blindmarking' of https://github.com/SWiT/moodle 2016-11-02 12:28:43 +08:00
Andrew Nicols
328628544b Merge branch 'MDL-56673-master' of git://github.com/danpoltawski/moodle 2016-11-02 12:07:18 +08:00
Andrew Nicols
8385163bab MDL-56596 tool_usertours: Update to latest version of tours and popper 
The updated release of the popper library addresses some issues where
boundaries were not resepected correctly.
 2016-11-02 11:37:31 +08:00
Andrew Nicols
6055809311 Merge branch 'MDL-56469-M32' of git://github.com/lazydaisy/moodle 2016-11-02 11:31:32 +08:00
Damyon Wiese
6ec7fb8dc1 MDL-56691 theme_boost: Fix height of nav drawer 
It should not be more than the height of the page or you can't scroll to the
last item in the list.
 2016-11-02 10:17:41 +08:00
Andrew Nicols
c6ae02c184 Merge branch 'MDL-48468' of https://github.com/mr-russ/moodle 2016-11-02 10:13:42 +08:00