4490 Commits

Author SHA1 Message Date
Eloy Lafuente (stronk7)
5748e56242 Merge branch 'MDL-54671-master' of git://github.com/danpoltawski/moodle 2016-07-12 18:14:17 +02:00
David Monllao
b60d4fca13 Merge branch 'MDL-55048-master' of git://github.com/danpoltawski/moodle 2016-07-12 12:20:35 +02:00
David Monllao
4fcca5378b Merge branch 'MDL-55170_master' of https://github.com/nadavkav/moodle
Conflicts:
	theme/bootstrapbase/style/moodle.css
2016-07-12 10:30:31 +02:00
Eloy Lafuente (stronk7)
f71eaa794d Merge branch 'MDL-55134-master' of git://github.com/danpoltawski/moodle 2016-07-12 02:53:58 +02:00
Dan Poltawski
9b62a3eb71 MDL-55048 js: rebuilt files with new version of uglifyjs 2016-07-11 15:53:10 +01:00
David Monllao
6a4c2146f9 MDL-53222 search: Replace report_search by new searchareas admin page 2016-07-11 11:49:14 +02:00
Nadav Kavalerchik
3bce7d0880 MDL-55170 theme_bootstrapbase: Fix user enrollment dialog, RTL 2016-07-09 14:52:21 +03:00
Dan Poltawski
d7f2176fd8 MDL-54671 css: fix lint errors 2016-07-08 12:58:54 +01:00
Dan Poltawski
c5ec7b698b MDL-54671 css: reformat css 2016-07-08 12:54:13 +01:00
Dan Poltawski
d3a93557d5 MDL-55134 less: make indentation consistent 2016-07-07 14:57:14 +01:00
Brendan Heywood
a181471f4e MDL-55001 theme_clean: Avoid redirects in home url 2016-06-23 17:27:52 +10:00
Andrew Nicols
5869e4b74f Merge branch 'MDL-54559-int-master' of https://github.com/merrill-oakland/moodle 2016-06-16 09:04:14 +01:00
Eric Merrill
9c6a38063b MDL-54559 theme: Recenter search box 2016-06-16 09:04:13 +01:00
Dan Poltawski
0fd08fc7e5 Merge branch 'MDL-35628' of https://github.com/mr-russ/moodle 2016-06-16 09:04:12 +01:00
Andrew Nicols
168b1d9885 Merge branch 'MDL-54559-master' of git://github.com/junpataleta/moodle 2016-06-16 09:04:08 +01:00
Andrew Nicols
1e7aaed887 Merge branch 'MDL-54576_themeSelector' of https://github.com/mrmark/moodle 2016-06-16 09:04:06 +01:00
Russell Smith
1fcf0ca8a5 MDL-35628 performance: Remove dirname() where possible.
dirname() is a slow function compared with __DIR__ and using
'/../'.  Moodle has a large number of legacy files that are included
each time a page loads and is not able to use an autoloader as it is
functional code.  This allows those required includes to perform as
best as possible in this situation.
2016-06-10 08:06:49 +10:00
Eric Merrill
677650c327 MDL-54559 theme: Fix padding that pushes navbar down 2016-06-07 14:52:26 +08:00
Eloy Lafuente (stronk7)
4da854a68b MDL-54677 upgrade: add 3.1.0 separation line to all upgrade scripts 2016-05-23 01:31:34 +02:00
Eloy Lafuente (stronk7)
1abca11e0a MDL-54638 versions: bump all versions and requires near release
version = 2016052300 release version
requires= 2016051900 current rc1 version
2016-05-19 02:16:15 +02:00
David Monllao
f3ba5f4249 Merge branch 'MDL-53805-master' of git://github.com/cameron1729/moodle
Conflicts:
	theme/bootstrapbase/style/moodle.css
2016-05-18 12:24:45 +08:00
Cameron Ball
5d4dafcfa0 MDL-53805 theme: Give search icon more space 2016-05-17 13:38:52 +08:00
Andrew Nicols
d45047f628 Merge branch 'MDL-54560_master' of git://github.com/dmonllao/moodle 2016-05-16 12:11:19 +08:00
vpisabeywardana
0a33c8ca94 MDL-52815 theme: group select overlapping issue
Gave minimum width for select tags which are under 'groups' and 'members' classes
2016-05-16 02:42:54 +00:00
David Monllao
e716da5d13 MDL-54560 search: Search box aligned with .usermenu on .navbar 2016-05-16 10:38:14 +08:00
Eric Merrill
d636043aff MDL-54560 search: Fix menu item to be correct height
Conflicts:
	theme/bootstrapbase/style/moodle.css
