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

15918 Commits

Author SHA1 Message Date
Dan Poltawski
7f639dd352 Merge branch 'MDL-39536-master' of git://github.com/FMCorz/moodle 2013-06-04 13:18:49 +08:00
Frederic Massart
1530fe2192 MDL-39536 completion: Unit tests for get_activities and has_activities 2013-06-04 12:57:13 +08:00
Frederic Massart
8ca0c12370 MDL-39536 completion: Prevent DB call when fetching activities 2013-06-04 12:57:10 +08:00
Eloy Lafuente (stronk7)
b50ddbdbd5 Merge branch 'wip-MDL-39801-master' of git://github.com/marinaglancy/moodle 2013-06-04 01:51:10 +02:00
Eloy Lafuente (stronk7)
d13d3f2d31 MDL-39465 Show env. info instead of part twice. 2013-06-04 00:50:15 +02:00
Eloy Lafuente (stronk7)
5431fda180 Merge branch 'MDL-39936-master' of git://github.com/danpoltawski/moodle 2013-06-04 00:04:12 +02:00
Petr Škoda
7dc1feaa99 MDL-39465 detect environment problems in tests 
This should help explain why something else fails.
 2013-05-31 22:02:34 +02:00
Marina Glancy
5150c30203 MDL-39801 navigation_node::remove does not allow to insert nodes afterwards 2013-05-31 11:49:34 +10:00
Marina Glancy
e3b11a6e2b MDL-39801 navigation_node::remove fails if first child does not have a key 2013-05-31 11:49:12 +10:00
Dan Poltawski
4f5bcf2eca MDL-39936 upgrade: 2.5.0 line incorrectly positioned 2013-05-30 13:41:15 +08:00
Eloy Lafuente (stronk7)
aeb5f9ae37 Merge branch 'w22_MDL-39676_m26_whereparam' of git://github.com/skodak/moodle 2013-05-28 15:31:07 +02:00
Damyon Wiese
ba375bcb17 MDL-39477: Remove some unused instances of $CFG 
Also change @since tags to 2.5.1 because this will be backported.
 2013-05-28 11:13:52 +08:00
Damyon Wiese
e750fcc4da Merge branch 'MDL-39702_master' of git://github.com/dmonllao/moodle 
Conflicts:
	lib/testing/generator/repository_generator.php
 2013-05-28 11:13:43 +08:00
Damyon Wiese
0f1f601368 Merge branch 'MDL-39477-master' of git://github.com/FMCorz/moodle 2013-05-28 11:12:43 +08:00
Frederic Massart
9b5e61ac1e MDL-39477 repository: Introducing data generators for repositories 2013-05-28 10:44:43 +08:00
Eloy Lafuente (stronk7)
cc4cbf67f0 Merge branch 'MDL-39795_master' of git://github.com/dmonllao/moodle 2013-05-28 00:02:58 +02:00
Damyon Wiese
e6302a3c75 Merge branch 'MDL-39686_master' of git://github.com/dmonllao/moodle 2013-05-27 16:29:00 +08:00
David Monllao
41eb672ba4 MDL-39686 behat: Add option to restart the browser 2013-05-27 15:03:25 +08:00
David Monllao
c29e3e248f MDL-39702 generators: Adding MOODLE_INTERNAL 
As discussed generators should include MOODLE_INTERNAL
as they make use of CFG and they don't make sense without
requiring config.php.
 2013-05-27 14:52:53 +08:00
