Tim Hunt
6403c8d39b
MDL-48477 questions: no delete icon for only top-level category
...
The back end code already threw an exception if you clicked the icon,
so you could not delete the category, but we should not have shown the
icon in the first place.
Thanks to Pramith Dayananda for working out the fix for this issue. I am
just committing it.
2015-01-15 10:20:47 +00:00
Michael Aherne
c3acc77965
MDL-48830 accesslib: Add sort field to query
2015-01-15 10:12:23 +00:00
Andrew Nicols
da0ef2e4cf
weekly release 2.9dev
2015-01-15 08:46:37 +00:00
Andrew Nicols
03ab756eb1
Merge branch 'install_master' of https://git.in.moodle.com/amosbot/moodle-install
2015-01-15 08:35:03 +00:00
Eloy Lafuente (stronk7)
cb2456c379
Merge branch 'MDL-41674' of git://github.com/mr-russ/moodle
2015-01-15 08:35:03 +00:00
Andrew Nicols
2a43613b73
Merge branch 'master_MDL-48418' of https://github.com/greg-or/moodle-mod_assign
2015-01-15 08:35:02 +00:00
Eloy Lafuente (stronk7)
778f0becee
Merge branch 'MDL-47761-master' of git://github.com/xow/moodle
2015-01-15 08:35:02 +00:00
Eloy Lafuente (stronk7)
ccb722b76c
Merge branch 'MDL-48574_workflow_state_updated_batch_single' of https://github.com/Dave-B/moodle
2015-01-15 08:35:01 +00:00
Eloy Lafuente (stronk7)
639910a75d
Merge branch 'MDL-41166-master' of git://github.com/danpoltawski/moodle
2015-01-15 08:35:01 +00:00
Eloy Lafuente (stronk7)
6f1c51b61a
Merge branch 'MDL-48753_master' of git://github.com/markn86/moodle
2015-01-15 08:35:00 +00:00
Dan Poltawski
63cc7cfc61
Merge branch 'MDL-48675' of git://github.com/jmvedrine/moodle
...
Conflicts:
mod/lesson/upgrade.txt
2015-01-15 08:34:58 +00:00
Dan Poltawski
02362f4414
Merge branch 'MDL-36824_m29' of https://github.com/sbourget/moodle
2015-01-15 08:33:29 +00:00
Dan Poltawski
594276893e
Merge branch 'MDL-39103-master' of git://github.com/xow/moodle
...
Conflicts:
mod/lesson/lib.php
2015-01-15 08:33:27 +00:00
Dan Poltawski
584e582bfc
Merge branch 'MDL-45784-master' of git://github.com/xow/moodle
2015-01-15 08:32:45 +00:00
Dan Poltawski
db387f25de
Merge branch 'MDL-47931' of git://github.com/jmvedrine/moodle
2015-01-15 08:32:44 +00:00
Dan Poltawski
1c0a4e23a2
Merge branch 'MDL-48474' of git://github.com/timhunt/moodle
2015-01-15 08:32:44 +00:00
Dan Poltawski
d55a433d6c
Merge branch 'MDL-48750_m29' of https://github.com/sbourget/moodle
2015-01-15 08:32:43 +00:00
Dan Poltawski
c81689fa75
Merge branch 'MDL-48729_legacy_log_error' of https://github.com/andyjdavis/moodle
2015-01-15 08:32:43 +00:00
Dan Poltawski
8c9390c5eb
Merge branch 'MDL-40326' of git://github.com/jmvedrine/moodle
2015-01-15 08:32:42 +00:00
Dan Poltawski
261b858985
Merge branch 'MDL-14730' of git://github.com/jmvedrine/moodle
2015-01-15 08:32:42 +00:00
Dan Poltawski
98c6b90358
Merge branch 'MDL-45848-master' of git://github.com/gurgus/moodle
2015-01-15 08:32:41 +00:00
Dan Poltawski
7bec688eaa
Merge branch 'MDL-48510-master' of git://github.com/ankitagarwal/moodle
2015-01-15 08:32:41 +00:00
Ankit Agarwal
c93e6c5c17
MDL-48510 inbound: use 0 expiration for private files handler
2015-01-15 08:32:40 +00:00
Ankit Agarwal
017de890cb
MDL-48510 inbound: Support disabling of expiration changes in UI
2015-01-15 08:32:40 +00:00
Ankit Agarwal
0a4ce3ffb4
MDL-48510 inbound: Use correct value of expiration
2015-01-15 08:32:39 +00:00
Andrew Nicols
2ae73817f4
Merge branch 'MDL-47232_master' of https://github.com/dmonllao/moodle
2015-01-15 08:32:38 +00:00
Andrew Nicols
26a1fbbd15
Merge branch 'MDL-43898-master' of git://github.com/danpoltawski/moodle
2015-01-15 08:32:38 +00:00
Eloy Lafuente (stronk7)
5d98ba68f5
MDL-35155 database: better sql_substr() impl. for mssql/sqlsrv + unit tests
...
MSSQL's substring() implementation is somehow silly/strict and unable to
perform implicit casts to integer both for the start and length parameters.
This hits Moodle badly because of another problems (MDL-23997) we decided
to cast to string all bound placeholders long ago.
So this commit just enforces the cast of the start and length parameters to
integer. And includes unit tests for using placeholders on all positions in
the sql_substr() method.
2015-01-15 08:32:38 +00:00
Eloy Lafuente (stronk7)
933c8f6a25
Merge branch 'MDL-35155-master' of git://github.com/danpoltawski/moodle
2015-01-15 08:32:37 +00:00
Dan Poltawski
6aa08f9442
Merge branch 'MDL-31774' of git://github.com/jmvedrine/moodle
2015-01-15 08:32:35 +00:00
Dan Poltawski
3eda28e937
Merge branch 'MDL-47935-master' of git://github.com/gurgus/moodle
2015-01-15 08:32:34 +00:00
Marina Glancy
93df807601
MDL-48847 groups: fixed incorrect user count
2015-01-15 11:12:45 +08:00
Dan Poltawski
947ab40bf2
MDL-46976 user: trim whitespace from input email address
...
Don't complain about invalid email address, we are a computer, we
love the jobs users hate.
ref: https://www.youtube.com/watch?v=5tquSbZEP-g
2015-01-14 17:13:15 +00:00
AMOS bot
8dbde91398
Automatically generated installer lang files
2015-01-15 00:04:00 +08:00
Patrik Granlöv
06844353e5
MDL-35486 outputlib: Fix typos in comments
...
Just a copy-past text error in two comments.
2015-01-14 10:53:25 +00:00
Dave Cooper
93023ceef4
MDL-45848 grading: Added ability to unset grades with advanced grading
...
Thanks to Mohamed Alsharaf for assistance on this patch
2015-01-13 09:19:11 +08:00
AMOS bot
9fd5e3ee70
Automatically generated installer lang files
2015-01-13 00:03:57 +08:00
Stephen Bourget
002da93948
MDL-48813 Lesson: Removed unused GROUPMEMBERSONLY
2015-01-12 10:49:41 -05:00
Dan Poltawski
b79dca85b7
Merge branch 'MDL-44907-master' of git://github.com/FMCorz/moodle
2015-01-12 11:28:12 +00:00
Andrew Nicols
4c1a27c209
Merge branch 'MDL-46671-29' of https://github.com/pjking07/moodle
2015-01-12 13:56:19 +08:00
Sam Hemelryk
d237385e8a
MDL-48753 badges: converted func to named params
...
Converted the SQL params within badges_get_user_badges to
named params.
Unit tests added for this function at the same time.
UI covered by behat already.
2015-01-11 20:08:39 -08:00
Andrew Nicols
99334f6a56
Merge branch 'MDL-38142-master' of git://github.com/FMCorz/moodle
2015-01-12 11:55:34 +08:00
Andrew Nicols
db5a9ca117
Merge branch 'MDL-47692_master' of git://github.com/markn86/moodle
2015-01-12 10:05:39 +08:00
Gregory Faller
b351e4460a
MDL-48418 mod/assign: Fix text in 'late submission' row
2015-01-12 09:00:44 +10:30
Russell Smith
92996836d0
MDL-41674 backup: Use a trie for grouped path detection.
2015-01-11 12:54:32 +11:00
Stephen Bourget
8eef88589a
MDL-48750 Lesson: Behat test for lesson attempt info
...
behat test provided by Jean-Michel Vedrine
2015-01-10 17:13:17 -05:00
Jean-Michel Vedrine
91d9008108
MDL-40326 mod_lesson: progress bar is not reset by course reset
2015-01-10 18:54:54 +01:00
Jean-Michel Vedrine
a30e935aa7
MDL-31774 mod_lesson: Wrong jumps in lessons with mutiple clusters
2015-01-10 18:30:06 +01:00
AMOS bot
fec1470761
Automatically generated installer lang files
2015-01-11 00:04:03 +08:00
Stephen Bourget
ca3327133b
MDL-36824 Lesson: Media File should be displayed as a block
2015-01-09 18:15:27 -05:00