mirror_php/moodle
1
0
Fork 0
mirror of https://github.com/moodle/moodle.git synced 2025-03-20 15:40:17 +01:00
Code Issues Projects Releases Wiki Activity
71,818 Commits 36 Branches 527 Tags
8c9390c5eb
Commit Graph

71818 Commits

Author SHA1 Message Date
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
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
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
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
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
Jean-Michel Vedrine
5ca2e765fa MDL-14730 mod_lesson: allow linking to pages inside a lesson 2015-01-09 11:33:35 +01:00
Dave Cooper
369a63ac1c MDL-47935 Atto: Moved atto notification message position 2015-01-09 15:53:19 +08:00
Frederic Massart
6b5d34b18d MDL-38142 mod_forum: Allow viewing of student posts in hidden courses 2015-01-09 11:34:24 +08:00
Dan Poltawski
edbcfbd61f weekly release 2.9dev 2015-01-08 10:00:19 +00:00
Dan Poltawski
0aee99439a Merge branch 'install_master' of https://git.in.moodle.com/amosbot/moodle-install 2015-01-08 10:00:17 +00:00
David Monllao
8666706bf3 MDL-47232 completion: Adding completion upgrade.txt 2015-01-08 15:41:02 +08:00
Ray Morris
2cc8d5624a MDL-47232 completion: Completed and failed activities count as completed 2015-01-08 15:30:54 +08:00
Frederic Massart
1920eebcaa MDL-44907 admin: Better styling of admin settings validation errors 2015-01-08 14:14:38 +08:00
Eloy Lafuente (stronk7)
2e02eab234 Merge branch 'MDL-43242-master' of git://github.com/andrewnicols/moodle 
Conflicts:
	lib/upgrade.txt
 2015-01-08 01:30:53 +01:00
Andrew Nicols
7d0d3b369d MDL-43242 ajax: Final deprecation of core JS functions 2015-01-08 08:28:37 +08:00
Eloy Lafuente (stronk7)
d5fddbd333 Merge branch 'MDL-37584-master' of git://github.com/ankitagarwal/moodle 2015-01-08 00:45:09 +01:00
Eloy Lafuente (stronk7)
6775497181 Merge branch '37680-29' of git://github.com/samhemelryk/moodle 2015-01-08 00:40:00 +01:00
Zachary Durber
5329d84f0b MDL-48546 filters: Split on all tags for multimedia filter check. 2015-01-07 17:34:28 +01:00
Eloy Lafuente (stronk7)
ae3663a082 Merge branch 'MDL-48748-master-enfix' of git://github.com/mudrd8mz/moodle 2015-01-07 17:15:52 +01:00
AMOS bot
341deab37b Automatically generated installer lang files 2015-01-08 00:03:57 +08:00
David Monllao
668eb57895 Merge branch 'MDL-48688-master' of git://github.com/ankitagarwal/moodle 2015-01-07 13:43:54 +08:00
Ankit Agarwal
2ed7ca68d8 MDL-48688: inbound: remove spaces from exception 2015-01-07 11:12:21 +05:30
David Monllao
f9f1cbbd7f Merge branch 'MDL-46498_master-fix' of git://github.com/markn86/moodle 2015-01-07 13:29:05 +08:00
Mark Nelson
3f94c97a99 MDL-46498 mod_assign: fixed failing behat test due to GS 2015-01-06 20:48:35 -08:00
Zachary Durber
75cb0ffffe MDL-48546 filters: ReDoS protection for multimedia links. 2015-01-07 12:27:51 +08:00
Andrew Nicols
ac667aa0b7 Merge branch 'MDL-45930-master' of git://github.com/danpoltawski/moodle 2015-01-07 12:05:01 +08:00
Andrew Nicols
ac38af7f3f Merge branch 'wip_MDL-48665_m29_pwrot' of https://github.com/skodak/moodle 2015-01-07 11:07:22 +08:00
Andrew Nicols
0d3e8ed4f6 Merge branch 'MDL-48080_master' of https://github.com/crazyserver/moodle 2015-01-07 10:52:04 +08:00
Andrew Nicols
9a99c21caf Merge branch 'master_MDL-48428' of https://github.com/greg-or/moodle-mod_assign 2015-01-07 10:23:57 +08:00
David Monllao
b301753ba9 Merge branch 'MDL-48549_master' of git://github.com/markn86/moodle 2015-01-07 09:37:35 +08:00
David Monllao
3d10161c03 Merge branch 'wip-MDL-48523-master' of git://github.com/abgreeve/moodle 2015-01-07 09:22:48 +08:00
Eloy Lafuente (stronk7)
a158a85668 Merge branch 'MDL-32088-master' of git://github.com/danpoltawski/moodle 2015-01-07 02:11:41 +01:00
David Monllao
fcec67db13 Merge branch 'MDL-48697-master' of git://github.com/ankitagarwal/moodle 2015-01-07 09:05:51 +08:00
David Monllao
ccc1782b69 Merge branch 'MDL-48688-master' of git://github.com/ankitagarwal/moodle 2015-01-07 08:47:37 +08:00
Helen Foster
b7853012b8 MDL-48748 lang: Merge English strings from the en_fix language pack 2015-01-06 21:53:17 +01:00