mirror_php/moodle
1
0
Fork 0
mirror of https://github.com/moodle/moodle.git synced 2025-03-20 23:51:15 +01:00
Code Issues Projects Releases Wiki Activity
59,230 Commits 36 Branches 527 Tags
345768b9b8
Commit Graph

15169 Commits

Author SHA1 Message Date
Eloy Lafuente (stronk7)
345768b9b8 Merge branch 'MDL-35750' of git://github.com/danpoltawski/moodle 
Conflicts:
	lib/db/upgrade.php
	version.php
 2013-02-19 12:57:10 +01:00
Dan Poltawski
d0231ac9a9 Merge branch 'MDL-37217-master' of git://github.com/FMCorz/moodle 
Conflicts:
    version.php
    repository/googledocs/version.php
 2013-02-19 13:54:52 +08:00
Damyon Wiese
1ec8da6706 Merge branch 'wip-MDL-38000-m25' of git://github.com/samhemelryk/moodle 2013-02-19 13:48:12 +08:00
Frederic Massart
3425813fc4 MDL-37217 repository: Google Docs repository uses Google SDK 2013-02-19 13:36:23 +08:00
Frederic Massart
0acb074618 MDL-37217 repository: Adding Google API PHP SDK 2013-02-19 13:36:23 +08:00
Fred
91c8cf9963 MDL-37217 files: Stricter type check for curl options 2013-02-19 13:36:23 +08:00
Damyon Wiese
b27fc5b64f Merge branch 'wip-MDL-33774-master' of git://github.com/marinaglancy/moodle 2013-02-19 12:36:40 +08:00
Dan Poltawski
93a2d4e1a6 Merge branch 'MDL-37858_master' of git://github.com/dmonllao/moodle 2013-02-19 10:33:50 +08:00
Damyon Wiese
ebb1385c39 Merge branch 'MDL-29938-master' of git://github.com/mouneyrac/moodle 2013-02-19 10:10:48 +08:00
Dan Poltawski
858b3a2487 Merge branch 'MDL-37997-muc-stats-display' of git://github.com/mudrd8mz/moodle 2013-02-18 16:17:06 +08:00
Dan Poltawski
9c70147d54 Merge branch 'MDL-31983-master' of git://github.com/FMCorz/moodle 2013-02-18 15:54:22 +08:00
Dan Poltawski
3672b3b9b0 Merge branch 'MDL-36380-master' of git://github.com/FMCorz/moodle 2013-02-18 14:18:25 +08:00
Damyon Wiese
82a6332837 Merge branch 'MDL-37939-m' of https://github.com/andrewnicols/moodle 
Conflicts:
	lib/db/upgrade.php
	version.php
 2013-02-18 13:35:36 +08:00
Dan Poltawski
219faacc33 MDL-35622 - fix crazy character causing upgrade problems 
Can you see it?!
 2013-02-18 11:55:29 +08:00
Dan Poltawski
28d72ad973 Merge branch 'MDL-35622-master' of git://github.com/FMCorz/moodle 
Conflicts:
	lib/db/upgrade.php
	version.php
 2013-02-18 11:31:07 +08:00
Damyon Wiese
7866b094cb MDL-37683 cache: - Comments cleanup and remove ;; 2013-02-18 10:35:31 +08:00
Sam Hemelryk
04cfa387f9 MDL-38000 css: fixed handling of CSS files by outputlib. 2013-02-18 08:34:19 +13:00
Sam Hemelryk
e0d9b7c0d4 MDL-37683 cache: siteidentifier is now included in the keys 2013-02-18 08:32:03 +13:00
Andrew Robert Nicols
59a0ba3bdc MDL-37939 Course: Correct broken sequence data 2013-02-15 21:28:33 +00:00
Frederic Massart
304baba01a MDL-36380 stats: No more duplicated entries when viewing monthly stats 2013-02-15 15:02:54 +08:00
David Monllao
b08b0a2875 MDL-37858 behat: Arguments transformations 
To remove the escape characters and to
replace var names for nasty strings
 2013-02-15 13:38:14 +08:00
David Monllao
110761997a MDL-37858 testing: Adding nasty strings generator 2013-02-15 13:38:14 +08:00
David Monllao
02ca6219a6 MDL-37858 behat: Removing fixStepArgument 
It can be managed by a @Transform in
a centralized way
 2013-02-15 13:38:14 +08:00
David Monllao
9305c29f35 MDL-37912 behat: Use text area if there is no html editor 2013-02-15 13:37:14 +08:00
Frederic Massart
ebd9ae6523 MDL-31983 navigation: Move reports from Navigation to Settings 2013-02-15 13:06:26 +08:00
Dan Poltawski
47570cc67d MDL-35750 - update to the ISO list of countries 
Netherlands Antilles has been split up as specified in ISO 3166-1
Newsletter VI-8 (2010-12-15). Users will need to choose their country.
http://www.iso.org/iso/iso_3166-1_newsletter_vi-8_split_of_the_dutch_antilles_final-en.pdf

