14299 Commits

Author SHA1 Message Date
Marina Glancy
4ead355143 Merge branch 'MDL-41621' of git://github.com/rwijaya/moodle 2013-09-16 17:14:18 +10:00
Marina Glancy
81673647a9 Merge branch 'MDL-41315-master' of git://github.com/damyon/moodle 2013-09-16 15:31:20 +10:00
Sam Hemelryk
31dea4fea4 Merge branch 'master_MDL-41434' of https://github.com/danmarsden/moodle 2013-09-16 15:07:57 +12:00
Sam Hemelryk
9034f94d07 Merge branch 'master_MDL-37524' of git://github.com/danmarsden/moodle 2013-09-16 10:42:47 +12:00
Dan Marsden
39355b46f9 MDL-37524 SCORM: mode not calculated correctly. 2013-09-16 10:12:49 +12:00
Dan Marsden
b33e466550 MDL-41434 SCORM: add new sortorder field to allow better ordering of scos 2013-09-16 10:11:16 +12:00
Henning Bostelmann
df0671f0d2 MDL-29987 File resource: fix problem with PDF display on mobile devices
Setting the default display option for PDF files from DISPLAY_EMBED to DISPLAY_OPEN
2013-09-13 10:30:41 +01:00
Damyon Wiese
20b7dcfc2c MDL-41315 assign: Add unit test for groupmembersonly 2013-09-13 16:43:26 +08:00
Damyon Wiese
a0e59f04dd MDL-41315 assign: Dont show users not in the current grouping
This is for separate groups mode. Note - this will be slower - but
this feature is experimental and groupslib does not provide a nicer api.
2013-09-13 14:47:01 +08:00
Rossiani Wijaya
f7bfb405cb MDL-41288 wiki: fix missing .rtl class for deleting comment button and improve page display for deleting comment 2013-09-13 12:56:41 +08:00
Rossiani Wijaya
14cdc25731 MDL-41288 Wiki: add additional fix for heading level 2013-09-13 11:04:08 +08:00
Damyon Wiese
7f43748f18 MDL-37804 assign: Return proper notice when submissions closed.
MDL-38267 was returning the html page when it should have been adding to the list
of notices and returing false.
2013-09-12 10:34:02 +08:00
Dan Poltawski
e3a1fa4be8 MDL-40733 forum: fix duplciate headings
two integration patches collided..
2013-09-11 16:14:37 +08:00
prateeksachan
9054c04d45 MDL-38267 assign: No Submit button after cut-off date 2013-09-11 12:17:59 +08:00
Sam Hemelryk
b3602b3e5e Merge branch 'MDL-40687' of git://github.com/rwijaya/moodle 2013-09-11 09:47:41 +12:00
Marina Glancy
341e2460cd MDL-41288 Bugfix of error occuring when subwiki is not set 2013-09-10 22:02:24 +10:00
Dan Poltawski
261dc01734 Merge branch 'MDL-40733_forum_name' of https://github.com/andyjdavis/moodle 2013-09-10 17:35:40 +08:00
Dan Poltawski
50d7cc8463 Merge branch 'MDL-41566' of git://github.com/rwijaya/moodle 2013-09-10 17:30:04 +08:00
Rossiani Wijaya
b25e7d8599 MDL-41562 file resource: fix page heading levels.
Also removing printheading options setting.
2013-09-10 17:22:08 +08:00
Rossiani Wijaya
d184f9bd4a MDL-41567 url resource: fix page heading levels.
Also removing printheading options setting.
2013-09-10 17:13:18 +08:00
Dan Poltawski
c219df86d1 Merge branch 'MDL-41564' of git://github.com/rwijaya/moodle 2013-09-10 15:29:23 +08:00
Dan Poltawski
f2ee9b5c27 Merge branch 'MDL-39992-master' of git://github.com/damyon/moodle 2013-09-10 14:58:54 +08:00
Dan Poltawski
92d92606ba Merge branch 'MDL-40631-master' of git://github.com/damyon/moodle 2013-09-10 14:33:41 +08:00
Rossiani Wijaya
876c0ac382 MDL-41288 wiki: improve heading levels and styling 2013-09-10 14:08:34 +08:00
Damyon Wiese
b10ce36806 Merge branch 'MDL-40736' of git://github.com/rwijaya/moodle 2013-09-10 13:48:01 +08:00
Dan Poltawski
e025a2fc43 Merge branch 'MDL-40686' of git://github.com/rwijaya/moodle
Conflicts:
	theme/bootstrapbase/style/moodle.css
