mirror_php/moodle
1
0
Fork 0
mirror of https://github.com/moodle/moodle.git synced 2025-03-27 02:53:29 +01:00
Code Issues Projects Releases Wiki Activity
65,350 Commits 36 Branches 527 Tags
Commit Graph

4700 Commits

Author SHA1 Message Date
Damyon Wiese
e359857e41 Merge branch 'wip-MDL-43008-master' of git://github.com/abgreeve/moodle 2013-11-26 16:56:20 +08:00
Adrian Greeve
b404b1f41c MDL-43008 calendar: Allow calendar plugins to display setting pages. 2013-11-26 15:44:57 +08:00
Dan Poltawski
2bc34d6528 Merge branch 'MDL-40741_master' of git://github.com/dmonllao/moodle 2013-11-26 14:52:21 +08:00
David Monllao
5df9e40cec MDL-40741 behat: Changing xpaths for clean theme 
Keeps compatibility with standard theme.
 2013-11-26 11:41:13 +08:00
Dan Poltawski
a136e16c8e Merge branch 'MDL-42547_master' of https://github.com/markn86/moodle 2013-11-25 10:37:33 +08:00
Mark Nelson
7ca44a4963 MDL-42547 tool_uploaduser: trim values before uploading users 2013-11-18 20:07:01 -08:00
Sam Hemelryk
496692fb9d Merge branch 'wip-MDL-42850-master' of git://github.com/abgreeve/moodle 2013-11-19 14:19:20 +13:00
Sam Hemelryk
40dca7e4d6 Merge branch 'MDL-41316-master' of git://github.com/ankitagarwal/moodle 2013-11-19 12:28:08 +13:00
Sam Hemelryk
074e5686db Merge branch 'MDL-42863' of git://github.com/timhunt/moodle 2013-11-19 12:03:41 +13:00
Sam Hemelryk
04fcb4a96c Merge branch 'MDL-42865' of git://github.com/timhunt/moodle 2013-11-19 11:50:44 +13:00
Damyon Wiese
ef16df1449 Merge branch 'MDL-42100_master' of https://github.com/markn86/moodle 2013-11-18 16:08:57 +08:00
Damyon Wiese
47578dbff4 MDL-42930 Add 2.6.0 upgrade line 2013-11-18 11:47:17 +08:00
Adrian Greeve
a2071fbf7c MDL-42850 administration: Updated bulk user upload errors to be more descriptive. 2013-11-18 11:36:16 +08:00
Tim Hunt
be8c2ec31f MDL-42865 Make XMLDB foreign key check more robust. 
Otherwise, installing one bad add-on can completely break this report.
 2013-11-15 15:08:51 +00:00
Tim Hunt
02793f156c MDL-42863 make capabilities overview more fault-tolerant. 2013-11-15 15:08:32 +00:00
Eloy Lafuente (stronk7)
9a36c7d95c Merge branch 'MDL-42447_master' of git://github.com/dmonllao/moodle 2013-11-15 02:11:27 +01:00
David Monllao
58a3a34e38 MDL-42447 performance: New var to add perf. info to redirections 2013-11-15 09:10:22 +08:00
Damyon Wiese
e4af9616c3 Merge branch 'MDL-40728-master-2' of git://github.com/mouneyrac/moodle 2013-11-13 16:57:34 +08:00
Jerome Mouneyrac
c8a661098e MDL-40728 courseupload: add missing help icons 2013-11-13 16:34:43 +08:00
Ankit Agarwal
7e1da23dfc MDL-41316 tool_spamcleaner: Fix sql queries 
AS keyword is not allowed in sql qeries for table alias as Oracle doesn't support it
Thanks to Sara Cenni for suggesting the patch
 2013-11-13 16:32:24 +08:00
Mark Nelson
8eb2ea83d2 MDL-42100 tool_capability: fixed incorrect links 2013-11-13 00:20:28 -08:00
Dan Poltawski
02c6bd358f Merge branch 'MDL-42728-en_fix' of git://github.com/mudrd8mz/moodle 
Conflicts:
	lang/en/moodle.php
 2013-11-07 09:34:31 +08:00
