63575 Commits

Author SHA1 Message Date
Damyon Wiese
c932a4db7c Merge branch 'MDL-41259_master' of https://github.com/nitzo/moodle 2013-09-02 15:02:12 +08:00
Damyon Wiese
fb692af13b Merge branch 'MDL-41516-m' of git://github.com/andrewnicols/moodle 2013-09-02 14:56:49 +08:00
Dan Poltawski
5972292444 Merge branch 'MDL-36093-master' of github.com:StudiUM/moodle 2013-09-02 14:10:28 +08:00
Dan Poltawski
7cefa10220 MDL-40676 tests: fix null byte test. 2013-09-02 13:58:53 +08:00
Yuliya Bozhko
737a352ff8 MDL-40712 badges: Display recipient information 2013-09-02 13:43:51 +08:00
Yuliya Bozhko
2d3c0faef1 MDL-40924 badges: Add caching to external badges 2013-09-02 13:40:41 +08:00
Andrew Davis
974beea10a MDL-40735 mod_lesson: fixed up a header and stripped out hardcoded formatting 2013-09-02 12:38:20 +07:00
Andrew Davis
66e2b9f8c2 MDL-38856 reposition activity group control and fixed titles in chat, database and forum 2013-09-02 11:49:39 +07:00
Petr Škoda
bff1d60c05 MDL-40676 ignore null bytes 2013-09-02 12:25:02 +08:00
Dan Poltawski
fff084b29f Merge branch 'MDL-41175_M26' of git://github.com/lazydaisy/moodle
Conflicts:
	theme/bootstrapbase/style/moodle.css
2013-09-02 11:50:38 +08:00
Dan Poltawski
70189e7ad2 Merge branch 'MDL-41328-master' of git://github.com/damyon/moodle 2013-09-02 11:44:51 +08:00
Andrew Nicols
ff73a6d1fb MDL-41328 Editor: Work around another iOS issue with TinyMCE
We apply this only on touchend and not touchstart or touchmove. The
location is not guaranteed until the end of the gesture, and there's no
need to keep applying focus on every move.
2013-09-02 09:41:27 +08:00
AMOS bot
635bf2f343 Automatically generated installer lang files 2013-09-02 00:47:05 +00:00
Marina Glancy
dd8b6a19dd MDL-31890 corrected whitespaces and phdocs 2013-09-02 10:27:12 +10:00
Andrew Nicols
59849f7925 MDL-41516 Themes: Ensure that blocks are set up early
Blocks can require JavaScript which must be set up early in the page
lifecycle.
In order to do so, we should ensure that content is created in the standard
head setup before any other output is created so that any subsequent use of
block instances are no longer the first such use when they may already be
too late in the lifecycle.
2013-09-01 23:53:52 +01:00
Paul Charsley
9028d9b513 MDL-31890 added core_grading_get_gradingform_instances web service
function
2013-09-02 09:00:39 +12:00
Sam Hemelryk
3f47974fc0 MDL-41432 output: several action_menu improvements
The following improvements have been made:
* Items no longer MUST have an icon, it can now be null instead.
* You can specify the icon displayed to toggle the dropdown menu.
* You can add text in front of the aforementioned icon.
2013-09-02 08:34:54 +12:00
Sam Hemelryk
f2b235cb14 MDL-41214 notification: now looks at menubar zIndex as well 2013-09-02 08:29:53 +12:00
Petr Škoda
0aa535bf1d MDL-20045 add support for custom context levels 2013-08-31 11:47:44 +02:00
Petr Škoda
40834ac88c MDL-41255 fix incorrect redirection logic when changing password
Credit goes to Michael Milette.
2013-08-31 11:42:27 +02:00
Petr Škoda
ac2b2713ba MDL-41267 add support for subplugins in admin tools 2013-08-31 11:40:44 +02:00
AMOS bot
096640fc5e Merge branch 'master' into install_master 2013-08-31 00:43:52 +00:00
Willy Lee
030e2976ec MDL-41497 auth_db: Added help text for using odbc dsn names instead 2013-08-30 10:17:31 -05:00
David Monllao
d9ff6296b7 MDL-41399 tool_generator: Unit test for fixeddataset 2013-08-30 18:55:07 +08:00
David Monllao
219cae03db MDL-41399 tool_generator: Adding fixeddataset option 2013-08-30 18:55:07 +08:00
Marina Glancy
1f0a9ce48b MDL-37028 Integrity check for course modules and sections
created function, unittest, build-in quick integrity check on each call to rebuild_course_cache()
also added CLI script
2013-08-30 16:41:13 +10:00
Marina Glancy
3e439915d3 MDL-41179 is_user_access_restricted_by_capability() must look at specified user and not current 2013-08-30 14:29:57 +10:00
Marina Glancy
2ef39ca4c5 MDL-23044 Support for storing thumbnails in repository filesystem 2013-08-30 14:22:48 +10:00
Rajesh Taneja
3b908929c1 MDL-41456 Events: Fixed existing events to respect base event access specifier and return data type 2013-08-30 11:07:48 +08:00
Damyon Wiese
ee788142f2 weekly release 2.6dev 2013-08-30 09:37:04 +08:00
Damyon Wiese
4a5a5f6902 ie9 svg compatibility fixes 2013-08-30 09:29:10 +08:00
AMOS bot
b5b8310e9c Automatically generated installer lang files 2013-08-30 00:41:46 +00:00
Willy Lee
d991bc77fa MDL-41497 enrol_database: Added help text for using odbc dsn names instead 2013-08-29 15:36:44 -05:00
Mark Nielsen
79547e52dd MDL-32690: Restore 1.9 backup into 2.X fails on missing assignment type
Solution is as follows:
* Allow unsupported subplugins to convert from Moodle1 to Moodle2
* On Moodle2 restore hide unsupported subplugins
* Graceful error message in assignment of unsupported subplugins
2013-08-29 08:47:35 -07:00
Sam Hemelryk
4d5221906e MDL-40931 theme_bootstrapbase: fixed missing ! when including html5shiv 2013-08-29 20:34:45 +12:00
Damyon Wiese
77bb4425e1 Revert "MDL-39871 Find a solution to handling RTL switching in CSS"
This reverts commit 2e68b1254f4613c679bc7338a097d63f09b4089e.
This reverts commit 5b2ed8b5ff3160e85c6b7135739334f648535501.
2013-08-29 15:39:25 +08:00
Ankit Agarwal
ee74a2a19e MDL-41485 calendar: Replace value of action buttons on managesubscription page with int 2013-08-29 14:55:43 +08:00
Rossiani Wijaya
438715218d MDL-41438 core renderer: additional patch to remove .main definition from all core themes 2013-08-29 11:44:55 +08:00
Damyon Wiese
09d7ecbad8 Revert "MDL-40752 - Login panel should be placed on the right side, in RTL mode (theme/clean, bootstrap)"
This reverts commit 48e5db7428dfaaca81e326688b29fdc02dbf1566.