2013-09-10 13:39:01 +08:00
Damyon Wiese
bfcc07504e MDL-23335 forum: Fix whitespace 2013-09-10 12:59:49 +08:00
Damyon Wiese
6aca3fc419 Merge branch 'wip-mdl-23335-master' of https://github.com/deraadt/moodle 2013-09-10 12:56:40 +08:00
Marina Glancy
44ddd2a115 MDL-41219 course: Make properties of course_modinfo read-only
added phpdocs and unittests
2013-09-10 14:11:37 +10:00
Marina Glancy
88715ba2c0 MDL-41192 course: Can not write to the read-only properties of cm_info 2013-09-10 14:11:30 +10:00
Sam Hemelryk
c0382dd012 Merge branch 'MDL-40735_lesson' of https://github.com/andyjdavis/moodle 2013-09-10 15:44:49 +12:00
Sam Hemelryk
a63d1e2871 Merge branch 'wip-MDL-41556-master' of git://github.com/abgreeve/moodle 2013-09-10 13:07:37 +12:00
Sam Hemelryk
3eb032d743 NOBUG: fixed whitespace 2013-09-10 13:02:35 +12:00
Sam Hemelryk
a775f2c96d Merge branch 'MDL-40731_headings' of https://github.com/andyjdavis/moodle
Conflicts:
	theme/bootstrapbase/style/moodle.css
2013-09-10 11:22:04 +12:00
Sam Hemelryk
8242ca0c34 MDL-32862 backup: fixed missing global 2013-09-10 10:57:20 +12:00
Sam Hemelryk
12d50d8216 Merge branch 'wip-MDL-32862-master' of git://github.com/abgreeve/moodle 2013-09-10 09:38:46 +12:00
Sam Hemelryk
9b6415dd38 Merge branch 'MDL-29378-survey' of git://github.com/mudrd8mz/moodle 2013-09-10 09:36:24 +12:00
Dan Poltawski
cdf6fc243e Merge branch 'MDL-29069' of https://github.com/bostelm/moodle 2013-09-09 17:37:49 +08:00
Andrew Davis
e5d932cce2 MDL-40734 mod_glossary: cleaned up some headings 2013-09-09 17:30:12 +08:00
David Mudrák
badfeed04c MDL-29378 Fix the recent string modification
But accident, I have modified the string 'collesaintro' in the previous patch.
The correct string to be amended is 'collesapintro'.
2013-09-09 11:19:48 +02:00
Dan Poltawski
8eb80a2c42 Merge branch 'MDL-37804' of github.com:recreate/moodle 2013-09-09 17:13:22 +08:00
Damyon Wiese
7bb89ae042 Merge branch 'master_MDL-41290' of git://github.com/danmarsden/moodle 2013-09-09 10:46:59 +08:00
Rossiani Wijaya
bea4ed1b44 MDL-41621 Assign mod: fix page heading levels 2013-09-09 10:24:19 +08:00
Rossiani Wijaya
4e5f53e90e MDL-41566 page resource: fix page heading levels.
Also removing printheading options setting.
2013-09-09 10:19:11 +08:00
Rossiani Wijaya
7265e7c784 MDL-41564 folder resource: fix page heading levels 2013-09-09 10:17:28 +08:00
Rossiani Wijaya
5def24cf32 MDL-40736 Survey: improve heading levels and styling 2013-09-09 09:50:42 +08:00
Rossiani Wijaya
846cebe5b3 MDL-40687 Feedback: improve page heading levels and layouts 2013-09-09 09:48:05 +08:00
Rossiani Wijaya
d8a6d49c5f MDL-40686 book: fix heading level and styling 2013-09-09 09:46:27 +08:00
Sam Hemelryk
33909ed001 Merge branch 'MDL-38794' of https://github.com/prateeksachan/moodle 2013-09-09 11:12:56 +12:00
Sam Hemelryk
fb76f7492e Merge branch 'MDL-29378-survey' of git://github.com/mudrd8mz/moodle 2013-09-09 10:48:13 +12:00