63548 Commits

Author SHA1 Message Date
David Monllao
219cae03db MDL-41399 tool_generator: Adding fixeddataset option 2013-08-30 18:55:07 +08: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
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
Colin Campbell
58672659c6 MDL-40214 mod_assign: Fixed issue with custom scale being lost during restore. 2013-08-28 10:52:47 +08:00
Dan Poltawski
033d1634cc MDL-29954 repository: remove dead code
Also remove repository_attach_id() which was never used and not useful.
2013-08-28 10:52:42 +08:00
Dan Poltawski
d9cf3ca0b0 Merge branch 'MDL-41098-master-fix1' of git://github.com/damyon/moodle 2013-08-28 10:00:46 +08:00
AMOS bot
3e770d5974 Automatically generated installer lang files 2013-08-28 00:53:46 +00:00
Eloy Lafuente (stronk7)
5c45146007 Merge branch 'MDL-41387_master' of https://github.com/markn86/moodle 2013-08-27 21:00:12 +02:00
Nitzan Bar
fdb04f62e9 MDL-41259 when duplicate course shortname exists an exception is thrown and sync is aborted 2013-08-27 21:13:57 +03:00
Eloy Lafuente (stronk7)
c718b49bfc Merge branch 'm26_MDL-41410_Move_Comment_To_Appropriate_Place' of https://github.com/scara/moodle 2013-08-27 19:45:24 +02:00
Damyon Wiese
c492d41f3b MDL-41098 atto: Enable atto text editor on upgrade
TinyMCE is still the default.
2013-08-27 21:36:21 +08:00
Damyon Wiese
ceaef9a9cc MDL-41098 atto: Fix min-height on firefox. 2013-08-27 21:09:32 +08:00
Dan Poltawski
939320f721 Merge branch 'MDL-41366' of git://github.com/timhunt/moodle 2013-08-27 18:09:34 +08:00
Mark Nelson
f192414ed8 MDL-41440 event: fixed incorrect treatment of get_string as a class 2013-08-27 17:03:07 +08:00
Damyon Wiese
5df7c45409 Merge branch 'MDL-41364' of git://github.com/timhunt/moodle 2013-08-27 16:31:36 +08:00
Damyon Wiese
ad4f3b6ce5 Merge branch 'wip-mdl-41415' of git://github.com/rajeshtaneja/moodle 2013-08-27 16:06:32 +08:00
Damyon Wiese
e3f3475079 Merge branch 'wip-MDL-41127-master' of git://github.com/marinaglancy/moodle 2013-08-27 15:55:14 +08:00
Damyon Wiese
8380bd08a8 Merge branch 'master_MDL-35380' of git://github.com/danmarsden/moodle 2013-08-27 15:51:19 +08:00
Dan Poltawski
d76cb8ee26 Merge branch 'MDL-39682_master' of https://github.com/nadavkav/moodle
Conflicts:
	theme/bootstrapbase/style/moodle.css
2013-08-27 15:47:52 +08:00
Damyon Wiese
cbd91e23e9 Merge branch 'wip-MDL-40931-m26' of git://github.com/samhemelryk/moodle
Conflicts:
	version.php
2013-08-27 15:29:49 +08:00
Ankit Agarwal
ac43f96306 MDL-40052 events: Code style fixes 2013-08-27 15:26:38 +08:00
Ankit Agarwal
b9e1f0997c MDL-40052 events: Add get_url() api to various report content_viewed classes 2013-08-27 15:26:38 +08:00
Ankit Agarwal
bb0038074e MDL-40052 events: Add content view events for reports
Includes:
* Add content view events for report_log
* Add content view events for report_loglive
* Add content view events for report_outline
* Add content view events for report_participation
* Add content view events for report_stats
2013-08-27 15:25:43 +08:00
Ankit Agarwal
589748316d MDL-40052 events: Add a base class for content view 2013-08-27 15:22:28 +08:00
Damyon Wiese
37e2954e19 Merge branch 'MDL-41401-master' of git://github.com/danpoltawski/moodle 2013-08-27 15:09:21 +08:00
Dan Poltawski
4436225eb1 Merge branch 'MDL-40732' of git://github.com/rwijaya/moodle 2013-08-27 15:06:38 +08:00
Damyon Wiese
8760b1eea2 MDL-41081 navbar: Cleanup comments in prepend() 2013-08-27 14:11:08 +08:00
Damyon Wiese
dc7092f7b3 Merge branch 'wip-MDL-41081-m26' of git://github.com/samhemelryk/moodle 2013-08-27 14:11:03 +08:00
Dan Poltawski
eb1526e059 Merge branch 'MDL-41321_master' of git://github.com/lazydaisy/moodle
Conflicts:
	theme/bootstrapbase/style/moodle.css
2013-08-27 14:06:54 +08:00