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
73,014 Commits 36 Branches 519 Tags
Commit Graph

73014 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Dave Cooper
aec4292cbd MDL-49519 libraries: Updated google-api-php-client to 1.1.2 2015-04-08 02:26:09 +02: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
Eloy Lafuente (stronk7)
a7d5af2d82 Merge branch 'MDL-48159' of https://github.com/andrewhancox/moodle 2015-04-07 19:13:56 +02: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
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
David Monllao
6661d5de14 Merge branch 'MDL-49642' of git://github.com/jmvedrine/moodle 2015-04-07 12:06:22 +08:00
David Monllao
9b27c8840d Merge branch 'MDL-47773-master-commentui' of git://github.com/mudrd8mz/moodle 2015-04-07 11:34:23 +08:00
David Monllao
b81da1f27c MDL-43558 theme_base: We don't need edit toggle if modeditingmenu is disabled 2015-04-07 11:16:15 +08:00
David Monllao
f57457e35b Merge branch 'MDL-37984-master' of git://github.com/mastnym/moodle 2015-04-07 09:38:48 +08:00
Dan Poltawski
759c4f0c55 MDL-40988 quiz: correct install.xml inconsistency 
quizid should not have a default set
 2015-04-06 14:38:42 +01:00
Dan Poltawski
c17dc4347e Merge branch 'MDL-28592-master' of https://github.com/ninelanterns/moodle 2015-04-06 13:59:30 +01:00
Dan Poltawski
774906fc6d Merge branch 'mdl38210-master' of https://github.com/tlock/moodle 2015-04-06 12:35:01 +01:00
Dan Poltawski
097979568a Merge branch 'MDL-40988' of git://github.com/mkassaei/moodle 2015-04-06 12:07:34 +01:00
Dan Poltawski
3fa072a187 MDL-49684 time: fix unit tests broken by refactoring 2015-04-06 11:09:25 +01:00
Dan Poltawski
a671ebe866 Merge branch 'wip_MDL-49684_m29_tz2' of https://github.com/skodak/moodle 
Conflicts:
	version.php
 2015-04-06 10:13:06 +01:00
David Monllao
32b97a03f3 MDL-49380 enrol_cohort: Fixing matches 
Tiny fix as the group name was not properly
generated when incrementing the captured
generated number. Also adding unit test for
this case.
 2015-04-06 10:47:54 +08:00
David Monllao
b948d8c8a0 Merge branch 'wip-MDL-49380-master' of git://github.com/abgreeve/moodle 2015-04-06 10:16:38 +08:00
David Monllao
c3dbbe5c74 Merge branch 'MDL-49313-master' of git://github.com/jleyva/moodle 2015-04-06 09:54:55 +08:00
Petr Skoda
d6e7a63d9a MDL-49684 timezones: rewrite timezone support 
This patch replaces all homegrown timezone
stuff with standard PHP date/time code.

The main change is the introduction of core_date
class that returns normalised user and server
timezones. From now on nobody should be using
$CFG->timezone or $user->timezone directly!

Other new features and fixes:
* admins are prompted for timezone during install
* editing of other users is finally fixed
* timezones are displayed in user profile
* new $this->setTimezone() in phpunit
* time locale is now automatically reset in phpunit
* timezone is now automatically reset in phpunit
* phpunit has Australia/Perth as default timezone
 2015-04-06 13:53:51 +12:00
M Kassaei
5d949702f8 MDL-40988 quiz: ability to break quizzes into sections 
The sections are created on the edit quiz page, and then appear in the
navigation panel when the quiz is being attempted to help students find
their way around.

The 'Shuffle questions' setting has been moved from being per-quiz
to being a per-section.

This commit is actually the joint work of Mahmoud Kassaei and Tim Hunt
from The Open University. We could only use one persons name for the
commit and this time Mahmoud gets the credit/blame.
 2015-04-05 14:30:53 +01:00
Jean-Michel Vedrine
247980b0e8 MDL-49642 mod_lesson: Fix issues found during integration review 2015-04-05 15:05:31 +02:00
Petr Skoda
e19b37101f MDL-49684 timezones: add BC unit test first 2015-04-04 11:56:44 +13:00
Brendan Heywood
894f36abf9 MDL-49740 Lock: Fixed task lock release bugs 2015-04-03 11:13:03 +11:00
Brendan Heywood
e8a1c3e908 MDL-49747 Task: Improve coding error expection message 2015-04-03 11:11:51 +11:00
Juan Leyva
b5e6063803 MDL-49313 webservices: Unit tests for the external function 
core_completion_get_course_completion_status
 2015-04-02 21:58:14 +02:00