mirror_php/moodle
1
0
Fork 0
mirror of https://github.com/moodle/moodle.git synced 2025-03-13 20:26:32 +01:00
Code Issues Projects Releases Wiki Activity
64,992 Commits 36 Branches 523 Tags
Commit Graph

64992 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Dan Poltawski
57d14266a8 Merge branch 'wip-mdl-42692' of https://github.com/rajeshtaneja/moodle 2013-11-07 11:23:11 +08:00
Dan Poltawski
0b353ee03e Merge branch 'MDL-42742-master' of git://github.com/damyon/moodle 2013-11-07 11:19:15 +08:00
Marina Glancy
ef14a8ffb4 Merge branch '42375-26' of git://github.com/samhemelryk/moodle 
Conflicts:
	theme/bootstrapbase/style/moodle.css
 2013-11-07 14:18:00 +11:00
Frederic Massart
e50117d952 MDL-42605 portfolio_flickr: Do not auto select a set to export to 2013-11-07 11:14:47 +08:00
Frederic Massart
16dc4c13ae MDL-42605 portfolio_flickr: Photos can be added to a set on export 2013-11-07 11:14:47 +08:00
Marina Glancy
27199cfce8 Merge branch 'MDL-42696-collator' of git://github.com/mudrd8mz/moodle 2013-11-07 12:59:36 +11:00
Dan Poltawski
02c6bd358f Merge branch 'MDL-42728-en_fix' of git://github.com/mudrd8mz/moodle 
Conflicts:
	lang/en/moodle.php
 2013-11-07 09:34:31 +08:00
Eloy Lafuente (stronk7)
e916eb407c Merge branch 'MDL-42714-master' of git://github.com/sammarshallou/moodle 2013-11-06 23:35:37 +01:00
David Mudrák
39fb6afa47 MDL-42696 Improve the collator class debugging 
To fully describe why the debugging warning was displayed, it is important to
display all three values - required locale, actual locale and the valid locale.
 2013-11-06 14:59:08 +01:00
sam marshall
3749c94627 MDL-42714 Backup: For tgz packer, handle missing zlib extension 2013-11-06 12:34:46 +00:00
Dan Poltawski
d214057cad on-demand release 2.6beta+ 2013-11-06 20:26:48 +08:00
Dan Poltawski
9306ed2cf5 NOBUG: Fixed SVG browser compatibility 2013-11-06 20:26:46 +08:00
Damyon Wiese
3583b22717 MDL-42742 Dragdrop: Center the keyboard drag drop dialogue 2013-11-06 17:22:31 +08:00
Damyon Wiese
dcd02d8b0e Merge branch 'MDL-40975-master-fixes' of git://github.com/andrewnicols/moodle 
Conflicts:
	theme/bootstrapbase/style/moodle.css
 2013-11-06 16:42:11 +08:00
Sam Hemelryk
52c93a26ca MDL-42375 course: management interface icon spacing improved 
Fixed the display of icons and their spacing when JS is disabled.
 2013-11-06 16:38:32 +08:00
Andrew Nicols
13a73a16f2 MDL-40975 Theme: Remove activity padding properly when editor displayed for RTL 2013-11-06 16:20:00 +08:00
Andrew Nicols
5609c6321d MDL-40975 Course: Make the edit title instructinos position with mod-indent 2013-11-06 16:20:00 +08:00
Rajesh Taneja
0507c33cad MDL-42692 Quiz: Fixed z-index for tab and marks 
On edit quiz page marks/reorder text box has zindex set, which should be considered by modal
window. Also, tab set is also using zindex for active node.
 2013-11-06 16:09:18 +08:00
Damyon Wiese
30e736cfba Merge branch '42740-26' of git://github.com/samhemelryk/moodle 2013-11-06 16:07:44 +08:00
Andrew Nicols
685addbd1f MDL-40975 Theme: Increase section settings cog back to 16px 2013-11-06 16:06:59 +08:00
Andrew Nicols
868575ec2c MDL-40975 Course: Make spinner consistent across themes 2013-11-06 16:06:48 +08:00
Damyon Wiese
2c366f45ca Merge branch 'MDL-42624-master' of git://github.com/mouneyrac/moodle 2013-11-06 16:00:33 +08:00
Sam Hemelryk
02ee8997b5 MDL-42740 theme_anomaly: fixed block editing actions. 2013-11-06 15:50:16 +08:00
Damyon Wiese
496422e34c Merge branch '40975-26-r1' of git://github.com/samhemelryk/moodle 2013-11-06 15:37:29 +08:00
Sam Hemelryk
61ac7f01b2 MDL-40975 theme_afterburner: fixed up actionmenu CSS 2013-11-06 15:30:38 +08:00
Dan Poltawski
dc08bfe558 Merge branch '42628-26' of git://github.com/samhemelryk/moodle 2013-11-06 15:04:20 +08:00
Andrew Nicols
052dd0490f MDL-40975 Theme: Fix white line over links in Bootstrap with FF 2013-11-06 14:45:08 +08:00
Andrew Nicols
29afe143c1 MDL-40975 Theme: Set the colour for actionmenu carets appropriately 2013-11-06 14:37:05 +08:00
Marina Glancy
bdb7c88635 Merge branch 'MDL-42031-master' of git://github.com/mouneyrac/moodle 
Conflicts:
	mod/assign/feedback/editpdf/yui/build/moodle-assignfeedback_editpdf-editor/moodle-assignfeedback_editpdf-editor-min.js
 2013-11-06 17:18:38 +11:00
