Commit graph

73249 commits

Author SHA1 Message Date
Dan Poltawski
890262ace9 Merge branch 'install_master' of https://git.in.moodle.com/amosbot/moodle-install 2015-04-09 10:26:54 +01:00
Frederic Massart
753a29a825 MDL-49575 gradereport_singleview: Regrade item when (un)overriding 2015-04-09 16:25:39 +08:00
Jean-Michel Vedrine
716dfb630d MDL-49642 mod_lesson: fix restore of overrides 2015-04-09 15:26:40 +08:00
Damyon Wiese
9ee83b0d30 MDL-49650 Templates: Move templates out of invalid sub directory.
Also add comments so they render in the template library.
2015-04-09 13:17:59 +08:00
Damyon Wiese
274d79c9d5 MDL-49650 tool_templatelibrary: New tool for browsing mustache templates 2015-04-09 11:57:56 +08:00
Rajesh Taneja
bed022decb MDL-48159 mod_assign: Use proper step to navigate to homepage 2015-04-09 11:13:33 +08:00
Rajesh Taneja
3072d006be MDL-48159 mod_assign: Fixed behat to pass on chrome
Chrome driver doesn't support clicking on
link which wrap on multiple lines. In this
case link is wrapped in navigation block
and was failing on chrome.
2015-04-09 11:07:34 +08:00
Dan Poltawski
c11960e4f0 Merge branch 'MDL-49519_eloy_addenda' of https://github.com/stronk7/moodle 2015-04-08 20:22:53 +01:00
Eloy Lafuente (stronk7)
c790542885 MDL-49519 Google API: use autoload everywhere
Update core (repository & portfolio) to use autoload facilities,
getting rid of not-needed-anymore requires.

Clarify a bit the readme_moodle information and expected use.
2015-04-08 20:29:03 +02:00
Eloy Lafuente (stronk7)
2b90ce658b MDL-49519 Google API: remove old stuff 2015-04-08 20:24:54 +02:00
Colin Campbell
334bee5f60 MDL-48723 mod/forum: Fix cron task error on digest attachments. 2015-04-08 13:22:02 -05:00
Eloy Lafuente (stronk7)
17017ced9c Merge branch 'MDL-49684-fix' of https://github.com/danpoltawski/moodle 2015-04-08 17:05:51 +02:00
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