mirror_php/moodle
1
0
Fork 0
mirror of https://github.com/moodle/moodle.git synced 2025-01-19 14:27:22 +01:00
Code Issues Projects Releases Wiki Activity
81,677 Commits 36 Branches 519 Tags
Commit Graph

81677 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Helen Foster
7f6accd448 MDL-56903 lang: Merge English strings from the en_fix language pack 2016-11-15 11:19:48 +01:00
Dan Poltawski
0b8e0c374f on-demand release 3.2beta+ 2016-11-11 12:06:14 +00:00
Dan Poltawski
e9eec33560 Merge branch 'MDL-56602-master-upgrade' of git://github.com/andrewnicols/moodle 2016-11-11 10:22:20 +00:00
Andrew Nicols
9fa6d4e04e Merge branch 'MDL-55121-master' of git://github.com/lameze/moodle 2016-11-11 15:12:50 +08:00
Andrew Nicols
ea10a0319b MDL-56602 core: Lock themerev during upgrade 
This also changes install to use a fixed themerev.
 2016-11-11 14:15:00 +08:00
Andrew Nicols
fe86e2f034 Merge branch 'wip-mdl-56189' of https://github.com/rajeshtaneja/moodle 2016-11-11 14:07:10 +08:00
Rajesh Taneja
259d3742f9
MDL-56189 behat: Fixed xpath to use contains class 2016-11-11 13:45:33 +08:00
Andrew Nicols
56fb91bc38 Merge branch 'MDL-55994' of https://github.com/bostelm/moodle 2016-11-11 13:29:57 +08:00
Simey Lameze
51f3693cdb MDL-55121 environment: check for unsuported php version 7.1 2016-11-11 12:37:07 +08:00
Andrew Nicols
9c56f904d2 Merge branch 'MDL-56768-master-fix1' of http://github.com/damyon/moodle 2016-11-11 12:15:55 +08:00
David Monllao
3ecf492a75 Merge branch 'MDL-56811-master' of git://github.com/damyon/moodle 2016-11-11 12:13:30 +08:00
Andrew Nicols
6b7b3e59f2 Merge branch 'MDL-56417_master' of https://github.com/dmonllao/moodle 2016-11-11 11:53:41 +08:00
Andrew Nicols
06cca0158c Merge branch 'MDL-56190-master-fix1' of http://github.com/damyon/moodle 2016-11-11 11:39:48 +08:00
Damyon Wiese
7becb39f63 MDL-56768 gradereport_grader: Fix point the user column floats 
Need to account for body margin when calculating whether to float the
user column.
 2016-11-11 11:34:48 +08:00
Andrew Nicols
a044ff57a1 Merge branch 'MDL-52216_master' of https://github.com/eugeneventer/moodle-fixes 2016-11-11 11:21:26 +08:00
Damyon Wiese
f46fab0ea1 MDL-56190 clean: Fix grade restriction styles 
Grade restriction is now broken into 3 lines - but it needed custom
padding.
 2016-11-11 11:04:18 +08:00
Adrian Greeve
f65db49765 MDL-56363 mod_assign: Restrictions added for tutors. 
If the grader does not have the accessallgroups capability,
or groups mode is set to separate groups and the user is not
a member of the group then no participants are shown.
 2016-11-11 00:28:33 +01:00
Eugene Venter
dbd8cadb5c MDL-52216 mod_lesson: prevent invalid view modes 2016-11-11 09:19:37 +13:00
Dan Poltawski
6063f62e7d Merge branch 'MDL-56725-master' of git://github.com/damyon/moodle 2016-11-10 15:37:38 +00:00
Dan Poltawski
a3ead7172b Merge branch 'MDL-55249_m32v1' of https://github.com/sbourget/moodle 2016-11-10 15:01:41 +00:00
Dan Poltawski
e3cc23ae86 Merge branch 'MDL-56720-master' of git://github.com/junpataleta/moodle 2016-11-10 15:00:21 +00:00
Dan Poltawski
213fc325ad MDL-56652 roles: Add padding to capability filter 2016-11-10 14:44:17 +00:00
Dan Poltawski
f41218d9fd Merge branch 'MDL-56652-master' of git://github.com/lameze/moodle 2016-11-10 14:37:00 +00:00
Dan Poltawski
c220e6d8c7 Merge branch 'MDL-56189-master' of git://github.com/damyon/moodle 2016-11-10 14:06:02 +00:00
Dan Poltawski
a4b0cfa3f7 Merge branch 'MDL-56768-master' of git://github.com/damyon/moodle 2016-11-10 13:51:11 +00:00
Dan Poltawski
d5d6eda93c Merge branch 'MDL-55777-master' of git://github.com/ankitagarwal/moodle 2016-11-10 13:46:10 +00:00
Dan Poltawski
158ab03e12 Merge branch 'MDL-56190-master' of git://github.com/damyon/moodle 2016-11-10 13:43:35 +00:00
Eloy Lafuente (stronk7)
55f171a1d6 Merge branch 'MDL-53481-master-uniqsqlparam' of git://github.com/mudrd8mz/moodle 2016-11-10 13:11:50 +01:00
Dan Poltawski
f670b39e69 Merge branch 'MDL-56602-master-2' of git://github.com/andrewnicols/moodle 2016-11-10 11:26:14 +00:00
David Mudrák
445aa472b9 MDL-53481 availability: Fix unit test to not execute the huge query 
Some DBs have troubles to execute such a huge query as generated in this
test. We do not actually need to execute it. All we need is to make sure
that the parameter placeholders are enumerated correctly. So it is what
this new test does.
 2016-11-10 09:52:31 +01:00