Jerome Mouneyrac
d40ce26f05 MDL-42031 assginfeedback_editpdf: fix next/previous/select page 2013-11-06 14:13:19 +08:00
rwijaya
b890be680d MDL-42628: fix RTL for course management 2013-11-06 14:12:24 +08:00
Colin Campbell
6d2baaaea4 MDL-42640 quiz: Fix restore of backup without overduehandling setting 
Use default quiz overduehandling setting when restoring a
backup from older Moodle version that does not have a quiz
overduehandling setting.
 2013-11-06 16:32:15 +11:00
Damyon Wiese
951b414b65 Merge branch 'MDL-40975-master' of git://github.com/andrewnicols/moodle 
Conflicts:
	theme/bootstrapbase/style/moodle.css
 2013-11-06 13:06:01 +08:00
Marina Glancy
c32ba4e2fb Merge branch '42690-26' of git://github.com/samhemelryk/moodle 2013-11-06 15:52:03 +11:00
Damyon Wiese
ee8e077a2e Merge branch '42710-26' of git://github.com/samhemelryk/moodle 2013-11-06 12:07:47 +08:00
Damyon Wiese
ac3831b422 Merge branch 'MDL-41232-master' of git://github.com/mouneyrac/moodle 2013-11-06 11:59:41 +08:00
Andrew Nicols
1e5620a62b MDL-40975 Theme: Rebuild of bootstrap css 2013-11-06 11:41:01 +08:00
Andrew Nicols
f5b33487fc MDL-40975 ActionMenu: Adjust how actionmenu is displayed for course management 2013-11-06 11:41:00 +08:00
David Monllao
047a8800f4 MDL-40975 course: Adapt behat tests to the new course editing interface 2013-11-06 11:41:00 +08:00
Andrew Nicols
79864ef25f MDL-40975 ActionMenu: Ensure we maintain consistent tab order 
When the actionmenu is open, we should focus on it's first element, and
then naturally tab through it. Tabbing from the end should take us to the
first element after the menu button. This may not be the same as the first
element after the menu itself because of the nature of primary and
secondary action links. We also need to shift-tab back in the same manner.
 2013-11-06 11:40:59 +08:00
Andrew Nicols
7f4f7081f0 MDL-40975 Theme: Change the actionmenu icons back to 12px 2013-11-06 11:40:59 +08:00
Andrew Nicols
21231f4d76 MDL-40975 ActionMenu: Convert text-based icon to the caret style 2013-11-06 11:40:59 +08:00
Barbara Ramiro
6272fce649 MDL-42564 Course: Replace group mode icons with larger versions 2013-11-06 11:40:58 +08:00
Barbara Ramiro
13273e51a8 MDL-42564 ActionMenu: Replace actionmenu icon with new style 2013-11-06 11:40:58 +08:00
Andrew Nicols
6982618e89 MDL-40956 Course: AJAX course duplication 2013-11-06 11:40:57 +08:00
Andrew Nicols
d28aeeddc0 MDL-40975 Theme: Dim the modicon when an activity is disabled 2013-11-06 11:40:57 +08:00
Andrew Nicols
8d90aec2aa MDL-40975 Course: Make the completion tracking look the same as other icons when editing 2013-11-06 11:40:57 +08:00
Andrew Nicols
26dd99d292 MDL-40975 Course: Move all editing icons to the end of the line 2013-11-06 11:40:56 +08:00
Andrew Nicols
9ac099a1c1 MDL-40975 ActionMenu: Add support for fillers in primary menus 
This is required to maintain horizontal alignment of primary menus in rows.
 2013-11-06 11:40:56 +08:00
Andrew Nicols
405266165a MDL-40975 Course: Tidy up icon spacings 2013-11-06 11:40:55 +08:00