Dan Poltawski
d06d812c51
Merge branch 'wip-MDL-40883-master' of git://github.com/marinaglancy/moodle
2013-11-08 15:32:11 +08:00
Frederic Massart
4bceea11be
MDL-42772 upgrade: Force alternate fields in session user
2013-11-08 14:01:39 +08:00
Marina Glancy
2e84b4b323
Merge branch 'MDL-42775-master' of git://github.com/danpoltawski/moodle
2013-11-08 16:37:55 +11:00
Jason Fowler
d37ec4b6a7
MDL-42684 TinyMCE: Including details of patch in moodle-readme.txt
2013-11-08 12:57:46 +08:00
Jason Fowler
762a29690e
MDL-42684 TinyMCE: make tinymce start at full width
2013-11-08 12:57:46 +08:00
Dan Poltawski
356d33a866
MDL-42775 dml: remove invalid unit test assertion
2013-11-08 12:25:49 +08:00
Damyon Wiese
16fd6fb6d7
Merge branch 'w46_MDL-42769_m26_admineditor' of https://github.com/skodak/moodle
2013-11-08 11:43:10 +08:00
Marina Glancy
61d1e9c44d
Merge branch 'MDL-41586-master' of git://github.com/ankitagarwal/moodle
2013-11-08 14:13:24 +11:00
Ankit Agarwal
6cff6350df
MDL-41586 libaries: Fix issues with scale in sqlsrv libraries
...
0 is a valid value
null is the default scale we set in other DBs
2013-11-08 10:49:35 +08:00
Marina Glancy
a9d11e3cd0
MDL-40883 ddl: unittest for objects name length
2013-11-08 13:17:47 +11:00
Jason Fowler
46f763ed4a
MDL-42660 TinyMCE: Ensure upgrade is only performed when possible
...
Conflicts:
lib/editor/tinymce/db/upgrade.php
2013-11-08 09:49:02 +08:00
Marina Glancy
dcde391b44
MDL-40883 ddl: make sure object name never exceeds max length
...
Many thanks to Ray Bon for finding the problem
2013-11-08 11:58:35 +11:00
Petr Škoda
8213007c7f
MDL-42769 use only text area editor before install completed
2013-11-07 23:51:59 +01:00
Dan Poltawski
0967c74a3d
Merge branch 'MDL-42737-master' of git://github.com/andrewnicols/moodle
2013-11-07 17:21:54 +08:00
Yuliya
be2b37cf4b
MDL-39923 badges: Fix unit tests
2013-11-07 21:48:01 +13: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
Frederic Massart
7cb353ff69
MDL-42666 tests: Setting new Box.net mandatory arguments
2013-11-07 13:54:47 +08: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
Jason Fowler
2106d4b351
MDL-42660 TinyMCE: Shuffle icons in default toolbar layout
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
Dan Poltawski
f6a2a36bcd
Merge branch 'MDL-42666-master' of git://github.com/FMCorz/moodle
2013-11-07 11:44:01 +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
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
51ada519a6
MDL-42666 repository_boxnet: Downloading a file follows locations
2013-11-07 10:54:48 +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
Petr Škoda
e0caccb410
MDL-42708 force mymobile uninstallation during upgrade
2013-11-06 20:04:58 +01:00
Iñaki Arenaza
3f9562cc5d
MDL-42723: Hide and handle LDAP error when user not in context being checked
...
MDL-41304 only fixed the case when 'Search subcontext' is enabled. We need to
fix the case when it's not enabled too.
While silencing errors with an @ should be avoided if possible, there's no
other way to prevent the warnings in this case.
2013-11-06 17:31:55 +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
Damyon Wiese
3583b22717
MDL-42742 Dragdrop: Center the keyboard drag drop dialogue
2013-11-06 17:22:31 +08:00
Andrew Nicols
11f8ef10c0
MDL-42737 ActionMenu: Close the menu after selecting actions
2013-11-06 17:16:49 +08:00
Ankit Agarwal
e3359b87df
MDL-41586 libraries: Fix scale issues
...
The default value of scale should be null not false in mssql, that is the
standard with other DBs
0 is a valid value for scale, don't change it in oracle
2013-11-06 16:12:15 +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
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
21231f4d76
MDL-40975 ActionMenu: Convert text-based icon to the caret style
2013-11-06 11:40:59 +08:00
Barbara Ramiro
13273e51a8
MDL-42564 ActionMenu: Replace actionmenu icon with new style
2013-11-06 11:40:58 +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
fe3593b4c2
MDL-40975 ActionMenu: Tidy up title + alt combinations
2013-11-06 11:40:55 +08:00
Andrew Nicols
ce30e14c65
MDL-40975 Course: Add aria label for dragdrop
2013-11-06 11:40:52 +08:00
Andrew Nicols
a4400cefdb
MDL-40975 JavaScript: Make drag/drop respond to a single click as well as a drag
2013-11-06 11:40:51 +08:00
Andrew Nicols
a83d83e42b
MDL-40975 Course: Change which actions are in the menu and which are outside it
2013-11-06 11:40:49 +08:00
Andrew Nicols
8ef1aa40d1
MDL-40975 Theme: Standardise size of icons in headings
2013-11-06 10:59:26 +08:00
Andrew Nicols
803912ae69
MDL-40975 Blocks: Move most block actions into the block menu
2013-11-06 10:59:25 +08:00
Frederic Massart
e27ed28785
MDL-42666 repository_boxnet: Revoke access token when logging out
2013-11-06 10:46:29 +08:00