Commit graph

65147 commits

Author SHA1 Message Date
Jerome Mouneyrac
eb11ae0d5c MDL-42760 EditPDF: sometimes the dropdown or search comment appear below the editpdf 2013-11-07 16:11:51 +08:00
Andrew Nicols
1ef33d5914 MDL-42679 mod_scorm: Include gallery-sm-treeview for https support 2013-11-07 15:58:22 +08:00
Frederic Massart
ab1658fb17 MDL-42666 repository_boxnet: Do not run the upgrade multiple times 2013-11-07 15:53:59 +08:00
Frederic Massart
def961fd0d MDL-42668 portfolio_boxnet: Do not run upgrade multiple times 2013-11-07 15:35:24 +08:00
Frederic Massart
a5a84cc894 MDL-42668 portfolio_boxnet: Disable the portfolio when non-HTTPS 2013-11-07 15:28:34 +08:00
Frederic Massart
337107fe4b MDL-42668 portfolio_boxnet: Disable the portfolio during upgrade 2013-11-07 15:28:34 +08:00
Frederic Massart
7c6ad254f3 MDL-42668 portfolio_boxnet: Notify the admins about the upgrade process 2013-11-07 15:28:34 +08:00
Frederic Massart
d130777df5 MDL-42668 portfolio_boxnet: Migration to APIv2 2013-11-07 15:28:34 +08:00
Dan Poltawski
b74c8389b1 Merge branch 'MDL-42666-master-fixup' of git://github.com/FMCorz/moodle 2013-11-07 14:19:14 +08:00
Marina Glancy
cc58ba267d Merge branch 'w46_MDL-42708_m26_mymobile' of https://github.com/skodak/moodle 2013-11-07 17:17:42 +11:00
Marina Glancy
4c0e155433 Merge branch '42375-26' of git://github.com/samhemelryk/moodle 2013-11-07 17:08:03 +11:00
Sam Hemelryk
10a2bf4613 MDL-42375 course: management interface icon tweaks
* Drag and drop icon switched to a 12x12px icon.
* Drag and drop icon now uses cursor:pointer
* Improved alignment of the caret for course listing actions.
2013-11-07 14:01:17 +08:00
Frederic Massart
7cb353ff69 MDL-42666 tests: Setting new Box.net mandatory arguments 2013-11-07 13:54:47 +08:00
Andrew Nicols
9d6d88e1bd MDL-42748 Theme: Add back missing overflow on help tooltips 2013-11-07 13:53:43 +08:00
Marina Glancy
afd765337a Merge branch 'MDL-42697-master' of git://github.com/andrewnicols/moodle 2013-11-07 16:31:01 +11:00
Rajesh Taneja
9a90e7c57a MDL-42754 Messages: Show noreply user notifications
With fake noreply and support users, the notifications were not accessible by user
Support for viewing messages from noreply user has been added.

Signed-off-by: Rajesh Taneja <rajesh@moodle.com>
2013-11-07 13:08:30 +08:00
Damyon Wiese
81b07e655c Merge branch 'MDL-40975-overflow' of git://github.com/andrewnicols/moodle
Conflicts:
	theme/bootstrapbase/style/moodle.css
2013-11-07 12:23:25 +08:00
Jason Fowler
2106d4b351 MDL-42660 TinyMCE: Shuffle icons in default toolbar layout 2013-11-07 12:15:11 +08:00
Jason Fowler
f2b8eb222a MDL-42600 EditPDF: Fix padding etc on toolbars 2013-11-07 12:15:11 +08:00
Jason Fowler
525d094a47 MDL-42660 Filepicker: Fix padding etc on filepicker/manager toolbars
Conflicts:

	theme/bootstrapbase/style/moodle.css
2013-11-07 12:15:11 +08:00
Jason Fowler
f897dbcb24 MDL-42660 TinyMCE: Fix padding etc to make TinyMCE work better on small screens 2013-11-07 12:15:11 +08:00
Marina Glancy
1dd53c7a5a Merge branch 'MDL-41586-master' of git://github.com/ankitagarwal/moodle 2013-11-07 15:06:38 +11:00
rwijaya
c544ee92f5 MDL-41615 quiz_mod: fix heading levels for usability and accessibility 2013-11-07 12:04:00 +08:00
Dan Poltawski
d4308dff59 Merge branch 'MDL-42628_b' of https://github.com/rwijaya/moodle
Conflicts:
	theme/bootstrapbase/style/moodle.css
2013-11-07 11:58:46 +08:00
Dan Poltawski
f6a2a36bcd Merge branch 'MDL-42666-master' of git://github.com/FMCorz/moodle 2013-11-07 11:44:01 +08:00
Andrew Nicols
b100c4e3a1 MDL-40975 Behat: Fix test failure with block menus 2013-11-07 11:42:27 +08:00
Andrew Nicols
27e6dce63b MDL-40975 Theme: Stop treating label commands differently 2013-11-07 11:42:26 +08:00
rwijaya
9cb48f50c4 MDL-42628 course management: improve RTL display 2013-11-07 11:38:46 +08:00
Sam Hemelryk
16a14e4a5f Merge branch 'wip-MDL-42739_M26' of git://github.com/lazydaisy/moodle 2013-11-07 11:29:57 +08:00
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
Frederic Massart
f591c247ca MDL-42666 repository_boxnet: Improved output during migration 2013-11-07 10:58:40 +08:00
Frederic Massart
51ada519a6 MDL-42666 repository_boxnet: Downloading a file follows locations 2013-11-07 10:54:48 +08:00
Frederic Massart
102a241998 MDL-42666 repository_boxnet: Fix undefined variable usage 2013-11-07 10:54:48 +08:00
Frederic Massart
d7274bfead MDL-42666 repository_boxnet: Convert all the references asap
This has been done in case the script fails during the processing
and needs to be re-run. Now all the references are converted as soon
as we can, where as before they could have ended up being re-downloaded.
2013-11-07 10:54:47 +08:00
Frederic Massart
ab227cc6a9 MDL-42666 repository_boxnet: Warn on HTTPS requirement when non HTTPS 2013-11-07 10:54:47 +08:00
Frederic Massart
090976b966 MDL-42666 repository_boxnet: Alert the admins of the migration process 2013-11-07 10:54:38 +08:00
Marina Glancy
27199cfce8 Merge branch 'MDL-42696-collator' of git://github.com/mudrd8mz/moodle 2013-11-07 12:59:36 +11:00
Yuliya Bozhko
f5d17c14ea MDL-39923 badges: Send badge messages through internal messaging system 2013-11-07 14:49:27 +13: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
Mary Evans
4731319e24 MDL-42739 theme_anomaly: Updated renderers.php to fix dock not working in Anomaly theme. 2013-11-06 22:38:37 +00:00
Eloy Lafuente (stronk7)
e916eb407c Merge branch 'MDL-42714-master' of git://github.com/sammarshallou/moodle 2013-11-06 23:35:37 +01:00
Petr Škoda
e0caccb410 MDL-42708 force mymobile uninstallation during upgrade 2013-11-06 20:04:58 +01:00
Andrew Nicols
4c9e8ea7a3 MDL-40975 Course: Fix issues with overflowing content in narrow windows 2013-11-07 01:16:34 +08: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