Conflicts:

	theme/bootstrapbase/style/moodle.css
2013-08-29 11:35:42 +08:00
Rossiani Wijaya
1bc07ca21d MDL-41438 core_renderer: Update the parameters for heading() and heading_with_help().
heading(), change the default value for classes from 'main' to null.
heading_with_help(), add 2 additional parameters for level and classnames. Default value of level is set to 2 and classnames is set to null.

With the changes for heading_with_help(), icon image vertical alignment needs to be adjusted, so it display in the middle of the heading.

Also added some notes in theme/upgrade.txt file.
2013-08-29 10:30:02 +08:00
Dan Poltawski
575c57df0a Merge branch 'MDL-39682_master' of https://github.com/nadavkav/moodle
Conflicts:
	theme/bootstrapbase/style/moodle.css
2013-08-29 10:15:47 +08:00
Sam Hemelryk
db314fc883 MDL-41213 theme_bootstrapbase: fixed license filemanager overflow 2013-08-29 09:08:47 +12:00
Nadav Kavalerchik
f63a9af78e MDL-39682 Forms, File Picker, Themes: Fix alignment of Form's Labels and Input elements in RTL mode (theme/clean) 2013-08-28 21:15:49 +03:00
Jean-Philippe Gaudreau
70be44309e MDL-36093 grade export: Fix HTML special characters printed litteraly. 2013-08-28 09:12:45 -04:00
Brian King
07dffdf5f5 MDL-41403 Backup: reduce memory usage when searching for courses / categories
Also makes a few existing comments in the changed code area adhere to coding standards.
2013-08-28 12:59:16 +02:00
Tim Hunt
0d14f2eb1e MDL-41348 question code depends on filelib.
I think this used to work because mod/forum/lib.php used to be included
everywhere, and in turn included lib/formslib.php. We should declare the
dependencey explicitly.
2013-08-28 11:15:24 +01:00
Damyon Wiese
771d17fbab Merge branch 'w35_MDL-41245_m26_pluginuninstall' of https://github.com/skodak/moodle 2013-08-28 17:06:07 +08:00
Damyon Wiese
1149b5d205 MDL-41249 assign: Fix incorrect gradingform restore step
The mapping in the previous patch was wrong - mod assign uses
the area "submissions" but the itemid is the grade->id not the submission->id.
2013-08-28 16:29:19 +08:00
Jason Fowler
2eaaae00be MDL-35925 File picker - Improving accessibility by adding focus and removing unnecessary alt attribs 2013-08-28 14:05:13 +08:00
Petr Škoda
2612e75e2b MDL-41245 fix redirect and missing string when cannot automatically delete uninstalled plugin 2013-08-28 08:00:19 +02:00