mirror_php/moodle
1
0
Fork 0
mirror of https://github.com/moodle/moodle.git synced 2025-01-31 12:45:04 +01:00
Code Issues Projects Releases Wiki Activity
82,241 Commits 36 Branches 519 Tags
Commit Graph

82241 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Damyon Wiese
e7d0de87c9 MDL-57219 blocks: Dont create and empty block for spacing 
Change box to an empty container. We are after tiny tiny changes ATM.
 2016-12-01 10:12:29 +08:00
Dan Poltawski
ce7149b10c MDL-57197 js: fix AMD module warnings 
In 3.2 we are free of AMD lint warnings, unfortunately we can't expose
them through grunt yet due to
"File ignored because of a matching ignore pattern. Use "--no-ignore" to
override"

ps. this isn't related to MDL-57197 at all, i'm just a Rebel
 2016-11-30 13:50:38 +00:00
Dan Poltawski
5814817ceb Merge branch 'MDL-57169_master' of git://github.com/markn86/moodle 2016-11-30 11:04:38 +00:00
Dan Poltawski
a9b85245f2 Merge branch 'MDL-52199-incoming-nice-fail' of https://github.com/brendanheywood/moodle 2016-11-30 09:52:35 +00:00
Dan Poltawski
10461a04c6 Merge branch 'MDL-57207-master' of git://github.com/cameron1729/moodle 2016-11-30 09:51:21 +00:00
Cameron Ball
9a22c99ea9
MDL-57207 mod_lti: Remove redundant popover() call 
Since MDL-56748 popovers are properly delegated. Making manual calls
to .popover redundant.
 2016-11-30 17:45:41 +08:00
Andrew Nicols
b95107ca83 Merge branch 'MDL-57205-master' of git://github.com/damyon/moodle 2016-11-30 15:03:43 +08:00
Andrew Nicols
432ed35484 Merge branch 'MDL-57127-master' of git://github.com/FMCorz/moodle 2016-11-30 14:27:23 +08:00
David Monllao
f4aec377fc Merge branch 'MDL-56682_master' of git://github.com/markn86/moodle 2016-11-30 13:56:08 +08:00
David Monllao
99d2667f5c Merge branch 'MDL-57072-master' of git://github.com/junpataleta/moodle 2016-11-30 13:36:32 +08:00
Andrew Nicols
a57699ead8 Merge branch 'MDL-57177-master' of git://github.com/cameron1729/moodle 2016-11-30 13:15:58 +08:00
Frederic Massart
061a39ac5d
MDL-57127 output: Increase memory limit when parsing CSS 2016-11-30 12:19:03 +08:00
Andrew Nicols
3f342da584 Merge branch 'MDL-57101-master-2nd' of git://github.com/FMCorz/moodle 2016-11-30 12:13:54 +08:00
David Monllao
4495ddcf9f Merge branch 'MDL-56955-master' of git://github.com/lameze/moodle 2016-11-30 11:34:29 +08:00
Simey Lameze
45cd101f80 MDL-56955 theme_boost: fix login failure displaying on user menu 2016-11-30 11:32:38 +08:00
David Monllao
c5a5f26ce2 Merge branch 'MDL-57090-master' of git://github.com/ankitagarwal/moodle 2016-11-30 10:43:16 +08:00
Damyon Wiese
7c0725857a MDL-57205 forms: Prevent debugging in selectgroups 
Sometimes the option group has no options I guess. The same check is in
exportValue.
 2016-11-30 10:38:51 +08:00
Andrew Nicols
70f0e8353d Merge branch 'wip-MDL-57186-master' of https://github.com/marinaglancy/moodle 2016-11-30 10:20:31 +08:00
David Monllao
8c291fb06e Merge branch 'wip-MDL-56829-master-2' of git://github.com/marinaglancy/moodle 2016-11-30 10:05:16 +08:00
David Monllao
449b730e09 Merge branch 'MDL-57095-master' of git://github.com/ryanwyllie/moodle 2016-11-30 09:26:07 +08:00
Andrew Nicols
8018dc63c7 Merge branch 'MDL-57174_master' of git://github.com/markn86/moodle 2016-11-30 09:12:54 +08:00
Jun Pataleta
8ace7b6c34 MDL-57072 theme_boost: Render action menu for category management 2016-11-30 09:11:32 +08:00
Eloy Lafuente (stronk7)
3f083d9a33 MDL-57197 versions: main version bump 2016-11-29 22:58:22 +01:00
Eloy Lafuente (stronk7)
04649747a4 MDL-57197 versions: bump all versions and requires near release 
version = 2016120500 release version
requires= 2016112900 current rc4 version
 2016-11-29 22:57:05 +01:00
