63309 Commits

Author SHA1 Message Date
Mohamed Alsharaf
dca16fd76f MDL-27684 repository: make require_login() throws exception instead of redirect 2013-09-13 16:01:55 +12: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
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
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
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
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
Petr Škoda
2612e75e2b MDL-41245 fix redirect and missing string when cannot automatically delete uninstalled plugin 2013-08-28 08:00:19 +02:00
Dan Poltawski
d9cf3ca0b0 Merge branch 'MDL-41098-master-fix1' of git://github.com/damyon/moodle 2013-08-28 10:00:46 +08:00
Eloy Lafuente (stronk7)
5c45146007 Merge branch 'MDL-41387_master' of https://github.com/markn86/moodle 2013-08-27 21:00:12 +02: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
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
Dan Poltawski
9a6c6d1cfd Merge branch 'MDL-38765' of git://github.com/timhunt/moodle 2013-08-27 13:51:40 +08:00
Dan Poltawski
80979f76ee Merge branch 'wip-MDL-41181-master' of git://github.com/marinaglancy/moodle 2013-08-27 13:47:39 +08:00
Marina Glancy
d55f05ef43 MDL-41181 function moveto_module does not modify properties of object
instead it returns the new value for module visibility
2013-08-27 15:36:40 +10:00
Damyon Wiese
f5a791ee7a Merge branch 'wip-MDL-41307-master' of git://github.com/abgreeve/moodle 2013-08-27 13:36:38 +08:00
Marina Glancy
955d91c698 MDL-41181 No need to reset modinfo cache after moveto_module()
it is already reset inside the function
2013-08-27 15:36:21 +10:00
Damyon Wiese
a6163e7a5f MDL-31093 Scorm course format: Remove behat tests
The scorm course format has been removed so we don't need to test it anymore.
2013-08-27 13:26:47 +08:00
Damyon Wiese
f6c2af867f Merge branch 'master_MDL-40122' of git://github.com/danmarsden/moodle
Conflicts:
	lib/db/upgrade.php
	version.php
2013-08-27 13:16:55 +08:00
Damyon Wiese
92058753ac Merge branch 'MDL-40877-master' of git://github.com/FMCorz/moodle 2013-08-27 12:46:23 +08:00
Damyon Wiese
7316f46a23 Merge branch 'MDL-40447_master' of https://github.com/nadavkav/moodle 2013-08-27 12:27:47 +08:00
Damyon Wiese
58e6ac1e9a Merge branch 'MDL-40752_master' of https://github.com/nadavkav/moodle
Conflicts:
	theme/bootstrapbase/style/moodle.css
2013-08-27 12:23:16 +08:00
Dan Poltawski
e820d50791 Merge branch 'MDL-37211_master' of https://github.com/nadavkav/moodle 2013-08-27 11:54:28 +08:00
Rajesh Taneja
ddf05b5e9d MDL-41415 Events: get_string should not use new 2013-08-27 11:36:26 +08:00
Rajesh Taneja
41566267c5 MDL-41415 Events: get_legacy_logdata is protected 2013-08-27 11:36:11 +08:00
Damyon Wiese
2e68b1254f MDL-39871 themes RTL: Get rtlblockmanipulations from any parent 2013-08-27 11:14:53 +08:00
Nadav Kavalerchik
5b2ed8b5ff MDL-39871 Blocks,Themes: Swap block regions in RTL mode (using pre-defined array) 2013-08-27 11:14:52 +08:00
Dan Poltawski
67c6ab1646 Merge branch 'wip-MDL-41222-master' of git://github.com/marinaglancy/moodle 2013-08-27 11:03:35 +08:00
Dan Poltawski
d1584b6165 Merge branch 'MDL-41098-master' of git://github.com/damyon/moodle 2013-08-27 10:57:09 +08:00