a9558a0559
Merge branch 'MDL-49241-27-enfix' of git://github.com/mudrd8mz/moodle into MOODLE_27_STABLE
2015-02-24 16:53:56 +00:00
e2abf6048c
Merge branch 'wip_MDL-49184_m27_choice' of https://github.com/skodak/moodle into MOODLE_27_STABLE
2015-02-24 10:43:36 +00:00
0aadd59a87
Merge branch 'MDL-49216-27' of git://github.com/andrewnicols/moodle into MOODLE_27_STABLE
2015-02-24 08:31:57 +00:00
0eaac55d01
Merge branch 'mdl27_MDL-46408' of https://github.com/danmarsden/moodle into MOODLE_27_STABLE
2015-02-24 11:36:49 +08:00
933fa26e63
MDL-49216 mod_forum: Move subquery to outer component
...
It is not possible to order sub-query results with some RDBMs, and the
subquery is not necessary anyway.
2015-02-24 08:31:43 +08:00
d0284fe719
MDL-49216 mod_forum: Add tests for discussion reply count
2015-02-24 08:31:36 +08:00
2017880f90
MDL-49241 lang: Merge English strings from the en_fix language pack
2015-02-23 21:17:31 +01:00
6e040c0593
MDL-35392 mod_assign: Push feedback to gradebook when releasing grades
...
When bulk changing workflow status a mismatch in variable
names meant that feedback wasn't being sent to the gradebook.
2015-02-23 09:17:17 +08:00
772ec0a6e3
MDL-46408 mod_scorm: check param is set before using.
...
The default org is only set if it exists in the imsmanifest.xml
2015-02-20 13:42:57 +13:00
6a03a96e47
Merge branch 'MDL-48884_m27' of git://github.com/markn86/moodle into MOODLE_27_STABLE
2015-02-17 14:44:18 +08:00
62baf63445
MDL-49184 choice: fix block actions
...
The problems was that blocks editing breaks if you redirect
after if (data_submitted()) - all form actions must make sure
it is really their form, otherwise they may hijack the post from
block actions.
Note that this is not a problem for mforms, only legacy forms
are affected.
2015-02-17 16:58:34 +13:00
476fa05c08
MDL-48709 mod_lesson: subclusters are not working
2015-02-14 18:18:32 +01:00
9e0b0f76bb
MDL-48884 mod_assign: prevented setting gradebook feedback unnecessarily
2015-02-09 22:18:21 -08:00
4cd7c56432
Merge branch 'wip-MDL-47558-m27' of git://github.com/marinaglancy/moodle into MOODLE_27_STABLE
2015-02-09 14:50:38 +00:00
f702287188
MDL-47558 resource: allow to edit module without being redirected
...
Thanks to Nathan Lewis for the code suggestion
2015-02-06 13:13:32 +08:00
52b817b6ba
MDL-44520 behat: Change behat features to use new section selectors
2015-02-06 10:35:05 +08:00
6b6125b949
Merge branch 'MDL-48942_survey_27' of https://github.com/andyjdavis/moodle into MOODLE_27_STABLE
2015-02-03 15:55:25 +00:00
a84ea4944a
Merge branch 'wip-mdl-48624-m27' of https://github.com/rajeshtaneja/moodle into MOODLE_27_STABLE
2015-02-03 11:01:58 +00:00
27ccaa5f29
Merge branch 'wip-mdl-49015-m27' of https://github.com/rajeshtaneja/moodle into MOODLE_27_STABLE
2015-02-03 11:52:32 +01:00
3d10a0b762
MDL-31036 mod_assign: Don't strip quickgrading feedback of special chars
2015-01-30 14:38:46 +08:00
a9d59d433a
MDL-49015 mod_lesson: Don't rely on external links in behat
2015-01-30 08:59:26 +08:00
379a362bca
MDL-48624 behat: Added page load check in workshop step
...
i_allocate_submissions_in_workshop_as step sometimes
fails because of server speed. Added page load check
with extended timout.
2015-01-30 08:55:54 +08:00
904883b08f
Merge branch 'MDL-36877_27' of https://github.com/jmvedrine/moodle into MOODLE_27_STABLE
2015-01-29 09:10:47 +08:00
20e9ca0faa
MDL-36877 mod_lesson: Fix while MDL-38578 is not solved
2015-01-28 21:37:18 +01:00
86799aa49f
Merge branch 'MDL-40285_m27' of git://github.com/markn86/moodle into MOODLE_27_STABLE
2015-01-27 12:21:23 +01:00
5869dbfc4c
MDL-40285 mod_assign: added extra group submissions behat scenario
...
Thanks a lot to Jody Steele for providing the basis for the scenario.
2015-01-27 00:35:14 -08:00
731251f405
MDL-40285 mod_assign: show details for all default group members
2015-01-27 00:35:13 -08:00
db8977f209
Merge branch 'wip-MDL-48325-27' of git://github.com/abgreeve/moodle into MOODLE_27_STABLE
2015-01-27 00:26:07 +01:00
32f0ad84c6
MDL-48942 mod_survey: synced security checks in view.php and graph.php
2015-01-26 15:06:36 +01:00
fd7100a221
MDL-36877 Lesson: final page not displayed if show gradebook set to no
2015-01-25 19:57:09 +01:00
74783abd8d
MDL-48325 mod_data: Export to portfolio button uses capability.
...
The Export to portfolio button now checks the mod/data:exportownentry
capability to see if the export button should be shown.
2015-01-22 15:01:21 +08:00
d02eaee727
Revert "Merge branch 'wip-mdl-48624-m27' of https://github.com/rajeshtaneja/moodle into MOODLE_27_STABLE"
...
This reverts commit 85ea64f5ee1db2e142a2
2015-01-22 12:17:17 +08:00
29972512c1
Merge branch 'wip-mdl-48831-m27' of https://github.com/rajeshtaneja/moodle into MOODLE_27_STABLE
2015-01-20 17:21:14 +00:00
68a5cc75a6
Merge branch 'MDL-48829_27' of git://github.com/timhunt/moodle into MOODLE_27_STABLE
2015-01-20 17:07:59 +00:00
85ea64f5ee
Merge branch 'wip-mdl-48624-m27' of https://github.com/rajeshtaneja/moodle into MOODLE_27_STABLE
2015-01-20 17:21:28 +01:00
589fb8e7b3
Merge branch 'MDL-44560-27' of git://github.com/xow/moodle into MOODLE_27_STABLE
2015-01-20 13:26:39 +08:00
125c11d3f0
Merge branch 'MDL-38277_m27' of https://github.com/sbourget/moodle into MOODLE_27_STABLE
2015-01-20 12:47:16 +08:00
fa9e5b5709
MDL-48596 mod_lesson: editing interface won't expand to full screen
2015-01-20 11:05:23 +08:00
1031133cce
MDL-48624 behat: Added extended timeout in workshop step
...
i_allocate_submissions_in_workshop_as step sometimes
fails because of server speed. Added extended timout
ensuring they wait enough before failing.
2015-01-19 10:19:30 +08:00
5aa4150f4a
MDL-43386 Lesson: Grade essay student response formatting not correct
...
Conflicts:
mod/lesson/locallib.php
2015-01-18 20:44:54 +01:00
807c71c0bd
MDL-44560 glossary: Fix pagination on glossary category view
...
Credit to Sebastian B for this fix
2015-01-16 11:12:00 +08:00
c665480063
MDL-48831 behat: Added behat test for label activity
...
Thanks to Neill Magill, for providing test feature.
2015-01-16 10:41:10 +08:00
ead9f6c78d
MDL-48831 behat: Fixed activity show hide for label
...
Labels are not links and have dimmed_text class
So updated find query for show/hide activity check
2015-01-16 10:41:10 +08:00
fc05d527e4
MDL-38277 Lesson: Fix strings on activity report
2015-01-15 12:53:37 -05:00
60802d3a1c
MDL-48829 quiz nav: add a data attr to buttons giving the page
...
This way, if you need to know which page each button goes to in
JavaScript, you can find out.
2015-01-15 10:18:06 +00:00
261cb39eca
Merge branch 'MDL-14730_27' of git://github.com/jmvedrine/moodle into MOODLE_27_STABLE
2015-01-14 10:28:17 +00:00
e048e9f1ab
Merge branch 'M27_MDL-48574_workflow_state_updated_batch_single' of https://github.com/Dave-B/moodle into MOODLE_27_STABLE
2015-01-14 00:14:57 +01:00
0dc79af9c6
Merge branch 'MDL-41166-27' of git://github.com/danpoltawski/moodle into MOODLE_27_STABLE
2015-01-13 23:42:33 +01:00
f88fc2bb85
Merge branch 'MDL-36824_m27' of https://github.com/sbourget/moodle into MOODLE_27_STABLE
2015-01-13 13:15:08 +00:00
8ef170b1cc
Merge branch 'MDL-39103-27' of git://github.com/xow/moodle into MOODLE_27_STABLE
...
Conflicts:
mod/lesson/lib.php
2015-01-13 12:54:32 +00:00
Dan Poltawski