sam marshall
3749c94627 MDL-42714 Backup: For tgz packer, handle missing zlib extension 2013-11-06 12:34:46 +00:00
Helen Foster
5a25566060 MDL-42728 Merge English strings from the en_fix language pack 2013-11-05 23:41:44 +01:00
Damyon Wiese
057a79922e Merge branch 'MDL-42701' of git://github.com/stronk7/moodle 2013-11-05 13:10:52 +08:00
Dan Poltawski
6ce30a3e2c Merge branch 'MDL-42385_master' of git://github.com/dmonllao/moodle 2013-11-05 12:34:35 +08:00
Ray Morris
82d305fafa MDL-42265 make Browse Users list scrollable for smaller screens 2013-11-05 10:49:20 +08:00
Eloy Lafuente (stronk7)
f39c82ebed MDL-42701 Bump all versions near 2.6 release 2013-11-05 02:36:00 +01:00
Damyon Wiese
9995aa3852 Merge branch 'w45_MDL-42512_m26_filtermess' of https://github.com/skodak/moodle 2013-11-05 09:31:41 +08:00
Dan Poltawski
db6767ae47 Merge branch 'w45_MDL-42044_m26_zipaddon' of https://github.com/skodak/moodle 2013-11-04 16:14:04 +08:00
Petr Škoda
372154ff15 MDL-42512 finally fix the indentation of filter management page 2013-11-04 08:28:51 +01:00
Petr Škoda
137f573cfd MDL-42512 fix and cleanup filter management page 2013-11-04 08:24:28 +01:00
Damyon Wiese
d04bea30da Merge branch 'wip-MDL-42400-master' of git://github.com/marinaglancy/moodle 2013-11-04 13:11:42 +08:00
Petr Škoda
4cf944c6bc MDL-42044 minor add-on installer unit tests cleanup 2013-11-01 10:43:14 +01:00
Petr Škoda
99456a5559 MDL-42044 standardise list of unzipped files in add-on installer 2013-11-01 10:43:13 +01:00
David Monllao
63950e4d0b MDL-42236 behat: New steps to look for elements visibility 2013-11-01 08:55:27 +08:00
David Monllao
32fcea7415 MDL-42385 behat: New test to cover MDL-38661 
Also refactoring set site settings step
as it has problems to deal with multiple-field
settings.
 2013-10-30 18:32:12 +08:00
Petr Škoda
c3f0f2fd79 MDL-40683 fix user upload form validation problem 2013-10-29 12:05:29 +01:00
Damyon Wiese
e17bac441d Merge branch 'wip-MDL-40683-master' of git://github.com/abgreeve/moodle 2013-10-29 16:42:48 +08:00
Dan Poltawski
b6df9f8f55 Merge branch 'wip-mdl-42560' of git://github.com/rajeshtaneja/moodle 2013-10-29 13:09:23 +08:00
Dan Poltawski
b1a6c9dc52 Merge branch 'wip-mdl-41811' of git://github.com/rajeshtaneja/moodle 
Conflicts:
	login/change_password.php
 2013-10-28 15:37:05 +08:00
Damyon Wiese
9a84376d4b Merge branch 'w44_MDL-42110_m26_addoninstaller' of https://github.com/skodak/moodle 2013-10-28 12:39:30 +08:00
Rajesh Taneja
045d913d11 MDL-42560 Events: Removed use of role->name 
role->name is usually empty or localized, so should not be used in events
 2013-10-28 11:06:47 +08:00
Adrian Greeve
c00252fbed MDL-40683 administration: Include alternate name fields in CSV user import. 
Removal of firstname and lastname from STD_FIELDS
 2013-10-28 09:14:44 +08:00
Adrian Greeve
6f4ece9f57 MDL-40683 libraries: Include alternate name fields in CSV user import. 2013-10-28 09:08:48 +08:00
Marina Glancy
7cff3faa94 MDL-42400 tool_generator: save db query in module generation 2013-10-26 14:00:24 +11:00
Petr Škoda
a635424f88 MDL-42110 use parent directory permissions when installing add-ons 2013-10-25 21:23:40 +02:00
David Monllao
a068887e3d MDL-42538 behat: Fixing wrong number of users 2013-10-25 11:22:34 +08:00
Dan Poltawski
276c451b2a Merge branch 'MDL-42343_master' of git://github.com/dmonllao/moodle 2013-10-23 15:12:22 +08:00
Damyon Wiese
db812f5e5a Merge branch 'w43_MDL-42208_m26_authunmask' of https://github.com/skodak/moodle 2013-10-23 13:37:24 +08:00