Eloy Lafuente (stronk7)
eb80018202 Merge branch 'MDL-57133-master-enfix' of git://github.com/mudrd8mz/moodle 2016-11-29 22:36:29 +01:00
Dan Poltawski
a0352aa95e Moodle release 3.2rc4 v3.2.0-rc4 2016-11-29 13:33:15 +00:00
Dan Poltawski
d5d1d56f9c Merge branch 'install_master' of https://git.in.moodle.com/amosbot/moodle-install 2016-11-29 13:33:13 +00:00
David Mudrák
1270616023 MDL-56800 theme_boost: Radios should not have name if soft frozen, too 2016-11-29 11:32:28 +00:00
Andrew Nicols
06ded0ed5f MDL-56800 theme_boost: Remove name from hardFrozen radio 2016-11-29 08:11:31 +00:00
Ryan Wyllie
c22141bd0c MDL-57095 theme: fix content styling for notification page 2016-11-29 07:14:05 +00:00
Marina Glancy
6f19da0549 MDL-57186 media: fix link in security report 2016-11-29 13:54:49 +08:00
Andrew Nicols
220f3ac711 MDL-56858 theme_boost: Correct bad merge conflict 2016-11-29 13:49:18 +08:00
David Monllao
1e102ca3ca Merge branch 'wip-mdl-57168-m1' of git://github.com/rajeshtaneja/moodle 2016-11-29 13:41:55 +08:00
David Monllao
7621fe8399 Merge branch 'MDL-57158-int-fix-1' of github.com:ryanwyllie/moodle 2016-11-29 13:36:52 +08:00
Damyon Wiese
0d5f5f7357 MDL-57124 boost: I want really tiny logos. 
Said no-one ever.

Use max-height so very small logos will not be scaled up.
 2016-11-29 13:21:35 +08:00
Marina Glancy
7d94f001e2 MDL-56829 media_videojs: play inline on iPhone with ios 10 2016-11-29 13:02:31 +08:00
Frederic Massart
e37c128686
MDL-57101 filter: Always set-up the page for filters 2016-11-29 12:36:28 +08:00
Frederic Massart
a174f2474f
MDL-57101 media_videojs: Set-up player on dynamically loaded content 2016-11-29 12:36:26 +08:00
Andrew Nicols
805659e1fa Merge branch 'MDL-56919-master' of git://github.com/junpataleta/moodle 2016-11-29 12:06:56 +08:00
Jun Pataleta
01dc1c11ec MDL-56919 mod_forum: Assign check icon for selected subscription mode 2016-11-29 12:03:34 +08:00
Andrew Nicols
740dbe77a2 Merge branch 'MDL-56858_master-alt-2' of git://github.com/markn86/moodle 2016-11-29 11:52:32 +08:00
David Monllao
8b516a6a55 Merge branch 'MDL-57163_master' of git://github.com/dmonllao/moodle 2016-11-29 11:46:55 +08:00
David Monllao
4a1165ba39 MDL-57163 install: Check curl availability before curl_version() 2016-11-29 11:46:06 +08:00
David Herney
5634310997 MDL-57169 backup: ensure images in category descriptions are shown 2016-11-29 11:40:47 +08:00
Rajesh Taneja
9eb8f6ec56
MDL-57168 behat: Don't press continue as it will go to Annotate PDF 
This might cause random failures as the draft files are being accessed by other user
 2016-11-29 10:53:02 +08:00
David Monllao
dc3e3c0831 Merge branch 'MDL-57097-master' of git://github.com/lameze/moodle 2016-11-29 10:51:10 +08:00
Cameron Ball
d91cbe1e62
MDL-57177 theme_boost: Use regular ! for advanced form fields 
Previously we used U+2757 on advanced form fields, which was problematic
as it's part of emoji and displays differently on different platforms.
This is a problem since we explicitly style it to be blue, but, for
example on OS X it's red (since it gets replaced with their emoji).
 2016-11-29 10:48:38 +08:00
Mark Nelson
8599ac9e56 MDL-57174 mod_lesson: show settings menu on edit.php page 2016-11-29 10:24:55 +08:00
Damyon Wiese
4d41cec8db MDL-57124 boost: Show pageheaderbutton when no navbar 
Even if there is no navbar - if there is a pageheaderbutton we need to
show it (E.g. Customise this page on dashboard).
 2016-11-29 10:07:16 +08:00
David Mudrák
5e45c34221 MDL-57133 lang: Reword the strings in Behat tests too 2016-11-29 01:59:31 +01:00