Damyon Wiese [Thu, 14 Nov 2013 09:18:44 +0000 (17:18 +0800)]
Merge branch 'MDL-42711-master' of git://github.com/nebgor/moodle
Conflicts:
theme/bootstrapbase/style/moodle.css
Aparup Banerjee [Thu, 14 Nov 2013 09:04:09 +0000 (17:04 +0800)]
MDL-42711 theme - css recompiled after RTL fixes.
Barbara Ramiro [Thu, 14 Nov 2013 08:53:29 +0000 (16:53 +0800)]
MDL-42711 RTL fixed to chat.less
Aparup Banerjee [Wed, 13 Nov 2013 09:07:39 +0000 (17:07 +0800)]
MDL-42711 added RTL styles to chat.less .
Eloy Lafuente (stronk7) [Wed, 13 Nov 2013 22:15:23 +0000 (23:15 +0100)]
Merge branch 'MDL-42768-master' of git://github.com/FMCorz/moodle
Eloy Lafuente (stronk7) [Wed, 13 Nov 2013 22:09:09 +0000 (23:09 +0100)]
Merge branch 'MDL-42866-master' of git://github.com/damyon/moodle
Damyon Wiese [Wed, 13 Nov 2013 13:46:44 +0000 (21:46 +0800)]
MDL-42866 EditPDF: Fix bad foreign key in install.xml
Thanks Tim for reporting this!
Aparup Banerjee [Wed, 13 Nov 2013 09:02:54 +0000 (17:02 +0800)]
MDL-42711 added RTL styles to improvements.
Damyon Wiese [Wed, 13 Nov 2013 08:57:34 +0000 (16:57 +0800)]
Merge branch 'MDL-40728-master-2' of git://github.com/mouneyrac/moodle
Jerome Mouneyrac [Wed, 13 Nov 2013 08:34:43 +0000 (16:34 +0800)]
MDL-40728 courseupload: add missing help icons
Aparup Banerjee [Wed, 13 Nov 2013 08:22:34 +0000 (16:22 +0800)]
MDL-42711 made all theme menu strings in chat popup translatable
Damyon Wiese [Wed, 13 Nov 2013 07:57:07 +0000 (15:57 +0800)]
Merge branch 'wip-MDL-42833-master' of git://github.com/marinaglancy/moodle
Marina Glancy [Wed, 13 Nov 2013 07:24:06 +0000 (18:24 +1100)]
Merge branch 'MDL-42849-master' of git://github.com/andrewnicols/moodle
Frederic Massart [Wed, 13 Nov 2013 03:22:09 +0000 (11:22 +0800)]
MDL-42768 restore: Use sql_compare_text instead for text comparison
Damyon Wiese [Wed, 13 Nov 2013 06:42:32 +0000 (14:42 +0800)]
Merge branch 'MDL-42705-master-nomerge' of git://github.com/mouneyrac/moodle
Aparup Banerjee [Wed, 13 Nov 2013 05:58:51 +0000 (13:58 +0800)]
MDL-42711 consolidated responsive styles into responsive.less
Damyon Wiese [Wed, 13 Nov 2013 05:43:52 +0000 (13:43 +0800)]
Merge branch 'MDL-42598' of git://github.com/timhunt/moodle
Barbara Ramiro [Wed, 13 Nov 2013 05:15:50 +0000 (13:15 +0800)]
MDL-42711 theme bootstrapbase chat.less :Override max-width for chat user picture on chrome and safari
Andrew Nicols [Wed, 13 Nov 2013 01:55:32 +0000 (09:55 +0800)]
MDL-42849 ActionMenu: Tweak selector for filler and padding for edit menu
Damyon Wiese [Wed, 13 Nov 2013 05:26:36 +0000 (13:26 +0800)]
MDL-42684 TinyMCE: Fix bootstrap CSS for putting text editors below labels.
Damyon Wiese [Wed, 13 Nov 2013 05:10:42 +0000 (13:10 +0800)]
Merge branch 'MDL-33536-master' of git://github.com/damyon/moodle
Damyon Wiese [Tue, 12 Nov 2013 16:23:46 +0000 (00:23 +0800)]
MDL-42684 Forms: Display text editors and file pickers with the label above the field.
This includes the front page description admin field.
Marina Glancy [Wed, 13 Nov 2013 04:43:44 +0000 (15:43 +1100)]
Merge branch 'wip-mdl-42799' of https://github.com/rajeshtaneja/moodle
Conflicts:
mod/assign/feedback/editpdf/yui/build/moodle-assignfeedback_editpdf-editor/moodle-assignfeedback_editpdf-editor-min.js
Damyon Wiese [Wed, 13 Nov 2013 03:50:36 +0000 (11:50 +0800)]
Merge branch 'MDL-41797' of git://github.com/rwijaya/moodle
Aparup Banerjee [Wed, 13 Nov 2013 03:25:12 +0000 (11:25 +0800)]
MDL-42711 theme : final css compiled.
Aparup Banerjee [Wed, 13 Nov 2013 03:20:14 +0000 (11:20 +0800)]
MDL-42711 theme port from LM: fixed up mod_feedback analysis bar heights from auto to 5px
Aparup Banerjee [Wed, 13 Nov 2013 03:07:03 +0000 (11:07 +0800)]
MDL-42711 theme port from LM: Info, Date and Author on the latest News block reordered
This also adds some simple clean style padding fixes for a better look.
Marina Glancy [Wed, 13 Nov 2013 02:28:46 +0000 (13:28 +1100)]
Merge branch 'MDL-42827-master' of git://github.com/andrewnicols/moodle
Barbara Ramiro [Tue, 12 Nov 2013 11:45:02 +0000 (19:45 +0800)]
MDL-42711 theme port from LM: Chat for Clean theme - minimal styling
(this converts colours to suit clean theme more)
Aparup Banerjee [Wed, 13 Nov 2013 02:13:11 +0000 (10:13 +0800)]
MDL-42711 theme port from LM: padded date and footer in upcoming events block (part of commit for MDLSITE-2427)
Damyon Wiese [Wed, 13 Nov 2013 01:59:44 +0000 (09:59 +0800)]
MDL-33536 Navigation: Add missing require_once for safety.
rwijaya [Wed, 13 Nov 2013 01:52:32 +0000 (09:52 +0800)]
MDL-41797 external tools module: fix heading levels.
AMOS BEGIN
CPY [submissions, core_grades], [submissions, mod_lti]
AMOS END
Aparup Banerjee [Wed, 13 Nov 2013 01:51:09 +0000 (09:51 +0800)]
Merge branch 'MDL-42711-master' of github.com:nebgor/moodle into MDL-42711-master
Aparup Banerjee [Wed, 13 Nov 2013 01:48:46 +0000 (17:48 -0800)]
Merge pull request #3 from mudrd8mz/MDL-42711-lmnet-clean-theme-backport
MDL-42711 LMNET clean theme backport
David Mudrák [Wed, 13 Nov 2013 01:32:05 +0000 (02:32 +0100)]
MDL-42711 theme port from LM: vertical alignment of the course icon
When the course name spans over multiple lines, vertically centered icon does
not look nice (or at least our beloved Benevolent Dictator for Life does not
like it ;-). This hack alignes the icon vertically with the first line of the
course name all the time (or at least it tries to).
David Mudrák [Wed, 13 Nov 2013 01:12:45 +0000 (02:12 +0100)]
MDL-42711 theme port from LM: let the course name use the full line width
Marina Glancy [Wed, 13 Nov 2013 01:03:46 +0000 (12:03 +1100)]
MDL-42833 course: correction to navigation path in management interface
David Mudrák [Wed, 13 Nov 2013 01:03:02 +0000 (02:03 +0100)]
MDL-42711 theme port from LM: improve RSS client block styling
This significantly increases the readability of items in the block.
Eloy Lafuente (stronk7) [Wed, 13 Nov 2013 00:55:52 +0000 (01:55 +0100)]
Merge branch '42832-26' of git://github.com/samhemelryk/moodle
Conflicts:
theme/bootstrapbase/style/moodle.css
David Mudrák [Wed, 13 Nov 2013 00:48:05 +0000 (01:48 +0100)]
MDL-42711 theme port from LM: forum layout on small screen devices
This is a backport of MDLSITE-2445. Wrapping the 'Started by' and 'Last post'
texts helps. On smaller device, these two get smaller font too. This is far
from optimal but better than the current (default) behaviour.
David Mudrák [Wed, 13 Nov 2013 00:26:21 +0000 (01:26 +0100)]
MDL-42711 theme port from LM: survey module styling
Backport some Survey module styling from the standard theme to improve the
usability of the interface. The style is originally defined in
theme/standard/styles/modules.css
David Mudrák [Wed, 13 Nov 2013 00:08:35 +0000 (01:08 +0100)]
MDL-42711 theme port from LM: improve the initial bar display
Eloy Lafuente (stronk7) [Wed, 13 Nov 2013 00:12:27 +0000 (01:12 +0100)]
Merge branch 'MDL-42790' of git://github.com/timhunt/moodle
Eloy Lafuente (stronk7) [Wed, 13 Nov 2013 00:09:49 +0000 (01:09 +0100)]
Merge branch 'MDL-42839-master' of git://github.com/sammarshallou/moodle
Marina Glancy [Wed, 13 Nov 2013 00:05:25 +0000 (11:05 +1100)]
Merge branch 'MDL-38574' of git://github.com/timhunt/moodle
Conflicts:
theme/bootstrapbase/style/moodle.css
Eloy Lafuente (stronk7) [Wed, 13 Nov 2013 00:03:09 +0000 (01:03 +0100)]
Merge branch 'wip_master_mdl-42723' of https://github.com/iarenaza/moodle
Eloy Lafuente (stronk7) [Tue, 12 Nov 2013 19:07:05 +0000 (20:07 +0100)]
Merge branch 'wip-MDL-42672-master' of git://github.com/marinaglancy/moodle
sam marshall [Tue, 12 Nov 2013 12:23:10 +0000 (12:23 +0000)]
MDL-42839 MUC: Memcache server configuration too sensitive to whitespace
Tim Hunt [Mon, 28 Oct 2013 16:33:20 +0000 (16:33 +0000)]
MDL-38574 qtype chooser: quick fix to make it fit on-screen.
MDL-32729 will provide a better fix for this, but we may as well apply
this quick fix on stable branches.
Sam Hemelryk [Tue, 12 Nov 2013 08:30:39 +0000 (16:30 +0800)]
Merge branch 'MDL-42812-r1' of git://github.com/abgreeve/moodle
Rajesh Taneja [Tue, 12 Nov 2013 04:18:10 +0000 (12:18 +0800)]
MDL-42799 Assignment: Min. width/height for widget is set to 1
It was possible for user to add widgets with width/height = 0
which were not displayed to user and doesn't have much meaning to it
This patch will set min. width/height to 1
Aparup Banerjee [Tue, 12 Nov 2013 07:56:40 +0000 (15:56 +0800)]
MDL-42711 theme port from LM: reimplemented fixes from MDLSITE-2451 to align group icons in forumpost css class (forum/blog).
Aparup Banerjee [Tue, 12 Nov 2013 07:56:40 +0000 (15:56 +0800)]
MDL-42711 theme port from LM: reimplemented fixes from MDLSITE-2451 to align group icons if forumpost
Adrian Greeve [Tue, 12 Nov 2013 07:46:45 +0000 (15:46 +0800)]
MDL-42812 mod_quiz: Fixed up a syntax error for additional name fields.
Sam Hemelryk [Tue, 12 Nov 2013 06:08:25 +0000 (14:08 +0800)]
MDL-42832 course: management viewmode string improvements
Damyon Wiese [Tue, 12 Nov 2013 07:11:25 +0000 (15:11 +0800)]
Merge branch '41392-26-r1' of git://github.com/samhemelryk/moodle
Jerome Mouneyrac [Tue, 12 Nov 2013 07:09:19 +0000 (15:09 +0800)]
MDL-42705 EditPDF: Progress bar styles in editpdf need to be moved to base theme.
Sam Hemelryk [Tue, 12 Nov 2013 06:26:39 +0000 (14:26 +0800)]
MDL-41392 course: management fixed skiplinks breaking clean columns
Damyon Wiese [Tue, 12 Nov 2013 06:22:28 +0000 (14:22 +0800)]
Merge branch 'w46_MDL-42503_m26_stringfilters' of https://github.com/skodak/moodle
Jason Fowler [Mon, 11 Nov 2013 04:42:54 +0000 (12:42 +0800)]
MDL-42684 TinyMCE: Correct widths on screens with narrow fieldsets
Sam Hemelryk [Tue, 12 Nov 2013 05:53:08 +0000 (13:53 +0800)]
Merge branch 'wip-MDL-42762-master' of git://github.com/abgreeve/moodle
Aparup Banerjee [Tue, 12 Nov 2013 05:45:58 +0000 (13:45 +0800)]
MDL-42711 added chat.less file
Sam Hemelryk [Tue, 12 Nov 2013 05:20:12 +0000 (13:20 +0800)]
Merge branch 'wip-MDL-41158-master-two' of git://github.com/abgreeve/moodle
Marina Glancy [Tue, 12 Nov 2013 04:11:19 +0000 (15:11 +1100)]
Merge branch 'MDL-42276_master' of https://github.com/markn86/moodle
Damyon Wiese [Tue, 12 Nov 2013 04:04:11 +0000 (12:04 +0800)]
MDL-42804 Database - SQL keywords should be uppercase.
rwijaya [Mon, 11 Nov 2013 08:10:30 +0000 (16:10 +0800)]
MDL-42804 data_mod: fix alternate name warning for deleting an entry
Marina Glancy [Tue, 12 Nov 2013 04:00:57 +0000 (15:00 +1100)]
Merge branch 'MDL-42824-master-int' of git://github.com/FMCorz/moodle
Marina Glancy [Tue, 12 Nov 2013 03:47:54 +0000 (14:47 +1100)]
Merge branch 'MDL-42540' of git://github.com/timhunt/moodle
Sam Hemelryk [Tue, 12 Nov 2013 03:34:39 +0000 (11:34 +0800)]
Merge branch 'MDL-42215_lang' of https://github.com/andyjdavis/moodle
Adrian Greeve [Mon, 11 Nov 2013 09:18:16 +0000 (17:18 +0800)]
MDL-42812 libraries: Update username_load_fields_from_object to add the prefix to everything.
Andrew Nicols [Mon, 11 Nov 2013 08:27:50 +0000 (16:27 +0800)]
MDL-42810 ActionMenu: Hide the ActionMenu when clicking on primary links
Aparup Banerjee [Tue, 12 Nov 2013 03:01:22 +0000 (11:01 +0800)]
MDL-42711 theme port from LM: MDLSITE-2463 wrap tinymce instances responsively on mod/data pages (editing) for smaller screen widths
Aparup Banerjee [Tue, 12 Nov 2013 02:54:38 +0000 (10:54 +0800)]
MDL-42711 theme port from LM: MDLSITE-2480 fixed up course view - icon now positioned correctly when long course titles wrap on small screens
Adrian Greeve [Tue, 6 Aug 2013 09:23:38 +0000 (17:23 +0800)]
MDL-41158 mod_workshop: Workshop submission alternate name field fix.
Marina Glancy [Tue, 12 Nov 2013 02:34:01 +0000 (13:34 +1100)]
Merge branch 'MDL-42809-master' of git://github.com/andrewnicols/moodle
Eloy Lafuente (stronk7) [Tue, 12 Nov 2013 02:27:22 +0000 (03:27 +0100)]
Merge branch 'MDL-42573-master' of git://github.com/danpoltawski/moodle
Andrew Nicols [Tue, 12 Nov 2013 02:25:52 +0000 (10:25 +0800)]
MDL-42827 JavaScript: Use a more specific selector for activity links
Adrian Greeve [Mon, 11 Nov 2013 09:18:16 +0000 (17:18 +0800)]
MDL-42812 libraries: Update username_load_fields_from_object to add the prefix to everything.
Mark Nelson [Fri, 25 Oct 2013 10:04:45 +0000 (18:04 +0800)]
MDL-42276 core_group: added behat tests to automate group actions
1. Added new step definitions to check if an element exists or does not exist in another.
2. Added new step definitions to check if an element is readonly or is not readonly.
3. Automated testing for MDLQA-1812 and MDLQA-1813.
Added behat test for deleting groups/groupings with and without the
'moodle/course:changeidnumber' capability.
4. Automated MDLQA-2105.
Added behat test for creating groups/groupings without the
'moodle/course:changeidnumber' capability.
5. Automated MDLQA-2238 and MDLQA-2335.
Added behat test for updating groups/groupings with and without the
'moodle/course:changeidnumber' capability.
Damyon Wiese [Tue, 12 Nov 2013 02:02:09 +0000 (10:02 +0800)]
Merge branch '42806-26' of git://github.com/samhemelryk/moodle
Frederic Massart [Tue, 12 Nov 2013 00:51:44 +0000 (08:51 +0800)]
MDL-42824 backup: Typo in description of setting backup_general_questionbank
Marina Glancy [Tue, 12 Nov 2013 00:23:51 +0000 (11:23 +1100)]
Merge branch 'MDL-41775_master' of git://github.com/grabs/moodle
Eloy Lafuente (stronk7) [Mon, 11 Nov 2013 23:38:35 +0000 (00:38 +0100)]
Merge branch 'MDL-40481' of git://github.com/timhunt/moodle
Petr Škoda [Wed, 23 Oct 2013 18:20:56 +0000 (20:20 +0200)]
MDL-42503 treat $CFG->filterall as a real cache flag - verify during cache resets
Marina Glancy [Mon, 11 Nov 2013 10:48:39 +0000 (21:48 +1100)]
Merge branch '42805-26' of git://github.com/samhemelryk/moodle
Marina Glancy [Mon, 11 Nov 2013 10:34:48 +0000 (21:34 +1100)]
NOBUG: convert tabs to whitespaces
Marina Glancy [Mon, 11 Nov 2013 10:10:47 +0000 (21:10 +1100)]
Merge branch 'MDL-42043-master' of git://github.com/FMCorz/moodle
Andrew Nicols [Fri, 8 Nov 2013 08:24:50 +0000 (16:24 +0800)]
MDL-42783 Course: Improve accessiblity of various course actions
Marina Glancy [Mon, 11 Nov 2013 09:55:19 +0000 (20:55 +1100)]
Merge branch 'MDL-42081-phpunitfix' of git://github.com/mouneyrac/moodle
Damyon Wiese [Mon, 11 Nov 2013 09:25:30 +0000 (17:25 +0800)]
Merge branch 'wip-mdl-42754' of https://github.com/rajeshtaneja/moodle
Rajesh Taneja [Mon, 11 Nov 2013 09:20:26 +0000 (17:20 +0800)]
MDL-42754 Messages: Fixed typo
Sam Hemelryk [Mon, 11 Nov 2013 09:18:23 +0000 (17:18 +0800)]
MDL-42806 block_mentees: can only be docked if it has a valid title set.
Damyon Wiese [Mon, 11 Nov 2013 09:16:51 +0000 (17:16 +0800)]
Merge branch 'MDL-42803-master' of git://github.com/ankitagarwal/moodle
Sam Hemelryk [Mon, 11 Nov 2013 07:54:44 +0000 (15:54 +0800)]
MDL-41392 course: management checkbox accessibility improvement
Sam Hemelryk [Mon, 11 Nov 2013 09:09:44 +0000 (17:09 +0800)]
MDL-41392 course: management accessibility tweaking
Sam Hemelryk [Mon, 11 Nov 2013 08:51:06 +0000 (16:51 +0800)]
MDL-42806 dock: check title exists before using it
Sam Hemelryk [Mon, 11 Nov 2013 08:26:12 +0000 (16:26 +0800)]
MDL-42805 dock: fixed {} appearing in undock icon title
Jerome Mouneyrac [Mon, 11 Nov 2013 08:01:32 +0000 (16:01 +0800)]
MDL-42081 fix file_storage phpunit tests following adding new stamp files on fresh install
Aparup Banerjee [Mon, 11 Nov 2013 08:00:30 +0000 (16:00 +0800)]
MDL-42711 theme port from LM: fixed up choice results table overflowing to the right. (MDLSITE-2497)
Aparup Banerjee [Mon, 11 Nov 2013 07:43:02 +0000 (15:43 +0800)]
MDL-42711 theme port from LM - this makes the li's link inherit similar size from higher up in cascade.