Simey Lameze
2e1c739a28 MDL-56652 core_roles: Add BS4 styling to define roles form 2016-11-10 16:46:54 +08:00
Damyon Wiese
560a43f24c MDL-56190 availability: Styling on boost and clean 
Update the HTML coming from the JS to include bootstrap classes.
Delete as many styles from boost scss as possible.
Regression test on clean and do final tweaks in less.
 2016-11-10 16:30:00 +08:00
Damyon Wiese
930ce60550 MDL-56725 mod_data: better field alignment 
Labels containing only accesshide text should have the accesshide class
on the label, not the content so the label does not push the content
down.
 2016-11-10 16:25:48 +08:00
Damyon Wiese
398be7c897 MDL-56725 mod_data: coding style 
Fixes from lines in the previous commit.
 2016-11-10 16:21:01 +08:00
Damyon Wiese
e85fda95c6 MDL-56725 mod_data: Style fixes for boost theme 2016-11-10 16:21:01 +08:00
Damyon Wiese
1572a39251 MDL-56768 boost: Special positioning for grader report 
Grader report has custom overflow handling which does not cope with a
scrollable content region. So we need to make the content region flow
weirdly out to the right of the page, and push the blocks underneath -
even on really wide screens where it looks bad. We also needed to
upgrade the custom scroll code to handle the margin on the body
changing.
 2016-11-10 16:17:49 +08:00
Juan Leyva
1e17258b66 MDL-56268 webservice: Format backtrace to avoid display private data 2016-11-10 16:15:31 +08:00
Simey Lameze
face152176 MDL-51347 core_notes: check view notes capability by course context 2016-11-10 16:15:31 +08:00
Tim Hunt
cf0b9432d8 MDL-53744 question file access: fix access checks 2016-11-10 16:15:31 +08:00
Juan Leyva
42778e124e MDL-56065 user: Fix update_users Web Service 
Users won’t be updated if:
- They are admins and the user updating is not
- They are the guest user
- They are mnet users
- They are deleted users
 2016-11-10 16:15:31 +08:00
Dan Poltawski
fd9eb89022 Merge branch 'wip-MDL-56855-master' of https://github.com/marinaglancy/moodle 2016-11-10 08:14:42 +00:00
Damyon Wiese
f43155b65a MDL-56189 theme_boost: Padding for modgrade form elements 2016-11-10 16:13:34 +08:00
Dan Poltawski
da55f3582b Merge branch 'MDL-56705-master' of git://github.com/damyon/moodle 2016-11-10 08:03:37 +00:00
Damyon Wiese
e7bda18de6 MDL-56705 forms: Use [] for multiple values 
Some "select" based form elements are not inheriting directly from
MoodleQuickForm_select - so did not have the adjustment to the form
field name that allows multiple values. I moved this fix to the
templateable trait so all the form fields get this fix.
 2016-11-10 14:57:58 +08:00
Marina Glancy
69ba7bf659 MDL-56855 media_videojs: MPEG-2 is not supported 2016-11-10 14:46:47 +08:00
Nicholas Hoobin
b86c685075 MDL-56417 session: Respect the return value of ignore_timeout_hook. 2016-11-10 14:24:24 +08:00
David Monllao
a6fa0d9c97 Merge branch 'MDL-56766-master' of git://github.com/danpoltawski/moodle 2016-11-10 13:54:09 +08:00
Damyon Wiese
16076f1e3d MDL-56811 forum: Auto create the latest news forum 
When a course is created or updated, create a news forum if the
newsitems setting is > 0.
 2016-11-10 13:51:02 +08:00
David Monllao
8b3a8fa707 Merge branch 'wip-mdl-56397' of https://github.com/rajeshtaneja/moodle 2016-11-10 13:46:37 +08:00
David Monllao
096a418d01 Merge branch 'MDL-56715-master' of https://github.com/xow/moodle 2016-11-10 13:19:01 +08:00