PLEASE NOTE: if you are updating this list again, i've written a script
to automate it from now on, linked from the bug.
 2013-02-15 12:26:08 +08:00
Marina Glancy
73a0f3ba76 MDL-33774 Reset filters caches between unit tests 2013-02-14 19:46:19 +11:00
Marina Glancy
3008f86c3f MDL-33774 mod_label stores the content where it is supposed to 
removed hardcoded checking for 'label' module type

changed label update script
 2013-02-14 19:46:19 +11:00
David Monllao
10dd80c2ac MDL-38029 behat: Cleaning caches before each test 2013-02-14 16:33:33 +08:00
David Mudrák
08caae5b22 MDL-37997 Improve the display of MUC caches used in the footer 
Cache stores with no hits and some misses are highlighted in red. Caches
stores with some hits but more misses are highlighted in yellow.
Otherwise (more hits than misses) the stores are highlighted in green.
 2013-02-12 22:27:55 +01:00
Eloy Lafuente (stronk7)
7fe9a7863a Merge branch 'MDL-37787_master' of git://github.com/dmonllao/moodle 2013-02-12 10:07:58 +01:00
Dan Poltawski
5c70d6505a Merge branch 'MDL-37768_master' of git://github.com/dmonllao/moodle 2013-02-12 15:44:17 +08:00
Damyon Wiese
147f592742 Merge branch 'MDL-37873_master' of git://github.com/dmonllao/moodle 
Conflicts:
	course/tests/behat/add_activities.feature
 2013-02-12 14:48:40 +08:00
Damyon Wiese
2262c52122 Merge branch 'MDL-37012-master' of git://github.com/mouneyrac/moodle 2013-02-12 14:39:20 +08:00
Dan Poltawski
008a6514ae Merge branch 'MDL-37952' of git://github.com/stronk7/moodle 2013-02-12 09:45:38 +08:00
Eloy Lafuente (stronk7)
e8e6802225 Merge branch 'MDL-37943' of git://github.com/timhunt/moodle 2013-02-12 01:20:56 +01:00
Eloy Lafuente (stronk7)
625d5f8164 Merge branch 'MDL-37896' of git://github.com/timhunt/moodle 2013-02-12 01:13:18 +01:00
Eloy Lafuente (stronk7)
ef1a4d20d4 Merge branch 'MDL-37919-phpunit-exception' of git://github.com/mudrd8mz/moodle 2013-02-12 01:07:43 +01:00
Eloy Lafuente (stronk7)
e196517bf5 Merge branch 'wip-MDL-35832-master' of git://github.com/phalacee/moodle 2013-02-11 23:31:38 +01:00
Dan Poltawski
32f832b22b Merge branch 'master_MDL-35332' of git://github.com/totara/moodle 2013-02-11 16:43:34 +08:00
Simon Coggins
5c4ffeb883 MDL-35332: Use fast hash when generating hashes during tests 2013-02-11 21:38:07 +13:00
Damyon Wiese
a052fe8a6b MDL-37122 core get_max_upload_sizes: Removed unit test for no limit as it is depends on settings in php.ini 2013-02-11 15:18:12 +08:00
Damyon Wiese
1e7db9fee8 Merge branch 'master_MDL-35332' of git://github.com/totara/moodle 
Conflicts:
	lib/tests/moodlelib_test.php
	version.php
 2013-02-11 14:51:11 +08:00
Dan Poltawski
2ae00d0d3c Merge branch 'MDL-37122-master' of git://github.com/damyon/moodle 2013-02-11 14:24:04 +08:00
Dan Poltawski
acd561c66a Merge branch 'MDL-37797' of git://github.com/rwijaya/moodle 2013-02-11 13:58:36 +08:00
Jerome Mouneyrac
b0365ea5d1 MDL-29938 get_users - search users external function 2013-02-11 13:57:59 +08:00
Andrew Davis
c90e6b4644 MDL-36091 added debugging() calls in blocks of code marked as "should never happen" 2013-02-11 13:24:52 +08:00
Dan Poltawski
a614fb7457 Merge branch 'MDL-35819-m' of git://github.com/andrewnicols/moodle 2013-02-11 10:56:07 +08:00
Damyon Wiese
8dcca4aacb MDL-30637 Formslib - Cleanup for shortforms implementation (mostly comments) 
Also added deprecated functions for the functions that were removed from MoodleQuickForm.
 2013-02-11 10:37:13 +08:00
Damyon Wiese
40f1c065b4 Merge branch 'MDL-30637-master' of git://github.com/lucisgit/moodle 2013-02-11 10:37:03 +08:00