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
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
Petr Škoda
5e95223e86
MDL-28094 keep subdirs in content upgraded from 1.x
2013-09-07 11:30:19 +02:00
Adrian Greeve
a3b2df62a2
MDL-32862 - Backup: Rewriting resource_old links on backup.
2013-09-06 14:53:39 +08:00
David Mudrák
57c2052c20
MDL-29378 Code cleanup in the Survey module
...
While working on the issue, I spotted these two places that were worth of
fixing. The first one is a trivial reminiscence of a previous refactoring,
after which both branches of the if() statement became equal.
The second one is actually a typo as in theory it could generate unexpected
input fields with the name like qPP1. Luckily this never happened due to the
way how survey questions are hardcoded (there are no questions with the type 2
that would require two answers to their subquestions).
2013-09-05 00:08:42 +02:00
David Mudrák
7c51792932
MDL-29378 Fix the form display in the Survey/COLLES P+A module
...
In MDL-7501, we stopped using rowspanning cells in the form table due to
accessibility. That had introduced a regression so in the COLLES P+A survey,
all the rows were displayed with the same background colour. This patch returns
the previous behaviour that each couple of items can be distinguished by the
background colour.
Also, there is no need to display "I prefer that" and "I found that" as a small
text any more. It had made sense in rowspanning layout but not after MDL-7501
was fixed.
And finally, as all items are enumerated now sequentially, there are actually
48 lines, each couple covering one question in two variants. I think it's
correct to reflect this in the description of the form so the text was slightly
amended.
2013-09-05 00:08:42 +02:00
David Mudrák
de9a88cdaf
MDL-29378 Fix regression in the Survey/COLLES P+A module
...
This basically reverts the commit 5196df589b0fbcead4a0943c8e7b227f8a98c897 that
I believe was a result of misunderstanding of how question type field is
(ab)used in the Survey module. As it took significant time to get familiar with
the overall logic of questions and their processing in the module, I left my
findings in added inline comments. The point is that it is $question->type that
matters. Types of questions listed as subquestions in the multi field is
irrelevant in that case (and all have it set to 1 IIRC).
This patch re-enables the "COLLES (Preferred and Actual)" survey type that did
not work at all due to regression.
2013-09-05 00:08:42 +02:00
Henning Bostelmann
d0372ed6f1
MDL-29069 Data / Glossary: allow disapproving entries
2013-09-04 20:37:46 +01:00
David Monllao
93a8bc8283
MDL-41568 lang: Fix behat features after changes
2013-09-04 15:16:59 +08:00
Damyon Wiese
3516b82c9d
Merge branch 'wip-mdl-41456' of git://github.com/rajeshtaneja/moodle
2013-09-04 11:45:07 +08:00
Damyon Wiese
1f08aa6685
MDL-28579 scorm: Fix broken unit tests
2013-09-04 09:44:05 +08:00
Damyon Wiese
8a4796fbcd
Merge branch 'master_MDL-28579' of git://github.com/danmarsden/moodle
2013-09-04 09:00:48 +08:00