2016-05-16 10:28:12 +08:00
jogarcia
8dabb7200d MDL-54576 theme: Redirect to show confirmation
After selecting a new theme, save the new configs
then redirect to show the confirmation and the new
theme's read me.  This prevents any odd behavior
from the old theme bleeding into the display of
the confirmation.
2016-05-13 08:57:12 -07:00
Nadav Kavalerchik
7ee8effc55 MDL-52800 Theme: Fix inplace editing tooltip styling 2016-05-10 05:06:43 +00:00
Dan Poltawski
a9e9f96382 MDL-54062 bootstrapbase: remove unused less file
This file has never been included in our CSS.
2016-05-06 09:27:36 +08:00
Dan Poltawski
c2e07809e5 Merge branch 'wip_MDL-53033_master' of git://github.com/gjb2048/moodle 2016-05-02 10:17:12 +01:00
Eloy Lafuente (stronk7)
efd0d992d5 MDL-53638 mod_feedback: rebuild css 2016-04-29 12:17:53 +01:00
Eloy Lafuente (stronk7)
28ee220a36 Merge branch 'wip-MDL-53638-master' of https://github.com/marinaglancy/moodle 2016-04-29 12:17:52 +01:00
Marina Glancy
97d71cbc3a MDL-53638 mod_feedback: convert to moodleforms 2016-04-27 13:28:43 +08:00
Dan Poltawski
2ef629e86d Merge branch 'MDL-53855' of git://github.com/timhunt/moodle 2016-04-26 11:17:45 +01:00
Dan Poltawski
ff72bc88e0 Merge branch 'wip-MDL-47672-master' of https://github.com/marinaglancy/moodle 2016-04-24 14:31:45 +01:00
Eloy Lafuente (stronk7)
7e122c6e29 NOBUG: Fixed SVG browser compatibility 2016-04-22 10:56:53 +02:00
Dan Poltawski
86dd906aa7 Merge branch 'MDL-46092' of git://github.com/timhunt/moodle 2016-04-21 13:21:03 +01:00
Tim Hunt
0569063924 MDL-46092 quiz nav: fix buttons in requiresgrading state 2016-04-21 12:25:45 +01:00
Dan Poltawski
8ef18bda2b Merge branch 'MDL-46092' of git://github.com/timhunt/moodle 2016-04-20 22:20:35 +01:00
Tim Hunt
de2fec2e9a MDL-46092 bootstrapbase: add OU quiz styling
It is a nicer default to have in Moodle that what we had before.
2016-04-20 15:43:34 +01:00
Brendan Heywood
bff1edbe44 MDL-51603 dataformat: Implement streaming dataformat plugin 2016-04-20 12:39:25 +10:00
Tim Hunt
67b67a50cf MDL-53855 accessibility: navbar should be in exactly one nav region
And that should be labelled.
2016-04-18 16:56:34 +01:00
Julien Boulen
eba237b347 MDL-47672 Enrolments, Themes: fix misalignment on enrolled users page 2016-04-18 09:32:22 +08:00
Gareth J Barnard
c44ec0d6aa MDL-53033 themes: Invalid attribute values for div.c1.btn. 2016-04-13 13:10:11 +01:00
David Monllao
101303034f Merge branch 'wip-MDL-16855-master' of https://github.com/marinaglancy/moodle 2016-04-13 09:51:35 +08:00
Dan Poltawski
5702a8289b Merge branch 'MDL-52954-master' of git://github.com/damyon/moodle 2016-04-11 09:52:40 +01:00
Marina Glancy
1e34257ec2 MDL-16855 tags: allow to filter tags on management page 2016-04-11 10:04:17 +08:00
Damyon Wiese
bb690849c9 MDL-52954 assign: Rebuild the assignment single grade page. 2016-03-30 13:47:21 +08:00
Eric Merrill
091973dbd7 MDL-53515 search: Extend search API to allow file indexing 2016-03-24 15:44:27 -04:00
Dan Poltawski
a4302a8fbe MDL-53147 theme_bootstrapbase: Fix RTL issues in messags 2016-03-24 09:05:44 +08:00