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,608 Commits 36 Branches 523 Tags
Commit Graph

81608 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
Andrew Nicols
326b285467 Merge branch 'MDL-56273' of https://github.com/mr-russ/moodle 2016-11-01 10:55:23 +08:00
Andrew Nicols
0d80a4bd0b Merge branch 'wip-MDL-56489-master-v2' of git://github.com/abgreeve/moodle 2016-11-01 10:45:29 +08:00
Andrew Nicols
41c1314fbd MDL-56509 tool_usertours: Fetch all role shortnames 2016-11-01 10:14:48 +08:00
Adrian Greeve
839b391f74 MDL-56489 Lib: force_settings_menu added to pagelib. 
This introduces a flag to force the settings menu
to be displayed on the page if the theme uses a settings
menu. This is for use by activities and resources.
 2016-11-01 10:00:12 +08:00
Simey Lameze
0051b08560 MDL-56651 core_role: add styling to submit buttons 2016-11-01 09:40:53 +08:00
Dan Marsden
3dc868478b MDL-54575 scorm: fix typo in data_preprocessing function 
thanks to Mike Finch for the patch/report.
 2016-11-01 12:11:54 +13:00
Dan Marsden
a2096721c7 MDL-46903 scorm: Fix db error in objectives report for oracle. 
also improve 2004 report handling to help with testing.
 2016-11-01 12:05:35 +13:00
Eloy Lafuente (stronk7)
a1f6a27c80 Merge branch 'MDL-47162' of git://github.com/merrill-oakland/moodle 2016-10-31 22:45:37 +01:00
Eloy Lafuente (stronk7)
8df0fb490b Merge branch 'wip-MDL-56615-master' of git://github.com/marinaglancy/moodle 2016-10-31 20:25:31 +01:00
Eloy Lafuente (stronk7)
2fd11f3516 Merge branch 'MDL-56188-master' of git://github.com/damyon/moodle 2016-10-31 19:59:21 +01:00
Eloy Lafuente (stronk7)
5165c9f460 MDL-56297 forms: Normalize uses of 'url' fields to use size=60 
While this is not related to this issue, when reviewing it was
detected that the size of those url fields was really small and
looking decided to add this bit of normalization over existing uses.
 2016-10-31 19:47:41 +01:00
Eloy Lafuente (stronk7)
7aa17ce256 Merge branch 'MDL-56297-master' of git://github.com/damyon/moodle 2016-10-31 19:47:40 +01:00
Damyon Wiese
de1af8a6ed MDL-56588 theme_boost: Nice wrapping text in flat nav 
When section titles were too long they did not wrap nicely.
 2016-10-31 18:24:43 +00:00
Eric Merrill
880fc15bf0 MDL-47162 core_message: Updating all uses of messaging to add courseid 2016-10-31 14:13:13 -04:00
Eloy Lafuente (stronk7)
c40a53775f Merge branch 'MDL-55799-master' of git://github.com/lameze/moodle 2016-10-31 17:23:11 +01:00