moodle/moodle
3
0
Fork 0
mirror of https://github.com/moodle/moodle.git synced 2025-08-09 19:06:41 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions
73237 commits 37 branches 544 tags 1.3 GiB
Commit graph

73237 commits

This branch
This branch
All branches
Author SHA1 Message Date
M Kassaei
9f9d2caa33 MDL-40988 quiz: fix bug when editing default heading on blank quiz 2015-04-08 12:42:34 +01:00
Dan Poltawski
234e929e2b MDL-49684 calendar: fix timezone reseting. 2015-04-08 12:24:44 +01:00
Dan Poltawski
f5d9f19013 Merge branch 'MDL-49642' of git://github.com/jmvedrine/moodle 2015-04-08 08:57:15 +01:00
Jean-Michel Vedrine
31cb1b0eca MDL-49642 mod_lesson: fix backup of user overrides 2015-04-08 09:21:44 +02:00
Nathan Lewis
ad5c323065 MDL-49306 blocks: Copy instance data when copying block instances 2015-04-08 14:41:05 +08:00
Andrew Nicols
d8727a4d00 Merge branch 'MDL-49604-master' of git://github.com/damyon/moodle 2015-04-08 12:44:07 +08:00
Damyon Wiese
4b9e532633 MDL-49604 Javascript: Add a localstorage cache for strings and templates 2015-04-08 12:31:48 +08:00
Rajesh Taneja
6d1eb8906f MDL-37984 portfolio: fixed path to Drive.php 2015-04-08 12:11:02 +08:00
Andrew Nicols
647681d4e9 Merge branch 'MDL-49687-master' of git://github.com/andrewnicols/moodle 2015-04-08 09:34:37 +08:00
Andrew Nicols
31635bfb63 MDL-49687 enrol: Add behat tests for adding multiple groups 2015-04-08 09:34:16 +08:00
Andrew Nicols
b38b62f86c Merge branch 'wip-MDL-49694-master' of git://github.com/marinaglancy/moodle 2015-04-08 08:37:34 +08:00
Andrew Nicols
78a57b259a Merge branch 'MDL-15187-master' of git://github.com/andrewnicols/moodle 2015-04-08 08:33:11 +08:00
Stephen Parry
2a34360ed9 MDL-15187 tool_uploaduser: assign system roles from CSV 
Added feature to assign/unassign system roles stored in the CSV fields
sysrole1, sysrole2... Roles to be unassigned are prefixed with minus.
 2015-04-08 08:32:11 +08:00
Dave Cooper
fa48383bfa MDL-49519 libraries: Update references to new Google API library 2015-04-08 02:26:16 +02:00
Dave Cooper
aec4292cbd MDL-49519 libraries: Updated google-api-php-client to 1.1.2 2015-04-08 02:26:09 +02:00
Brian Barnes
8b3a10438f MDL-49782 general: removed uses of window.status 2015-04-08 11:49:06 +12:00
Eloy Lafuente (stronk7)
ca66bc3802 MDL-49499 wrong merge: bump version to avoid "old code" problems 
Because of a wrong merge, main $version (in version.php) was
reverted from 20150407 back to 20150402, leading to messages
about running older code than version in DB. By bumping main
$versionto 20150408 all problems should be left behind.
 2015-04-08 01:03:43 +02:00
Dan Poltawski
5483bd6239 Merge branch 'MDL-49730-master-workshop-width' of git://github.com/mudrd8mz/moodle 2015-04-07 20:26:15 +01:00
Dan Poltawski
89c3afc2c5 Merge branch 'MDL-49347-master' of git://github.com/jleyva/moodle 
Conflicts:
	lib/db/services.php
	version.php
 2015-04-07 20:25:28 +01:00
Juan Leyva
a955fcb608 MDL-49347 rating: Unit tests for core_rating_get_item_ratings 2015-04-07 21:13:25 +02:00
Juan Leyva
46e41e6339 MDL-49347 rating: Several fixes and code clean up 
- Use correct return values types
- Fix the warnings declaration
- Fix the pluginfile URL
 2015-04-07 21:13:24 +02:00
Ramindu Deshapriya
c1d58952d3 MDL-44611 core_course: Added Behat test to automate MDLQA 5252 2015-04-08 00:43:02 +05:30
Eloy Lafuente (stronk7)
a7d5af2d82 Merge branch 'MDL-48159' of https://github.com/andrewhancox/moodle 2015-04-07 19:13:56 +02:00
AMOS bot
8eedf786dc Automatically generated installer lang files 2015-04-08 00:04:12 +08:00
Dan Poltawski
464ba8e5a0 Merge branch 'MDL-49500-master' of git://github.com/jleyva/moodle 
Conflicts:
	lib/db/services.php
	version.php
 2015-04-07 16:44:41 +01:00
