mirror_php/moodle
1
0
Fork 0
mirror of https://github.com/moodle/moodle.git synced 2025-01-19 06:18:28 +01:00
Code Issues Projects Releases Wiki Activity
76,702 Commits 36 Branches 519 Tags
Commit Graph

76702 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Mark Nelson
da82688689 MDL-45740 mod_choice: fixed remaining issues 2016-02-01 18:49:22 +08:00
Stephen Bourget
e62f6a01e4 MDL-45740 choice: add new events 2016-01-29 13:23:15 +08:00
Andrew Nicols
eddec36d49 weekly release 3.1dev 2016-01-21 13:43:35 +08:00
Andrew Nicols
79fbb28c37 Merge branch 'install_master' of https://git.in.moodle.com/amosbot/moodle-install 2016-01-21 13:43:32 +08:00
Dan Poltawski
b42adaab44 Merge branch 'MDL-52702-m' of https://github.com/micaherne/moodle 2016-01-20 14:37:17 +00:00
Dan Poltawski
7fba3b0316 Merge branch 'MDL-52738-fixup' of https://github.com/timhunt/moodle 2016-01-20 11:42:29 +00:00
Tim Hunt
190fbfb60d MDL-52738 quiz: fix handling of showall by review prev link 2016-01-20 11:42:06 +00:00
Andrew Nicols
d60bf9f1dd Merge branch 'MDL-52383' of https://github.com/stronk7/moodle 2016-01-20 10:16:19 +08:00
Eloy Lafuente (stronk7)
668aca1804 MDL-52383 Calendar: user prefs are varchar, look for varchars 2016-01-20 03:07:57 +01:00
Andrew Nicols
7ee117fab8 Merge branch 'MDL-50083' of https://github.com/stronk7/moodle 2016-01-20 10:02:30 +08:00
Eloy Lafuente (stronk7)
5311e22963 MDL-50083 mod_assign: protect code against not set flags 
Yes could have used !empty() but for some reason found
the isset() && condition more clear. Tired brain, surely.
 2016-01-20 02:50:15 +01:00
Eloy Lafuente (stronk7)
0ddbf9b937 Merge branch 'master_MDL-50083' of https://github.com/greg-or/moodle-mod_assign 2016-01-20 01:31:52 +01:00
Eloy Lafuente (stronk7)
bb66ff5581 Merge branch 'master_MDL-42473' of git://github.com/danmarsden/moodle 2016-01-20 01:29:28 +01:00
Eloy Lafuente (stronk7)
4b2326faad Merge branch 'MDL-52383' 2016-01-20 01:26:22 +01:00
Eloy Lafuente (stronk7)
d3220ca34f MDL-52383 Calendar: fix versions 2016-01-20 01:25:16 +01:00
Greg Faller
3eb931d365 MDL-50083 mod_assign: unlock submission when adding attempt 2016-01-20 09:26:55 +10:30
Dan Poltawski
6f85e729e3 MDL-52568 version: bump 2016-01-19 17:01:21 +00:00
Dan Poltawski
c8c905577c Merge branch 'MDL-52568_master' of https://github.com/kevin-bruton/moodle 2016-01-19 16:48:11 +00:00
Rajesh Taneja
31ed36f193 MDL-52721 behat: Exclude links in moodle while finding tests 
Parallel run create links within moodle
so avoid searching for tests within links
 2016-01-19 14:35:18 +00:00
Dan Poltawski
b0be5f76ae Merge branch 'MDL-51123-master' of git://github.com/jleyva/moodle 2016-01-19 11:01:47 +00:00
Dan Poltawski
61c8abfb1e Merge branch 'MDL-51715_master_invalidweights' of https://github.com/colin-umn/moodle 2016-01-19 10:39:48 +00:00
Andrew Nicols
6c99c1e777 Merge branch 'MDL-48621_master' of git://github.com/dmonllao/moodle 2016-01-19 15:47:12 +08:00
David Monllao
356e235459 MDL-48621 admin: Warning about events 1 API deprecation 2016-01-19 15:19:13 +08:00
David Monllao
20ff2fba25 MDL-48621 events: Adapting unit tests to debugging messages 
- A new assertDebuggingCalledCount has been introduced, as multiple debugging messages
  may be called in some cases, for example when calling events_cron with queued events
  that need to be dispatched.
- events_update_definition has been moved out of setUp as debugging messages are only
  caught by our phpunit custom stuff when they are called inside tests.
 2016-01-19 15:19:10 +08:00
