mirror_php/moodle
1
0
Fork 0
mirror of https://github.com/moodle/moodle.git synced 2025-01-18 22:08:20 +01:00
Code Issues Projects Releases Wiki Activity
82,216 Commits 36 Branches 519 Tags
Commit Graph

82216 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Andrew Nicols
a954685767 Merge branch 'MDL-56988-master' of git://github.com/lameze/moodle 2016-11-23 15:53:49 +08:00
Andrew Nicols
020fb9d2dc Merge branch 'MDL-56733-master' of git://github.com/ankitagarwal/moodle 2016-11-23 15:50:38 +08:00
Ankit Agarwal
2c0dfa7d33 MDL-56733 boost: Add a preset repo link 2016-11-23 13:14:48 +05:30
Damyon Wiese
ea5084f7f1 MDL-56993 boost: Fix navigation for singleactivity format 
The single activity course format has no course front page, so we need
to make a special case for it so it's possible to get to the course
admin menu and put the course nodes in the flat navigation.
 2016-11-23 15:31:27 +08:00
Simey Lameze
270b2e443c MDL-56988 report: review and apply boosty styles to all reports 2016-11-23 15:30:32 +08:00
Mark Nelson
afa68a8174 MDL-57069 core_message: prevent past messages being loaded 2016-11-23 14:26:14 +08:00
Andrew Nicols
2a58fef860 Merge branch 'MDL-57059-master' of git://github.com/lameze/moodle 2016-11-23 14:15:42 +08:00
David Monllao
d062d64fb8 Merge branch 'MDL-56116-master' of git://github.com/FMCorz/moodle 2016-11-23 14:01:48 +08:00
Frederic Massart
862816eec3
MDL-56116 theme_boost: Improve developer documentation related to themes 2016-11-23 13:55:28 +08:00
Ryan Wyllie
b487a7c028 MDL-57094 message: change view more link in notification popover 2016-11-23 05:54:07 +00:00
Simey Lameze
bea19e0dec MDL-57059 theme_boost: add rule to fix slot number misalignment 2016-11-23 13:37:55 +08:00
Jun Pataleta
1b669ebeba MDL-56564 mod_lti: External tool form fixes 
* Revert disabling of the Preconfigured tool field on edit mode
* Reset LTI tool configuration fields when selecting a different
  preconfigured tool.
* Behat fixes for UI changes.
 2016-11-23 13:10:51 +08:00
Frederic Massart
e0c5ffb681
MDL-57061 theme_boost: Focus the invalid form elements on error 2016-11-23 12:11:57 +08:00
Andrew Nicols
5bda9fe900 Merge branch 'MDL-55324-master' of git://github.com/cameron1729/moodle 2016-11-23 12:09:46 +08:00
Cameron Ball
28e93cc41b
MDL-55324 atto_media: Implement HTML compliant media plugin 
This patch completely reworks the atto media plugin to allow
insertion of HTML media elements.
 2016-11-23 11:57:33 +08:00
Cameron Ball
a60a98d900
MDL-55324 filepicker: Explicitly set callback from showFilePicker 
Prior to this patch the callback passed to showFilePicker was saved
and reused for subsequent calls. This doesn't allow the use of a function
for generating the callback.

This patch explicitly sets the callback each time.
 2016-11-23 11:56:40 +08:00
Andrew Nicols
44cf94a877 Merge branch 'wip-MDL-57019-master' of git://github.com/marinaglancy/moodle 2016-11-23 11:54:16 +08:00
David Monllao
d5c2829b06 MDL-56902 version: Triggering a major upgrade 2016-11-23 11:50:26 +08:00
David Monllao
b3440a13cc Merge branch 'MDL-56902-master-fix1' of http://github.com/damyon/moodle 2016-11-23 11:48:44 +08:00
Ryan Wyllie
52aeda247c MDL-57093 forum: less specific unread styling 
Changed the CSS for unread styling to no longer use ids because the
rules are too specific and override other elements with the .unread
class on the forum pages.
 2016-11-23 03:40:30 +00:00
Damyon Wiese
48489fb93a MDL-56551 calendar: cibot fixes from this issue 2016-11-23 11:25:57 +08:00
Damyon Wiese
7ee4a28719 MDL-56551 calendar: Events list fixes for boost 
The events list is now a list of cards with headers.
Spacing and layout is now done with bootstrap utility classes.
The existing classes were kept - and the styles for bootstrapbase are not changed much.
Also calendar colours can be overridden from a preset.
 2016-11-23 11:25:52 +08:00
Damyon Wiese
1ac36fa9f7 MDL-56902 blocks: No theme blocks if fake blocks only 
When showing only fake blocks, never auto create the blocks for the
theme. This would give you double blocks.
 2016-11-23 11:07:32 +08:00
