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,014 Commits 36 Branches 519 Tags
Commit Graph

82014 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
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
John Okely
529e944a8c MDL-56782 custommenu add multilang example 2016-11-22 15:12:55 +08:00
Damyon Wiese
95210c6650 MDL-56987 bootstrapbase: Center align in page modals 2016-11-22 13:31:50 +08:00
Andrew Nicols
8d294e729f Merge branch 'MDL-57035-master' of git://github.com/FMCorz/moodle 2016-11-22 12:02: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
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
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
Dan Poltawski
4b631c2d87 Merge branch 'wip-mdl-56898-fix2' of https://github.com/rajeshtaneja/moodle 2016-11-21 15:07:49 +00:00
Damyon Wiese
00f5c95590 MDL-57012 boost: Filepicker layout fix 
Use container-fluid which is always 100% wide.
 2016-11-21 21:35:12 +08:00
Damyon Wiese
7e81bd114e MDL-56782 custommenu - update docs 
We don't support sub-menus in all themes (boost) so we want to update
the docs and example.
 2016-11-21 21:17:43 +08:00
Dan Poltawski
9446cb507c Merge branch 'MDL-56318-master' of git://github.com/damyon/moodle 2016-11-21 09:55:09 +00:00
Damyon Wiese
21a5c3c447 MDL-56318 assign: Polish for assign grading in boost 
These styles mostly remove the responsiveness from the grading form.
 2016-11-21 16:59:39 +08:00
David Monllao
9557be1542 Merge branch 'MDL-57063-master' of git://github.com/FMCorz/moodle 2016-11-21 16:53:44 +08:00
Dan Poltawski
05551a935a Merge branch 'MDL-56849-master' of git://github.com/damyon/moodle 2016-11-21 08:36:27 +00:00
Dan Poltawski
f7d76254fd Merge branch 'MDL-56994-master-2' of git://github.com/junpataleta/moodle 2016-11-21 07:30:58 +00:00
Damyon Wiese
28f2458448 MDL-56849 mod_wiki: Update styles for boost 
Make sure all form field have bootstrap styles. Use bootstrap tables on
tables. Remove custom styling. Prefer left-aligned text.
 2016-11-21 15:19:16 +08:00
Damyon Wiese
e283c6ca33 MDL-56716 boost: Fix styling for review options 
The checkbox form template was changed, so this custom rule needs
updating.
 2016-11-21 15:08:41 +08:00
Rajesh Taneja
26fef01b6b
MDL-56898 behat: Go to a non html page to avoid any unwanted ajax calls 
After scenario is finished, go to README.txt, so
there is no JS/AJAX calls pending and site is ready
for reset before next scenario
 2016-11-21 14:16:49 +08:00
Rajesh Taneja
d9a9a87835
MDL-56898 behat: Ensure the page is stable before executing 2016-11-21 14:16:48 +08:00
David Monllao
e0ba33697f Merge branch 'MDL-56938-master' of git://github.com/damyon/moodle 2016-11-21 14:09:43 +08:00
Ankit Agarwal
f318b74b49 MDL-56809 boost: Don't escape html in single select options 2016-11-21 11:38:51 +05:30
Ankit Agarwal
63531fff79 MDL-56809 boost: Add template context info 2016-11-21 11:38:51 +05:30
Andrew Nicols
51e8968635 Merge branch 'MDL-56612_master' of git://github.com/dmonllao/moodle 2016-11-21 13:40:00 +08:00
Andrew Nicols
e67c14053e Merge branch 'MDL-56974-master' of git://github.com/jleyva/moodle 2016-11-21 13:21:27 +08:00
David Monllao
30f023b1b3 Merge branch 'MDL-56975-master' of git://github.com/jleyva/moodle 2016-11-21 13:15:40 +08:00
Damyon Wiese
fce0f1c235 MDL-56938 messages: Images and videos display badly in messaging 
Make sure they get minimum and maximum width so they don't overflow and
don't appear tiny.
 2016-11-21 13:01:36 +08:00
David Monllao
57c01bca0e MDL-56612 navigation: Remove redundant load_courses_enrolled call 2016-11-21 12:42:09 +08:00