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

81774 commits

This branch
This branch
All branches
Author SHA1 Message Date
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
David Monllao
2f8b51f4b7 Merge branch 'MDL-56296-master' of git://github.com/damyon/moodle 2016-11-02 09:57:45 +08:00
David Monllao
f5d9072e51 Merge branch 'MDL-56462-master' of git://github.com/damyon/moodle 2016-11-02 09:14:09 +08:00
Damyon Wiese
9e2f13125a MDL-56161 boost: alignment static form elements 
Wrap the HTML from a static form element with "form-control-static" to apply correct padding.

Also use a span, not a label for unlabelable static form elements.
 2016-11-02 09:06:12 +08:00
Dan Poltawski
b7959d831d Merge branch 'MDL-54112-master' of https://github.com/hcpss-banderson/moodle 2016-11-01 21:31:04 +00:00
Dan Poltawski
777760b6ae Merge branch 'master_MDL-47500' of git://github.com/danmarsden/moodle 2016-11-01 21:29:32 +00:00
Juan Leyva
56c8413712 MDL-55992 webservice: Fix debugging notice when creating token 
This patch also avoid to propagate to logs the private token as is done
in login/token.php
 2016-11-01 21:26:40 +00:00
Dan Poltawski
f99e7ef116 Merge branch 'mdl55456-master' of https://github.com/tlock/moodle 2016-11-01 21:26:05 +00:00
Dan Poltawski
3a24b255ba Merge branch 'MDL-56402-master' of git://github.com/lameze/moodle 2016-11-01 21:24:57 +00:00
Dan Poltawski
20fd5e538c Merge branch 'MDL-56530-master' of git://github.com/andrewnicols/moodle 2016-11-01 21:21:22 +00:00
Dan Poltawski
b9703b8e05 Merge branch 'MDL-56621-master' of git://github.com/damyon/moodle 2016-11-01 21:20:53 +00:00
Juan Leyva
30861fbdaa MDL-56535 forum: Do not return user information in single discussion 
This patch fixes the forum external functions
 2016-11-01 20:52:58 +00:00
Eloy Lafuente (stronk7)
cad8adccc7 on-demand release 3.2dev+ 2016-11-01 19:48:41 +01:00
Dan Poltawski
57911c1f40 Merge branch 'MDL-47162' of https://github.com/stronk7/moodle 2016-11-01 12:13:19 +00:00
Eloy Lafuente (stronk7)
f593e8271a MDL-47162 badges: site & profile badges do not have courseid 
Because of that, we need to set the, now mandatory, SITEID for
those message events to be happy. This does not affect course or
activity badges, both coming with correct courseid.
 2016-11-01 12:47:54 +01:00
Dan Poltawski
9f02188575 Merge branch 'MDL-56587-master' of git://github.com/cameron1729/moodle 2016-11-01 11:35:36 +00:00
John Beedell
7983265241 MDL-55930 Quiz: "Next page button" showing in sequential mode 2016-11-01 11:22:39 +00:00
Dan Poltawski
840ba76c0c MDL-56673 templatelibrary: return false when core template doesn't exist 2016-11-01 10:18:17 +00:00
Dan Poltawski
9bf205fb73 Merge branch 'MDL-55732-master' of git://github.com/damyon/moodle 2016-11-01 09:47:11 +00:00
Dan Poltawski
e0d5d8caed Merge branch 'MDL-56651-master' of git://github.com/lameze/moodle 2016-11-01 09:10:08 +00:00
Dan Poltawski
0cbba93206 Merge branch 'MDL-56514-master-fix1' of https://github.com/lameze/moodle 2016-11-01 08:43:09 +00:00
Simey Lameze
67c89858aa MDL-56402 core_message: remove tabindex attr of not selected users 2016-11-01 15:49:16 +08:00
Simey Lameze
56fa3e011a MDL-56514 core_message: remove messaging enabled check 2016-11-01 14:15:32 +08:00
Damyon Wiese
757f42cb15
MDL-56587 theme_boost: Align header items 
Remove chunks of conflicting CSS added in various places and add navbar-nav -> nav-link to header items.
 2016-11-01 11:36:08 +08:00