David Monllao
32f8bbd8dc MDL-48621 events: Adding debugging messages 
Debugging messages triggered once it is confirmed that the events 1 api handlers
are being used.
 2016-01-19 15:12:15 +08:00
Eloy Lafuente (stronk7)
cf003b48bc Merge branch 'MDL-46091' of git://github.com/timhunt/moodle 2016-01-19 07:32:09 +01:00
Andrew Nicols
77ee47bdb2 Merge branch 'MDL-48985_m31v1' of https://github.com/sbourget/moodle 2016-01-19 12:56:26 +08:00
Andrew Nicols
62d0d0b46d Merge branch 'MDL-52673-master' of https://github.com/pauln/moodle 2016-01-19 10:23:53 +08:00
Andrew Nicols
cd21909554 Merge branch 'MDL-52519' of https://github.com/rushi963/moodle 2016-01-19 10:18:41 +08:00
Andrew Nicols
f87d633bec Merge branch 'MDL-52773-master' of https://github.com/pauln/moodle 2016-01-19 09:13:30 +08:00
Andrew Nicols
f3d23df572 Merge branch 'MDL-52784' of git://github.com/timhunt/moodle 2016-01-19 08:54:55 +08:00
Andrew Nicols
9dd33a288e Merge branch 'MDL-52269_master' of https://github.com/dmonllao/moodle 2016-01-19 08:45:42 +08:00
Andrew Nicols
fe99a27859 Merge branch 'MDL-52270_master' of https://github.com/dmonllao/moodle 2016-01-19 08:35:23 +08:00
Andrew Nicols
441ffe514e Merge branch 'MDL-49291_master' of git://github.com/markn86/moodle 2016-01-19 08:04:59 +08:00
Andrew Nicols
223c4add23 Merge branch 'MDL-50268-master' of git://github.com/lameze/moodle 2016-01-19 07:56:41 +08:00
Eloy Lafuente (stronk7)
b9103d358d Merge branch 'MDL-52615_master' of https://github.com/nadavkav/moodle 2016-01-19 00:29:26 +01:00
Tim Hunt
1f0f413187 MDL-46091 quiz start attempt: rationalise confirmations. 
1. Don't show a warning if there are a limited number of attempts, only
   if there is a time limit.
2. Merge that time-limit warning into the same form that is used for
   entering a password, etc.
3. Make that form an JavaScript dialogue when you click the start attempt
   button.

AMOS BEGIN
  MOV ['confirmstarttimelimit', 'mod_quiz'], ['confirmstart', 'quizaccess_timelimit']
AMOS END
 2016-01-18 22:12:41 +00:00
AMOS bot
87c93de584 Automatically generated installer lang files 2016-01-19 00:04:29 +08:00
Dan Poltawski
0f97fc6c3f Merge branch 'MDL-52750' of git://github.com/timhunt/moodle 2016-01-18 15:50:11 +00:00
Dan Poltawski
5d5db1030f Merge branch 'MDL-52738' of git://github.com/timhunt/moodle 2016-01-18 14:47:45 +00:00
Dan Poltawski
e34710c7fe Merge branch 'wip-mdl-52721' of https://github.com/rajeshtaneja/moodle 2016-01-18 14:39:46 +00:00
Dan Poltawski
574b76ace1 Merge branch 'MDL-52218_master_alt' of git://github.com/markn86/moodle 2016-01-18 14:03:54 +00:00
Dan Poltawski
0ff8d34f2f Merge branch 'MDL-52486-master' of git://github.com/cameron1729/moodle 2016-01-18 11:19:55 +00:00
Dan Poltawski
26e45019c8 Merge branch 'MDL-36404-master' of git://github.com/junpataleta/moodle 2016-01-18 10:24:04 +00:00
Kevin Bruton
cfd8c0fe09 MDL-52568 core_cohort: added ability to return all cohorts in WS 2016-01-18 11:00:20 +01:00
Michael Aherne
5e43eea080 MDL-52702 plagiarism: Improvements to base plugin class 2016-01-18 09:39:54 +00:00
Andrew Nicols
45f167bd2b Merge branch 'MDL-45265-master' of git://github.com/danpoltawski/moodle 2016-01-18 14:54:54 +08:00
Andrew Nicols
ae4cc740be Merge branch 'MDL-52608-master' of https://github.com/xow/moodle 2016-01-18 14:47:52 +08:00
Andrew Nicols
2e6462f327 Merge branch 'MDL-52573-master' of git://github.com/danpoltawski/moodle 2016-01-18 14:32:41 +08:00
Mark Nelson
806905b59b MDL-49291 core: final deprecation of sql_*_reader interfaces 2016-01-18 14:24:34 +08:00