Frederic Massart
0852bbaed5 MDL-39477 repository: Introducing data generators for repositories 2013-05-27 14:52:11 +08:00
David Monllao
9a1f4922bd MDL-39795 behat: Improving find-texts-in-page-contents performance 2013-05-27 14:24:20 +08:00
Dan Poltawski
87787191e4 Merge branch 'MDL-38239-master' of git://github.com/StudiUM/moodle 2013-05-27 14:04:04 +08:00
Dan Poltawski
5584adfe70 Merge branch 'w22_MDL-39688_m26_etag' of git://github.com/skodak/moodle 2013-05-27 13:43:13 +08:00
Yuliya Bozhko
59c6b212f5 MDL-39778 badges: Fix missing library error in delete_course() 2013-05-27 11:59:54 +08:00
Dan Poltawski
047a79baed Merge branch 'MDL-39768_master' of git://github.com/dmonllao/moodle 2013-05-27 10:18:21 +08:00
Petr Škoda
5ce443a1b1 MDL-39676 improve get_role_users() unit tests 2013-05-25 10:09:42 +02:00
Petr Škoda
f111746140 MDL-39688 do not set Etag when sending http ranges 2013-05-25 09:10:24 +02:00
David Monllao
ad7e423784 MDL-39768 behat: Adding focused panels CSS selector 2013-05-22 15:11:05 +08:00
Eloy Lafuente (stronk7)
65fc4c39a9 Merge branch 'wip-MDL-39177-master' of git://github.com/marinaglancy/moodle 2013-05-22 02:22:55 +02:00
Gilles-Philippe Leblanc
d381fb7776 MDL-38239 gradebook: Importing grades from a .txt file with commas for decimals causes an error 2013-05-21 14:15:26 -04:00
Dan Poltawski
a22b8a83e7 Merge branch 'MDL-39753' of git://github.com/stronk7/moodle 2013-05-21 10:58:37 +08:00
Eloy Lafuente (stronk7)
388b7d7d98 Merge branch 'MDL-39638_master' of git://github.com/dmonllao/moodle 2013-05-21 00:59:42 +02:00
Eloy Lafuente (stronk7)
5e1a48df97 Merge branch 'MDL-39717_master' of git://github.com/dmonllao/moodle 2013-05-21 00:44:05 +02:00
Eloy Lafuente (stronk7)
c9e54743ec MDL-39753 Add 2.5.0 upgrade line 2013-05-20 15:33:19 +02:00
Marina Glancy
6dd92c0234 MDL-39177 Updating userid when file is overwritten 2013-05-20 14:09:11 +10:00
Damyon Wiese
e8dc568b12 Merge branch 'MDL-39528_master' of git://github.com/dmonllao/moodle 2013-05-20 12:03:36 +08:00
Marina Glancy
935429af8b MDL-39177 More comments about confusing files.source field 2013-05-17 13:43:45 +10:00
Marina Glancy
da4b1ee480 MDL-39177 New function file_storage::get_unused_dirname() 2013-05-17 13:43:45 +10:00
Marina Glancy
32495c06b5 MDL-39177 Perform all checks on draftfile area before saving the files 2013-05-17 13:43:45 +10:00
Marina Glancy
489bd32b29 MDL-39177 Remove code duplication 2013-05-17 13:43:45 +10:00
Marina Glancy
0e7fd52e20 MDL-39177 Update file in filearea only if original is present 
Now when file was deleted in filemanager and new file with the same file was uploaded the references will be converted to copies exactly like UI warns in filemanager.
Also do not delete original information from draftfiles.
 2013-05-17 13:43:45 +10:00
Marina Glancy
e9e32b1d88 MDL-39177 File reference is not updated when overwriting the file 2013-05-17 13:43:44 +10:00
Damyon Wiese
2d1ad229da Merge branch 'MDL-28250-25' of git://github.com/danpoltawski/moodle 
Conflicts:
	version.php
 2013-05-17 11:36:09 +08:00
David Monllao
7daab4016d MDL-39717 behat: Add info to experimental steps definitions 
JS modal dialogs and drag & drop should be
considered experimental as the steps are not
working as expected in all OS/browser combinations.
 2013-05-17 11:23:05 +08:00
David Monllao
c4509f8084 MDL-39638 behat: New step to collapse nodes based on the expand nodes 
Also updating steps with a collapse behaviour.
 2013-05-16 12:43:54 +08:00
David Monllao
870349ee67 MDL-39528 behat: Avoid modal window suite failure 
Catching JS alerts/confirms exceptions and
auto-accepting them before each test run to
avoid chained scenarios failures.
 2013-05-16 10:11:40 +08:00
Petr Škoda
b046b96a88 MDL-39678 fix YUI 20130515 vulnerability 2013-05-15 21:57:23 +02:00
Dan Poltawski
82198dec8b MDL-28250 license: upgrade old versions of cc-nc 
The url was incorectly defined in previous versions
 2013-05-15 11:22:13 +01:00
Wojciech Galiszek
8243f3ebb5 MDL-28250 license: Correct cc-nc url 2013-05-15 10:45:36 +01:00
Dan Poltawski
3f461e9322 Merge branch 'MDL-39579-master-int' of git://github.com/FMCorz/moodle 2013-05-13 13:09:14 +01:00