Marina Glancy
430529bde8
Merge branch 'MDL-18014-master' of git://github.com/damyon/moodle
2014-08-19 13:50:44 +08:00
Marina Glancy
dd924ea9db
Merge branch 'MDL-43197-master-2nd' of git://github.com/FMCorz/moodle
2014-08-19 13:25:32 +08:00
Damyon Wiese
9fb3fdd75f
Merge branch 'MDL-46188' of https://github.com/shashirepo/moodle
2014-08-19 13:13:08 +08:00
Damyon Wiese
9eea856632
MDL-18014 Atto autosave: Add a timemodified field to the auto save drafts
...
Do not restore any draft older than 4 days to (sort of) sync with the draft file
lifetime.
2014-08-19 12:30:13 +08:00
Damyon Wiese
942501f318
MDL-18014 Atto autosave: When text is recovered, force it into the undo stack
...
This allows you to use "Undo" to go back to the unaltered text in the form.
2014-08-19 12:13:41 +08:00
Michael Wheeler
750688c741
MDL-46794 install: Fixed typo in config-dist.php
2014-08-19 11:27:40 +08:00
Marina Glancy
628b2a5cd3
Merge branch 'MDL-46796-master' of git://github.com/merrill-oakland/moodle
2014-08-19 11:24:41 +08:00
Marina Glancy
b3194ab1b2
Merge branch 'master_MDL-46775' of git://github.com/totara/moodle
2014-08-19 11:21:22 +08:00
Marina Glancy
3377a87d69
Merge branch 'wip-mdl-46327' of git://github.com/rajeshtaneja/moodle
2014-08-19 10:48:11 +08:00
Marina Glancy
efc815848d
Merge branch 'wip-MDL-46791-master' of git://github.com/satrun77/moodle
2014-08-19 10:47:55 +08:00
Frederic Massart
abbee05eb3
MDL-43197 gradereport_user: Parents/mentors can see all the relevant grades
2014-08-19 10:47:34 +08:00
Rajesh Taneja
c1dc3f4793
MDL-46327 phpunit: Fixed oracle fail
2014-08-19 10:11:20 +08:00
Eloy Lafuente (stronk7)
14c38c2573
Merge branch 'wip-MDL-46691-master' of git://github.com/marinaglancy/moodle
2014-08-19 02:58:17 +02:00
James Henestofel
acf2508614
MDL-42231 auth: custom profile fields to support numbers at the end.
...
For data mapping LDAP or CAS. Change order of fieldname display checks to verify
custom profile fields first to allow custom field shortname to contain number at the end.
2014-08-19 02:41:41 +02:00
Eloy Lafuente (stronk7)
d2e5f21625
Merge branch 'MDL-44894' of git://github.com/timhunt/moodle
2014-08-19 02:34:12 +02:00
Eloy Lafuente (stronk7)
652d886ae5
Merge branch 'wip_MDL-46552_m28_memcached' of https://github.com/skodak/moodle
2014-08-19 02:28:56 +02:00
Eloy Lafuente (stronk7)
6ea7fde09c
Merge branch 'MDL-45874' of https://github.com/danielneis/moodle
2014-08-18 23:58:27 +02:00
Eloy Lafuente (stronk7)
a00678e54b
Merge branch 'wip-MDL-46826-master' of git://github.com/marinaglancy/moodle
2014-08-18 20:06:16 +02:00
Eloy Lafuente (stronk7)
6ba12477ec
Merge branch 'wip-MDL-46589-master' of git://github.com/marinaglancy/moodle
2014-08-18 19:47:50 +02:00
Eloy Lafuente (stronk7)
64140f93ec
Merge branch 'wip-MDL-46545-master' of git://github.com/marinaglancy/moodle
2014-08-18 19:40:13 +02:00
Eric Merrill
97531d3929
MDL-46766 auth_cas: Upgrading to phpCAS 1.3.3
2014-08-18 16:39:38 +08:00
Damyon Wiese
d9ff93e36e
Merge branch 'master_MDL-46669' of https://github.com/danmarsden/moodle
2014-08-18 16:21:54 +08:00
Ray Morris
f893cb44e0
MDL-46669 mod_scorm: Extraneous quotes added to scorm API values
2014-08-18 16:20:42 +08:00
Damyon Wiese
c84f1c6093
MDL-45887 mod_scorm: Note the coding style fixup issue in upgrade.txt
2014-08-18 15:11:59 +08:00
nobelium
15838edb63
MDL-45887 mod_scorm : Fixing variable names
2014-08-17 22:15:04 +12:00
nobelium
4cb25b3605
MDL-45887 mod_scorm : Fixing coding standard violations
2014-08-17 22:15:04 +12:00
Dan Marsden
98c59aaab2
MDL-46760 mod_scorm: Fix js error when preview mode disabled
2014-08-17 22:14:15 +12:00
Marina Glancy
041a1de0a1
MDL-41284 stats: fix sql query from MDL-41284
2014-08-16 18:55:29 +08:00
Marina Glancy
fb71171fc6
MDL-46589 scheduled task does not send emails
...
Thanks to Luděk Šulák for the patch
2014-08-16 11:29:34 +08:00
Daniel Neis
e0530c2f14
MDL-45874 Fix access to users reports in navigation when using separate groups
2014-08-15 17:04:50 -03:00
Marina Glancy
ba9390784d
MDL-46691 mod_choice: apply filters to user input
2014-08-15 15:53:10 +08:00
Marina Glancy
73de21ffda
MDL-46826 forum: add index on field forum_discussion.course
2014-08-15 13:06:23 +08:00
shashirepo
c285740896
MDL-46188 course:show/hide button disappears after action
2014-08-14 20:26:28 +05:30
Tim Hunt
f276267d93
MDL-44894 question editing: fix validation with odd permissions
...
For users with edit permissions, but not add permissions, it was
impossible to save the editing form. The validation assuemd this value
was present, but it was not. Other code checks this field too, so I
added it rather than changing the validation and all the other uses.
2014-08-14 11:25:18 +01:00
Marina Glancy
e1eb180806
weekly release 2.8dev
2014-08-14 14:52:07 +08:00
Marina Glancy
7d90b9b9f9
NOBUG: Fixed file access permissions
2014-08-14 14:52:07 +08:00
Marina Glancy
39db49c237
Merge branch 'install_master' of https://git.in.moodle.com/amosbot/moodle-install
2014-08-14 14:52:01 +08:00
Damyon Wiese
c07f86ce26
MDL-18014 Atto autosave: Use the $PAGE->url to differentiate autosave instances
2014-08-14 13:23:05 +08:00
Damyon Wiese
d8733567ee
MDL-18014 Atto autosave: Redo version bump after rebase
2014-08-14 12:44:01 +08:00
Damyon Wiese
56579fb68b
MDL-18014 Atto autosave: Change ajax script path to an attribute
2014-08-14 12:44:00 +08:00
Damyon Wiese
e7a8977ef4
MDL-18014 Atto: Fix for error handling bug on autosave
2014-08-14 12:43:47 +08:00
Damyon Wiese
f1018cd615
MDL-18014 Atto: Make notifications fade in/out.
2014-08-14 12:43:32 +08:00
Damyon Wiese
a10c6ea8fc
MDL-18014 Atto: Language change for auto save text.
...
Make this text shorter so it's less distracting.
2014-08-14 12:43:14 +08:00
Damyon Wiese
19549f8bed
MDL-18014 Atto: Assorted coding style changes from peer review
2014-08-14 12:43:14 +08:00
Damyon Wiese
6bfd450a6d
MDL-18014 Atto: Make the autosave frequency configurable
2014-08-14 12:43:04 +08:00
Damyon Wiese
a108fbeecf
MDL-18014 Atto: Add a notification when text is autosaved.
2014-08-14 12:42:55 +08:00
Damyon Wiese
8593521f4c
MDL-18014 Atto autosave: Fix coding style issues
2014-08-14 12:42:46 +08:00
Damyon Wiese
e3502577b8
MDL-18014 Atto: Reset auto save frequency to 60 seconds.
2014-08-14 12:42:45 +08:00
Damyon Wiese
c195bbffab
MDL-18014 Atto autosave: Correct detection of autosaving error when session expired
2014-08-14 12:42:37 +08:00
Damyon Wiese
8a5db5472e
MDL-18014 Atto autosave: Show warning when the server cannot be contacted for autosave.
2014-08-14 12:42:27 +08:00