mirror_php/moodle
1
0
Fork 0
mirror of https://github.com/moodle/moodle.git synced 2025-01-31 20:53:53 +01:00
Code Issues Projects Releases Wiki Activity
81,410 Commits 36 Branches 519 Tags
Commit Graph

81410 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
David Monllao
5d0299e275 Merge branch 'MDL-56666-master' of git://github.com/jleyva/moodle 2016-11-03 10:28:59 +08:00
David Monllao
205577718b Merge branch 'MDL-56691-master' of git://github.com/damyon/moodle 2016-11-03 08:22:25 +08: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
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
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
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
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