Eloy Lafuente (stronk7)
522eff0d30 Merge branch 'MDL-49499-master' of git://github.com/jleyva/moodle 2015-04-07 17:29:15 +02:00
Dan Poltawski
6384385796 Merge branch 'master_MDL-49638' of git://github.com/icefresh89/moodle 2015-04-07 16:24:20 +01:00
Dan Poltawski
e4d6ab3bde Merge branch 'MDL-49747-task-error-improvement' of https://github.com/brendanheywood/moodle 2015-04-07 16:13:46 +01:00
Dan Poltawski
bfceabab5d Merge branch 'MDL-41608-master' of git://github.com/jethac/moodle 2015-04-07 15:40:06 +01:00
Dan Poltawski
fee0ba1f4e MDL-40988 quiz: behat fix from Raj 2015-04-07 15:39:14 +01:00
Damyon Wiese
e362045e58 Merge branch 'MDL-49736_master' of git://github.com/markn86/moodle 2015-04-07 21:42:39 +08:00
Andrew Hancox
e528997a4a MDL-48159 mod_assign: Added setting preventsubmissionnotingroup 
If enabled a user will be unable to make a submission unless they are a
member of a group.
 2015-04-07 14:30:40 +01:00
Michael Elbert
d83318f19f MDL-49638 login: Wrong location of reCAPTCHA on signup page 2015-04-07 08:35:19 -04:00
Damyon Wiese
82d341cfd5 Merge branch 'MDL-49503-master' of git://github.com/jleyva/moodle 
Conflicts:
	lib/db/services.php
	version.php
 2015-04-07 20:28:23 +08:00
Eloy Lafuente (stronk7)
037546ae1f Merge branch 'MDL-48205_master' of https://github.com/totara/openbadges 2015-04-07 14:20:48 +02:00
Eloy Lafuente (stronk7)
615812040a Merge branch 'MDL-49065_m29v6' of https://github.com/sbourget/moodle 2015-04-07 14:15:33 +02:00
Dan Poltawski
e64f1fa1c7 Merge branch 'MDL-49740-locking-bugs' of https://github.com/brendanheywood/moodle 2015-04-07 13:08:41 +01:00
Dan Poltawski
cdc0f4de3f Merge branch 'MDL-49677' of https://github.com/sleperf/moodle 2015-04-07 11:28:35 +01:00
Dan Poltawski
8cf919bc1d MDL-49504 notes: fix trailing whitespace 2015-04-07 11:17:44 +01:00
Dan Poltawski
29596525a3 Merge branch 'MDL-49504-master' of git://github.com/jleyva/moodle 
Conflicts:
	lib/db/services.php
	version.php
 2015-04-07 11:17:04 +01:00
Damyon Wiese
75ece778c5 Merge branch 'MDL-49101' of https://github.com/andrewhancox/moodle 
Conflicts:
	lib/db/upgrade.php
	version.php
 2015-04-07 17:27:17 +08:00
Andrew Hancox
6398ff5387 MDL-49101 core: Add a global admin setting config->requiremodintro 
Removed requiremodintro setting from all core activity plugins and replace
with a single global setting.
Deprecated moodleform_mod::add_intro_editor and replaced with
moodleform_mod::standard_intro_elements
 2015-04-07 10:11:53 +01:00
Dan Poltawski
ffb4eaa93f Merge branch 'MDL-49501-master' of git://github.com/jleyva/moodle 
Conflicts:
	lib/db/services.php
	version.php
 2015-04-07 10:03:28 +01:00
David Monllao
b6c34ef9f5 Merge branch 'MDL-43558_master' of git://github.com/dmonllao/moodle 2015-04-07 16:25:07 +08:00
Alex Mitin
af4e80ae69 MDL-49753 enrolments: preselct status filter if needed 2015-04-07 16:19:01 +08:00
Andrew Nicols
78db0d13de MDL-49395 core: add more unit tests for get_enrolled_sql 2015-04-07 15:30:07 +08:00
Andrew Nicols
78a9c50a74 Merge branch 'suspended_userids_memory' of git://github.com/tlevi/moodle 2015-04-07 15:30:04 +08:00
Damyon Wiese
006fac90a1 Merge branch 'MDL-49498-master' of git://github.com/jleyva/moodle 
Conflicts:
	lib/db/services.php
	version.php
 2015-04-07 14:27:20 +08:00
Marina Glancy
01df798e7b MDL-49694 gradebook: display proper course name in overview 2015-04-07 13:20:55 +08:00
David Monllao
6661d5de14 Merge branch 'MDL-49642' of git://github.com/jmvedrine/moodle 2015-04-07 12:06:22 +08:00