Marina Glancy
1a0bc77645
Merge branch 'MDL-44670-26' of git://github.com/FMCorz/moodle into MOODLE_26_STABLE
2014-04-01 11:05:45 +08:00
Marina Glancy
37de060263
Merge branch 'MDL-44590-26' of git://github.com/danpoltawski/moodle into MOODLE_26_STABLE
2014-04-01 11:05:09 +08:00
Marina Glancy
b3aed4e5aa
Merge branch 'MDL-44837-m26' of git://github.com/sammarshallou/moodle into MOODLE_26_STABLE
2014-04-01 10:40:07 +08:00
Marina Glancy
ea3d172274
Merge branch 'wip_MDL-44854_M26' of git://github.com/gjb2048/moodle into MOODLE_26_STABLE
2014-04-01 10:37:56 +08:00
Marina Glancy
cc247afe18
Merge branch 'wip-MDL-44850_M26' of git://github.com/gjb2048/moodle into MOODLE_26_STABLE
2014-04-01 10:36:39 +08:00
sam marshall
d0434cb119
MDL-44837 Behat: 'dialogue' selector only works for confirm dialogues
...
The dialogue selector in Behat (used only in one place) didn't work for
other types of standard Moodle notification dialogue.
2014-03-31 13:50:47 +01:00
Gareth J Barnard
16b4059ca3
MDL-44854 theme: 'svg' font type not served.
2014-03-31 11:07:47 +01:00
Gareth J Barnard
5b74abc38d
MDL-44850 theme: 'eot' font type not served.
2014-03-31 11:05:08 +01:00
Damyon Wiese
6d458076d5
MDL-44583 Assign: performance fixes
2014-03-31 12:53:41 +08:00
Marina Glancy
26a44fc7bb
Merge branch 'MDL-44822_26' of git://github.com/aolley/moodle into MOODLE_26_STABLE
2014-03-31 12:47:14 +08:00
Eloy Lafuente (stronk7)
106f3e9ce9
MDL-44862 postgres: tests to support socket & port
...
Both the database auth and enrol plugins use ADOdb
to perform connections. Socket and port are allowed
there if passed as "socket:port", so, when both are
configured in CFG, we pass them that way. Else
ADOdb defaults to standard port (5432).
2014-03-31 09:29:53 +08:00
Jean-Michel Vedrine
081468fdb1
MDL-41063 Lesson qformat_default class is missing an error function
2014-03-30 09:22:25 +02:00
Petr Škoda
d94e9570c7
MDL-44862 always add dbport to dbsocket in pg driver
...
This should hopefully resolve problems when using sockets connection
to pg servers running on non-standard ports.
2014-03-30 10:13:08 +08:00
Mark Nelson
d27dadca87
MDL-44746 core_events: minor changes to the user_deleted event
2014-03-28 17:08:55 -07:00
Mark Nelson
12d0bf448f
MDL-44746 core_events: removed incorrect use of snapshot
2014-03-28 16:55:24 -07:00
Tim Hunt
bb42f6d46f
MDL-31262 fix quiz review capability check.
...
This change is logically the same as changing
$this->has_capability('mod/quiz:viewreports')
to
$this->has_capability('mod/quiz:viewreports') || $this->has_capability('mod/quiz:preview')
in the original code. However, I rewrote the logic so that we test the
most common and performance-critical case first - that of a student
lookign at their own attempt.
2014-03-28 18:40:07 +00:00
Marina Glancy
e0529dfbad
MDL-41102 report_performance: correctly check state of automated backups
...
Thanks to Renaat Debleu for the patch
2014-03-28 16:41:24 +08:00
Marina Glancy
1e6e35e277
MDL-33486 wiki: allow searching individual wikis
2014-03-28 14:16:55 +08:00
Petr Škoda
fb3ed1a19a
MDL-44843 try to hack around strict locale names in OSX
2014-03-28 11:49:15 +08:00
Marina Glancy
2877a60763
MDL-35305 wiki: backup and restore files
...
Thanks to Tatsuya Shirai for the patch
2014-03-28 10:29:20 +08:00
Marina Glancy
18b388efe7
weekly release 2.6.2+
2014-03-27 16:52:20 +08:00
Marina Glancy
6f29595eba
Merge branch 'install_26_STABLE' of git://git.moodle.org/moodle-install into MOODLE_26_STABLE
2014-03-27 16:52:19 +08:00
Marina Glancy
d654a1e6d2
MDL-43398 wiki: remove extra Choose... option from select
2014-03-27 14:57:26 +08:00
Jerome Mouneyrac
ec7de91744
MDL-43398 Wiki: Choose... options cause SQL errors or seen inappropriate.
2014-03-27 14:57:08 +08:00
Adam Olley
e4f7b38325
MDL-44701 gradereport_grader: Display warning on navigation if unsaved grades are present
2014-03-27 14:59:07 +10:30
Petr Škoda
e21117fdc0
MDL-44824 add missing subplugin type names
2014-03-27 11:47:51 +08:00
Petr Škoda
60b1e67bae
MDL-44824 add missing subplugin type names
2014-03-27 11:47:42 +08:00
Jason Fowler
8340935745
MDL-43284 Theme: Clean theme errors with padding in Question Bank fixed
2014-03-27 10:39:53 +08:00
AMOS bot
428f3d8988
Automatically generated installer lang files
2014-03-27 00:48:27 +00:00
Adam Olley
bb57cb8e34
MDL-44822 assignfeedback_editpdf: Stop test generation in is_enabled()
...
This change also moves one of the checks in test_gs_path. If
generateimage is false, there's no need to stat for the fixture file.
2014-03-27 10:16:38 +10:30
Tim Lock
3e12cb397a
MDL-44575: Prevent cron from sending feedback notifications when assignments are hidden in the gradebook
2014-03-26 09:47:48 +10:30
Dan Poltawski
683c7ee245
Merge branch 'wip-MDL-44686-m26' of git://github.com/marinaglancy/moodle into MOODLE_26_STABLE
2014-03-26 05:17:55 +08:00
Eloy Lafuente (stronk7)
1179ba8aaa
Merge branch 'wip-MDL-41285-m26' of git://github.com/marinaglancy/moodle into MOODLE_26_STABLE
2014-03-25 21:53:53 +01:00
Marina Glancy
15ca2aede6
Merge branch 'mdl44573-moodle26' of git://github.com/tlock/moodle into MOODLE_26_STABLE
2014-03-25 16:21:20 +08:00
Marina Glancy
0f10b86557
Merge branch 'MDL-44665_26' of git://github.com/timhunt/moodle into MOODLE_26_STABLE
2014-03-25 14:29:23 +08:00
Frederic Massart
b3a0c630c8
MDL-44670 theme_clean: Updating screenshot
2014-03-25 12:36:56 +08:00
Sam Hemelryk
50fea8055f
Merge branch 'MDL-43960-26' of git://github.com/damyon/moodle into MOODLE_26_STABLE
2014-03-25 12:30:47 +13:00
Jonathan Champ
338fd396b7
MDL-29572 Grade Import: Avoid creating invalid temporary rows; Provide feedback on error
2014-03-22 21:42:25 -04:00
Tim Hunt
91148a2bb5
MDL-44665 declare all quiz page types in the blocks UI.
2014-03-21 14:43:42 +00:00
Marina Glancy
c0a9f0139a
MDL-44686 behat: limit failure filename length to 255 chars
2014-03-21 15:50:31 +08:00
Marina Glancy
ceeac6bcc6
MDL-41285 block_recent_activity: behat test for structural changes
2014-03-21 15:47:20 +08:00
Damyon Wiese
941f4597b0
MDL-43985 Assign: Allow teachers to skip notifying students about grade update.
...
backport of MDL-33600
2014-03-21 14:45:12 +08:00
Marina Glancy
b8604eb33b
weekly release 2.6.2+
2014-03-20 16:00:14 +08:00
Jetha Chan
8c2ec9a11a
MDL-44582 installer: added check for php json extension
2014-03-19 16:17:54 +13:00
Marina Glancy
4a7ab01717
MDL-42025 behat: changed behat tag _only_local to _file_upload
2014-03-19 10:40:41 +08:00
Marina Glancy
140caa5b67
Merge branch 'MDL-43341_26' of git://github.com/nobelium/moodle into MOODLE_26_STABLE
2014-03-19 10:35:44 +08:00
Marina Glancy
d632f1b82a
MDL-44141 restore: added phpdocs 'since' for new method
2014-03-19 10:09:06 +08:00
Marina Glancy
c21f8f13e5
Merge branch 'MDL-44141-m26' of git://github.com/sammarshallou/moodle into MOODLE_26_STABLE
2014-03-19 09:50:11 +08:00
Nobelium
4c6bf7a9ff
MDL-43341 SCORM Report: spacer.gif must be managed with ->spacer
2014-03-18 19:41:41 +00:00
sam marshall
0f2929fab1
MDL-44141 Completion: System updates data during restore
...
The completion system has code which is supposed to prevent it
updating completion status while grades are being restored. This
code was a nasty hack and had not worked for some time. As a result
completion dates were restored incorrectly.
This commit implements a 'proper' way to find out if a restore is
currently running, replacing the previous hack.
2014-03-18 13:25:37 +00:00