mirror_php/moodle
1
0
Fork 0
mirror of https://github.com/moodle/moodle.git synced 2025-04-07 09:23:31 +02:00
Code Issues Projects Releases Wiki Activity
81,700 Commits 36 Branches 529 Tags
Commit Graph

81700 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Dan Poltawski
d017e3fb48 Merge branch 'MDL-56398-master' of git://github.com/lameze/moodle 2016-11-14 08:34:13 +00:00
David Monllao
337b723b07 Merge branch 'MDL-56803-master' of git://github.com/damyon/moodle 2016-11-14 16:25:43 +08:00
Dan Poltawski
6b8c8f4bc2 Merge branch 'MDL-56711-master' of git://github.com/damyon/moodle 2016-11-14 08:21:14 +00:00
Damyon Wiese
f93bdccab7 MDL-56803 boost: hide region-main settings menu on 1 col layouts 2016-11-14 16:02:55 +08:00
Damyon Wiese
04165cd446 MDL-56803 glossary: More style fixes for glossary 
Fix checkbox alignment for search on small screens, and put separation
between glossary items in a list.
 2016-11-14 16:02:09 +08:00
Andrew Nicols
125bd58ff9 Merge branch 'MDL-56657-master' of git://github.com/damyon/moodle 2016-11-14 15:46:31 +08:00
Damyon Wiese
1093b461f6 MDL-56803 mod_glossary: Fix styles for boost theme 2016-11-14 15:43:58 +08:00
Damyon Wiese
2f3f8e45da MDL-56657 admin: Style all admin/role pages for boost 2016-11-14 15:11:15 +08:00
Andrew Nicols
cfade93cb8 Merge branch 'MDL-56785-master' of git://github.com/lameze/moodle 2016-11-14 15:06:40 +08:00
David Monllao
fd887df697 Merge branch 'MDL-56888-master-workshop-leap2a' of git://github.com/mudrd8mz/moodle 2016-11-14 15:01:21 +08:00
Andrew Nicols
87264a2022 Merge branch 'MDL-56845-master' of git://github.com/damyon/moodle 2016-11-14 14:44:07 +08:00
Andrew Nicols
622c84f630 Merge branch 'MDL-56853-master' of git://github.com/damyon/moodle 2016-11-14 14:36:45 +08:00
Simey Lameze
27a5b91f45 MDL-56398 core_message: make modals consistent across themes 2016-11-14 14:35:38 +08:00
Andrew Nicols
8f3a295c6e Merge branch 'MDL-56242-master' of git://github.com/damyon/moodle 2016-11-14 14:07:36 +08:00
David Monllao
9444636cb8 Merge branch 'MDL-56834-master' of git://github.com/damyon/moodle 2016-11-14 14:00:45 +08:00
Andrew Nicols
49ae3661d3 Merge branch 'MDL-56769-master' of git://github.com/damyon/moodle 2016-11-14 13:38:00 +08:00
Damyon Wiese
f2405a5f5c MDL-56242 theme_boost: Fix styling for confirm boxes (js and in page) 
They should be left aligned with a header, content and footer (right aligned with the buttons).

There should be a primary continue button and a secondary cancel button.
 2016-11-14 11:11:28 +08:00
Damyon Wiese
a7bebd0638 MDL-56834 boost: Nav for participants page 
On the participants page, hide the small cog and put a region main
settings menu with all the nodes from the "Users" branch in the settings
block.
 2016-11-14 10:40:41 +08: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
Damyon Wiese
058edbafc8 MDL-56711 theme_boost: Highlight sections at activity level 
When looking at an activity, the current section for the course should be active in the flat navigation.
 2016-11-11 14:27:56 +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
David Mudrák
48ea715da0 MDL-56888 workshop: Fix Leap2A export of the workshop submission 
The whole story described in the tracker. Shortly, Mahara seems to have
a bug (or undocumented feature) that it expects the Leap2A content
wrapped in a single container.
 2016-11-10 15:30:11 +01: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