Sam Hemelryk
11b5e41b0c
NOBUG: fixed commit message typo
2014-11-20 16:47:33 +13:00
Sam Hemelryk
2949dedcda
MDL-43628 mod_assign: fixed formatting of statement
2014-11-20 10:18:28 +13:00
Dan Poltawski
72e3cb9ad2
MDL-29585 wiki: fix unit test fails
2014-11-19 11:37:35 +00:00
Frederic Massart
414f7ef8ff
MDL-29585 mod_wiki: Prevent broken links in editable sections
...
When a section name ended with a URL, the '<a' part of [edit] link
that is appended to the section was considered as part of the URL
in the section, thus causing the [edit] link to be broken.
2014-11-19 17:28:36 +08:00
Sam Hemelryk
756350b82d
Merge branch 'MDL-47587' of git://github.com/jmvedrine/moodle
2014-11-19 09:18:36 +13:00
Mary Evans
a263396486
MDL-47915 theme: use id='page-content' rather than 'content'.
...
Also added JS fallback for themes using copied layouts in scorm
2014-11-18 17:49:57 +00:00
Dan Poltawski
c8b01e0c7d
Merge branch 'MDL36874_Text_navigation_for_Books' of git://github.com/Dave-B/moodle
...
Conflicts:
mod/book/version.php
mod/book/db/upgrade.php
2014-11-18 13:54:05 +00:00
Dan Poltawski
de134194b9
Merge branch 'MDL-48146' of git://github.com/timhunt/moodle
2014-11-18 12:04:48 +00:00
Jean-Michel Vedrine
31f386732b
MDL-47587 Lesson: Display progress bar on the end of lesson page
2014-11-18 08:49:22 +01:00
Sam Hemelryk
7b604fd9f1
Merge branch 'MDL-29585-master' of git://github.com/FMCorz/moodle
2014-11-18 16:47:24 +13:00
Sam Hemelryk
817e9010c1
Merge branch 'MDL-47618' of git://github.com/timhunt/moodle
2014-11-18 11:12:28 +13:00
Sam Hemelryk
6067a4c87c
Merge branch 'MDL-47777_master' of https://github.com/Syxton/moodle
2014-11-18 10:57:29 +13:00
Dan Poltawski
0f87473fed
Merge branch 'MDL-30619_master' of https://github.com/markn86/moodle
2014-11-17 16:48:27 +00:00
Andrew Nicols
e7f0b4d3dd
MDL-48150 mod_forum: Generate message inbound keys for all posts
...
This code was previously misplaced so that only posts in discussion which
had not yet been processed in the current cron run would have keys
generated. If two posts were generated in the same discussion and sent out
on the same cron cycle, only the first post to be processed would have a
key generated.
2014-11-17 15:47:47 +08:00
Mark Nelson
4e4572963a
MDL-30619 mod_data: fixed deletion of files on reset
2014-11-16 21:42:59 -08:00
Frederic Massart
c159e2aa0a
MDL-29585 mod_wiki: Handle special characters in headings/sections
2014-11-17 10:38:36 +08:00
Sam Hemelryk
57fa596e0f
Merge branch 'MDL-43628' of https://github.com/scyrma/moodle
2014-11-17 11:44:57 +13:00
Eugene Venter
8309373cbf
MDL-48204 mod_wiki: admin.php - fix syntax error
2014-11-13 00:46:43 +01:00
Tim Hunt
06cf0b75ec
MDL-48146 quiz settings: fix non-percent feedback boundaries
2014-11-12 15:45:26 +00:00
David Monllao
800fa051b0
MDL-30968 mod_forum: No picture link to group when no groups mode
2014-11-12 11:53:14 +08:00
Sam Hemelryk
06a26e54e5
Merge branch 'MDL-30968-master-forum-group-link' of https://github.com/amandadoughty/moodle
2014-11-12 08:58:52 +13:00
Dan Poltawski
3194ca4b02
Merge branch 'MDL-47975-master' of git://github.com/damyon/moodle
2014-11-11 19:05:45 +00:00
Dan Poltawski
4bd5445447
Merge branch 'MDL-48168' of git://github.com/timhunt/moodle
2014-11-11 18:48:39 +00:00
Tim Hunt
bae1d7d9e8
MDL-47618 quiz statistics: fatal error with groups.
...
The problem was that the names of query placeholders were changing. The
fix was to do things ourself, rather than using get_in_or_equal.
2014-11-11 18:01:35 +00:00
Mathieu Petit-Clair
fb61433086
MDL-43628 assign: make submissionagreement usable on multilingual sites
2014-11-10 16:53:03 -05:00
Tim Hunt
080839c421
MDL-48168 quiz editing: max grade should be editable after attempts
...
Note that there was a lot of legacy code left from Moodle 2.7 which is
no longer required, and I took this opportunity to delete it.
2014-11-10 19:00:05 +00:00
Eloy Lafuente (stronk7)
147bae8f7c
MDL-48144 upgrade: add v2.8.0 sep lines
2014-11-10 18:08:15 +01:00
Eloy Lafuente (stronk7)
d79af819c6
Merge branch 'wip-mdl-48035' of https://github.com/rajeshtaneja/moodle
2014-11-07 09:37:32 +01:00
Damyon Wiese
3d4de122f2
Merge branch 'MDL-46986-master' of https://github.com/lameze/moodle
2014-11-07 16:08:20 +08:00
Simey Lameze
8c674e80ec
MDL-46986 mod_assign: Change the asserting to false
2014-11-07 15:54:14 +08:00
John Okely
a481e32f02
MDL-47949 mod_wiki: Validate parameters for page deletion
2014-11-07 15:29:40 +08:00
Rajesh Taneja
ea2b511d9a
MDL-48035 mod_forum: Reverted string change in step to keep correct functionality
2014-11-07 13:43:19 +08:00
Marina Glancy
2f1d0ea663
Merge branch 'MDL-46986-master' of git://github.com/lameze/moodle
2014-11-07 11:54:13 +08:00
Simey Lameze
274962a1e7
MDL-46986 mod_assign: Remove duplicate column identifier
2014-11-07 09:19:18 +08:00
Eloy Lafuente (stronk7)
ed34ab47e1
Merge branch 'MDL-48035-master-enfix' of git://github.com/mudrd8mz/moodle
2014-11-06 17:40:50 +01:00
David Mudrák
f7dd19f01d
MDL-48035 Fix more Behat tests regressions after merging en_fix strings
2014-11-06 16:19:11 +01:00
Andrew Nicols
a211c54388
MDL-48090 mod_forum: Optimise subquery out of discussion subs list
2014-11-06 13:39:44 +00:00
Eloy Lafuente (stronk7)
6fdd4633a7
Merge branch 'MDL-48035-master-enfix' of git://github.com/mudrd8mz/moodle
2014-11-06 11:14:52 +01:00
David Mudrák
6887e2e53e
MDL-48035 Fix Behat tests regressions after merging en_fix strings
2014-11-06 10:54:27 +01:00
Andrew Nicols
2b0a7419c6
MDL-47390 mod_forum: Provide ID and Discussion ID for discussion unsub
2014-11-06 16:50:36 +08:00
Damyon Wiese
ce1b8779df
Merge branch 'MDL-48061-master-fixes' of https://github.com/andrewnicols/moodle
2014-11-06 11:30:42 +08:00
Andrew Nicols
4ee412613b
MDL-48061 mod_forum: posttext should concat
2014-11-06 11:29:25 +08:00
Damyon Wiese
b0637c57ad
Merge branch 'MDL-48061-master-fixes' of https://github.com/andrewnicols/moodle
2014-11-06 11:22:42 +08:00
Andrew Nicols
a41cff4e23
MDL-48061 mod_forum: Correct variable name in HTML warning message
2014-11-06 11:05:44 +08:00
Andrew Nicols
ddb4a31d54
MDL-48029 mod_forum: Check for subscription before enrolling
2014-11-06 10:42:09 +08:00
Eloy Lafuente (stronk7)
ec070d2cf7
Merge branch '48026-28' of git://github.com/samhemelryk/moodle
2014-11-06 00:33:46 +01:00
Sam Hemelryk
12a312ac6a
Merge branch 'MDL-48044-master' of git://github.com/andrewnicols/moodle
2014-11-06 11:55:46 +13:00
Eloy Lafuente (stronk7)
97100bea54
Merge branch 'MDL-48054-master' of git://github.com/andrewnicols/moodle
2014-11-05 21:34:37 +01:00
Dan Poltawski
5a6c9f1cfb
Merge branch 'MDL-48021' of git://github.com/stronk7/moodle
...
Conflicts:
admin/tool/monitor/version.php
mod/lesson/version.php
2014-11-05 12:11:16 +00:00
Andrew Nicols
7a311adbba
MDL-48019 mod_forum: Add sesskey checks when setting tracking prefs
...
This also removes set_url() and changes require_course_login to
require_login as guests cannot set tracking.
2014-11-05 10:35:12 +00:00
