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

82291 commits

This branch
This branch
All branches
Author SHA1 Message Date
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 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
Andrew Nicols
8d294e729f Merge branch 'MDL-57035-master' of git://github.com/FMCorz/moodle 2016-11-22 12:02:45 +08:00
Damyon Wiese
a51122983c MDL-57018 boost: Style marking guide entry form 
Add boost styles to marking guide entry form.
 2016-11-22 11:47:45 +08:00
David Monllao
82f9746962 Merge branch 'MDL-56782-master' of git://github.com/damyon/moodle 2016-11-22 11:46:13 +08:00
Frederic Massart
cbca970ab7
MDL-57035 repository_skydrive: Compability with converged type apps 
http://go.microsoft.com/fwlink/p/?LinkID=615760
 2016-11-22 11:46:05 +08:00
Damyon Wiese
e466e337b0 MDL-57018 marking guide: Style frequent comments 
Style frequently used comments for bootstrap 4.
 2016-11-22 11:46:01 +08:00
Ryan Wyllie
a6a277f06c MDL-57075 message: notification popover see all link 
The "see all" link in the notification popover should link to the full
notifications page similar to how the "see all" link in the message
popover links to the messaging page.
 2016-11-22 03:44:26 +00:00
Andrew Nicols
282f0437f1 Merge branch 'wip-mdl-56898-fixup' of https://github.com/rajeshtaneja/moodle 2016-11-22 11:33:25 +08:00
Andrew Nicols
873a7e1e86 Merge branch 'MDL-56683-master' of git://github.com/damyon/moodle 2016-11-22 11:27:28 +08:00
Andrew Nicols
38a8590ed0 Merge branch 'wip-mdl-56994' of https://github.com/rajeshtaneja/moodle 2016-11-22 11:22:30 +08:00
Rajesh Taneja
45e862c4bd
MDL-56898 behat: Wait for pending JS after setting password 2016-11-22 11:20:30 +08:00
Andrew Nicols
d51d8ca2af Merge branch 'MDL-55838-master' of git://github.com/damyon/moodle 2016-11-22 11:17:33 +08:00
Rajesh Taneja
f4565e7147
MDL-56994 behat: Fixed activity selector to find proper li 
Previous to this patch, only 1 activity was
expected and if there are more than 1 activities
then it will fail. Improved step to find the
correct activity node by name
 2016-11-22 11:02:52 +08:00
Damyon Wiese
52a51514f6 MDL-56683 theme_boost: Popovers on dynamic content 2016-11-22 10:28:25 +08:00
David Monllao
42cf4a3470 Merge branch 'MDL-57023-master' of git://github.com/andrewnicols/moodle 2016-11-22 10:23:21 +08:00
Damyon Wiese
5d03ab36b5 MDL-55838 theme_boost: Fix secure layout 
It was out of date with the columns2 layout and had links outside it's content.
 2016-11-22 10:22:17 +08:00
Andrew Nicols
727145bf1c MDL-56407 message: Additional unit test for unblocked user 2016-11-22 09:45:52 +08:00
Brendan Heywood
3d8fbf39f7 MDL-52199 core_message: IMAP errors passed to task api 2016-11-22 12:44:30 +11:00
Andrew Nicols
d10ca75b8c Merge branch 'MDL-56407-master-2' of git://github.com/junpataleta/moodle 2016-11-22 09:06:09 +08:00
Andrew Nicols
aacdf8e280 MDL-57023 tool_usertours: Ensure that the tour key is unique 
The tour key was already unique, but this change makes it unique to the
current user too.
 2016-11-22 09:05:31 +08:00
Andrew Nicols
aabebc7516 MDL-57023 tool_usertours: Update to v0.9.10 
This new version of the library brings with it storage of the current
step number in the browser session storage.

This allows the page to reload whilst viewing a tour and have the tour
continue.
 2016-11-22 09:05:31 +08:00
David Monllao
5009bcd9b4 Merge branch 'MDL-56986-master-fix' of https://github.com/lameze/moodle 2016-11-22 09:04:26 +08:00
Andrew Nicols
4b2790c580 Merge branch 'MDL-56809-master' of git://github.com/ankitagarwal/moodle 2016-11-22 08:49:18 +08:00
Simey Lameze
5e43ccd3b9 MDL-56986 block_course_summary: remove edit icon scenario from behat 2016-11-22 08:39:35 +08:00
Andrew Nicols
783ef76bfc Merge branch 'MDL-56716-master' of git://github.com/damyon/moodle 2016-11-22 08:10:11 +08:00
Rajesh Taneja
49cf53dd93
MDL-56797 theme_boost: Fixed css on rubric icon so text wraps 2016-11-22 07:26:25 +08:00
Dan Poltawski
4b631c2d87 Merge branch 'wip-mdl-56898-fix2' of https://github.com/rajeshtaneja/moodle 2016-11-21 15:07:49 +00:00