Frederic Massart
6b7e523b5d
MDL-56182 mod_lti: Include the query string when comparing type URLs 2016-11-23 10:16:50 +08:00
David Monllao
8fb1b3bb68 Merge branch 'MDL-56391_master' of git://github.com/markn86/moodle 2016-11-23 09:49:03 +08:00
Dan Poltawski
3fd840072f MDL-56988 report: attempt to improve styling of reports 2016-11-23 08:50:06 +08:00
David Monllao
44c3d0775c Merge branch 'MDL-56902-master' of git://github.com/damyon/moodle 2016-11-23 08:29:41 +08:00
David Monllao
111d6b8f24 Merge branch 'MDL-57089-master' of git://github.com/ankitagarwal/moodle 2016-11-23 08:20:13 +08:00
David Monllao
74138c7cd0 Merge branch 'MDL-57087_master' of git://github.com/markn86/moodle 2016-11-23 08:01:25 +08:00
Dan Poltawski
0484a0d511 Merge branch 'MDL-57075-master' of git://github.com/ryanwyllie/moodle 2016-11-22 21:14:20 +00:00
Dan Poltawski
95b25310ce Merge branch 'MDL-56795-master' of git://github.com/damyon/moodle 2016-11-22 21:01:59 +00:00
Dan Poltawski
1da2cf3bc0 Merge branch 'MDL-57018-master' of git://github.com/damyon/moodle 2016-11-22 20:59:17 +00:00
Dan Poltawski
cb151980c4 Merge branch 'MDL-56656-master' of git://github.com/ankitagarwal/moodle 2016-11-22 18:05:10 +00:00
Dan Poltawski
03f450c10d Merge branch 'MDL-56987-master' of git://github.com/damyon/moodle 2016-11-22 18:01:38 +00:00
Dan Poltawski
d3b13065ce Merge branch 'MDL-57012-master' of git://github.com/damyon/moodle 2016-11-22 18:01:10 +00:00
Dan Poltawski
73430100ff Merge branch 'MDL-57042-master' of git://github.com/damyon/moodle 2016-11-22 18:00:45 +00:00
AMOS bot
499f4a7823 Automatically generated installer lang files 2016-11-23 00:04:53 +08:00
Eloy Lafuente (stronk7)
0fbe41f4cd Moodle release 3.2rc2 v3.2.0-rc2 2016-11-22 16:22:21 +01:00
Dan Poltawski
e122972d3f Merge branch 'MDL-56938-master-fix1' of http://github.com/damyon/moodle 2016-11-22 10:26:52 +00:00
Ankit Agarwal
7597ab0b99 MDL-56656 messages: Proper multilang formating in messaging pages 2016-11-22 14:51:12 +05:30
Damyon Wiese
57bfb7c30a MDL-56938 filter_media: Responsive size fallback player 
Apply responsive sizing to any video element in a media filter div.

This applys to the HTML5 video player and the fall back player if
video.js fails to load.
 2016-11-22 17:04:55 +08:00
Ankit Agarwal
2561e79fca MDL-57089 boost: Fix single select rendering 
Also added context docs to the template file
 2016-11-22 14:06:59 +05:30
John Okely
529e944a8c MDL-56782 custommenu add multilang example 2016-11-22 15:12:55 +08:00
Damyon Wiese
45ed4271b7 MDL-56902 blocks: no nav / settings in boost 
Upgraded sites switching to boost should not see nav/settings blocks.
 2016-11-22 15:02:51 +08:00
Damyon Wiese
51718b752d MDL-56902 blocks: Prevent blocks returning when switching themes. 
Now if the current theme requires some blocks that don't exist, they
will be created - but with a new flag that indicates this block should
only be returned if the current theme requires it. This allows flipping back
and forth between boost and clean without restoring the nav and settings blocks
in boost.
 2016-11-22 14:53:24 +08:00
Mark Nelson
9c6c29932a MDL-56391 core_message: addressed confusing links on the profile page 
1) Use the string 'Send message' rather than 'View messages'.
2) Removed the 'View messages' string as it is no longer used
   and was introduced in the new messaging UI.
3) Removed the 'View profile' link and made the user's profile
   picture a link to their profile instead, this was only
   recently plausible because of MDL-57036.
 2016-11-22 14:35:19 +08:00
Damyon Wiese
8cdff4beda MDL-56584 boost: Focus on drawer when it is opened 2016-11-22 14:05:43 +08:00
Damyon Wiese
95210c6650 MDL-56987 bootstrapbase: Center align in page modals 2016-11-22 13:31:50 +08:00
Mark Nelson
3c1cdac63f MDL-57087 core_message: ignore site policy if logged in as admin 2016-11-22 13:20:49 +08:00
Frederic Massart
84979ab793
MDL-57064 course: Return all properties when getting navigation options 2016-11-22 12:58:52 +08:00