David Monllao
92f5468179
Merge branch 'm29_MDL-48482' of git://github.com/totara/moodle
2014-12-17 08:52:58 +08:00
Brian Barnes
60b57b6189
MDL-48482 core_admin: Added additional label for durations
2014-12-17 08:54:55 +13:00
Dan Poltawski
d23bf1f5b8
Merge branch 'MDL-42501-master' of git://github.com/lameze/moodle
2014-12-16 19:17:57 +00:00
Brian Barnes
7eac77a51e
MDL-48286 core_files: Improved accessibility of file management
2014-12-16 13:27:36 +08:00
Simey Lameze
bb6114d8b6
MDL-42501 course: add help icon on delete gradebook options
2014-12-15 16:18:34 +08:00
Eloy Lafuente (stronk7)
8b9bb799f9
Merge branch '21724-29' of git://github.com/samhemelryk/moodle
2014-12-04 12:14:29 +00:00
Dan Poltawski
13e0300961
Merge branch '26226-48304-29' of git://github.com/samhemelryk/moodle
2014-12-04 12:06:04 +00:00
Helen Foster
946f83b04b
MDL-36236 caching: improved help string
...
(and Dan keeping codechecker happy)
2014-12-04 12:04:12 +00:00
Dan Poltawski
4592f67789
Merge branch '36236-29' of git://github.com/samhemelryk/moodle
2014-12-04 12:04:11 +00:00
Dan Poltawski
3d891e3263
Merge branch 'MDL-47628-master' of https://github.com/sammarshallou/moodle
...
Conflicts:
availability/yui/build/moodle-core_availability-form/moodle-core_availability-form-min.js
2014-12-04 12:04:07 +00:00
Sam Hemelryk
6c4e70a6d8
Merge branch 'wip_MDL-47830_m29_pwrotation' of https://github.com/skodak/moodle
2014-12-04 12:03:15 +00:00
Dan Poltawski
f9fae51704
Merge branch 'wip-MDL-32547-master-v2' of git://github.com/abgreeve/moodle
...
Conflicts:
version.php
2014-12-04 11:37:48 +00:00
Dan Poltawski
8c0f7298b6
Merge branch '48335-29' of git://github.com/samhemelryk/moodle
2014-12-04 11:33:27 +00:00
Sam Hemelryk
24d0d813e9
MDL-21724 course: ability to return when editing/creating
2014-12-03 10:21:54 +13:00
Sam Hemelryk
91bae397b4
Merge branch 'MDL-18183-master' of git://github.com/FMCorz/moodle
2014-12-01 14:45:50 +13:00
Petr Skoda
1d658535b6
MDL-47830 auth: Add pw rotation restrictions
2014-12-01 08:53:52 +13:00
sam marshall
a4c318325c
MDL-47628 Availability: Restrict by selected grouping button
2014-11-28 15:55:41 +00:00
Adrian Greeve
c35d736a44
MDL-32547 backup: Add setting for backup folder tidy up.
2014-11-28 09:30:03 +08:00
David Monllao
99e434f2fa
MDL-31500 backup: Warn users about front page backups
...
They should know that they can only be restored on the front
page before selecting the destination course.
2014-11-25 10:30:25 +08:00
Jetha Chan
71688853e0
MDL-23912 core_comment: update count after deletion
2014-11-25 12:29:07 +13:00
Dan Poltawski
3111b66fbd
Merge branch 'wip_MDL-47834_m29_concurrentlogins' of https://github.com/skodak/moodle
2014-11-24 11:07:20 +00:00
Sam Hemelryk
bb554eb4ef
MDL-48335 phpdoc: cleaned up @package in lang files
2014-11-22 11:03:46 +13:00
David Monllao
03c39daad8
MDL-31500 backup: Allow front page backup/restore
...
Removes restore on front page restrictions and allows
front page modules duplication.
2014-11-21 14:55:09 +08:00
Frederic Massart
93539c44dc
MDL-18183 mnet: Option to verify peer and host of MNet peer using HTTPS
2014-11-21 11:33:16 +08:00
Sam Hemelryk
32bc89811c
MDL-36236 cache: clarified locking strings
...
We copy the cachedef_locking string as that cache definition is
used for locking and its name is more than likely the descriptive
word we are looking for.
AMOS BEGIN
CPY [cachedef_locking,cache],[locking,cache]
AMOS END
2014-11-21 11:33:07 +13:00
Petr Skoda
89e9321f96
MDL-47834 auth: Allow enforcing of login limits
2014-11-21 10:00:01 +13:00
Sam Hemelryk
53623a70f0
MDL-26226 course: new setting for sections as links
...
This commit adds a new setting to always display course sections
as links (if possible).
2014-11-20 15:41:24 +13:00
Gilles-Philippe Leblanc
af14ef657a
MDL-47501 gradebook: Add an indication that the grade letters was overridden
2014-11-18 17:13:40 +00:00
Helen Foster
ee7a1a546c
MDL-47800 admin: improved strings
2014-11-18 16:35:38 +00:00
Petr Skoda
866f03de46
MDL-47800 auth: Add option to logout on pw change
2014-11-18 09:51:52 +13:00
Helen Foster
ed10b1d94d
MDL-48214 Merge English strings from the en_fix language pack
2014-11-13 11:29:08 +01:00
Helen Foster
ba033b861e
MDL-48035 Merge English strings from the en_fix language pack
2014-11-04 21:55:26 +01:00
Tim Hunt
40459677a0
MDL-47797 question preview: show more technical info
...
It is helpful for developers creating question types (at least) to be
able to see this.
2014-10-31 15:52:54 +00:00
Marina Glancy
9e432c22cd
Merge branch 'MDL-47909-master' of git://github.com/andrewnicols/moodle
2014-10-30 16:15:10 +08:00
Andrew Nicols
02cf3958d2
MDL-47909 mod_forum: Respect user autosubscribe setting on post
...
Re-appropriate the forum autosubscribe setting as a discussion
autosubscribe setting.
The setting was no longer used after the per-discussion changes. The
original plan had been to remove this setting, but there is some benefit to
respecting it for discussion subscriptions instead.
2014-10-30 13:36:06 +08:00
Petr Skoda
5aaac8b2d6
MDL-40949 admin: Fix $CFG->preventexecpath hints
...
This setting restricts all local paths, not just
executables.
2014-10-29 10:45:44 +13:00
Jetha Chan
b865a3e2d1
MDL-47559 user_menu: customusermenu setting
2014-10-27 20:04:45 +08:00
Marina Glancy
079b2e5202
MDL-47542 core_grades: action menu for grade setup
2014-10-24 11:49:19 +02:00
Dan Poltawski
3456ac3ba0
Merge branch '47684-28' of git://github.com/samhemelryk/moodle
2014-10-24 11:48:16 +02:00
Damyon Wiese
47d6e6a7d3
MDL-47503 Grades: Completely remove aggregationsubcats
...
This setting is not compatible with combinations of aggregation methods
and the ways in which it does and does not work are not documented. It
was voted to remove it completely by the gradebook workshop, so I have
completely removed it and added a warning for all affected courses + restored
backups.
2014-10-20 12:03:18 +08:00
Sam Hemelryk
d28e0a2f76
MDL-47684 mod: better validation of rating options
2014-10-20 08:44:35 +13:00
Dan Poltawski
f6aaa184ab
Revert "MDL-47684 mod: better validation of rating options"
...
This reverts commit 8028df293a4f024a954dc12ed4e6cb5161c951b0.
2014-10-17 14:27:49 +01:00
Dan Poltawski
e2270952c5
Merge branch 'MDL-46599-master' of git://github.com/lameze/moodle
2014-10-16 17:30:27 +01:00
Dan Poltawski
d65eefdbf1
Merge branch 'MDL-18229-master' of git://github.com/zbdd/moodle
2014-10-16 13:44:48 +01:00
Adrian Greeve
b9cafe3b40
MDL-46599 gradebook: Added a time exported column to grade export via csv.
...
This will be useful for checking if a csv import is trying to overwrite
new grade updates.
2014-10-16 10:31:10 +08:00
Simey Lameze
a5240a82a6
MDL-46599 gradebook: Add force import option on CSV file and direct importing
2014-10-16 10:22:45 +08:00
Sam Hemelryk
8028df293a
MDL-47684 mod: better validation of rating options
2014-10-16 14:50:56 +13:00
Dan Poltawski
33ccfc1f13
Merge branch 'MDL-47560-master' of git://github.com/gurgus/moodle
2014-10-15 16:56:43 +01:00
Dave Cooper
c8eb1fae64
MDL-47560 Grades: Unset config when gradebook upgrade acknowledged.
2014-10-15 11:00:57 +08:00
Frederic Massart
09171b955e
MDL-38732 gradereport_grader: Handle simultaneous graders
2014-10-14 13:52:42 +08:00