moodle/moodle
3
0
Fork 0
mirror of https://github.com/moodle/moodle.git synced 2025-08-07 18:06:51 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions
65484 commits 37 branches 540 tags 1.3 GiB
Commit graph

4719 commits

Author SHA1 Message Date
Sam Hemelryk
4f13423663 Merge branch 'wip-mdl-40079' of git://github.com/rajeshtaneja/moodle 2013-12-04 09:49:29 +13:00
Damyon Wiese
a977fa7b36 Merge branch 'wip-MDL-42731-master' of git://github.com/marinaglancy/moodle 2013-12-03 17:29:39 +08:00
Eloy Lafuente (stronk7)
e7b3306a69 Merge branch 'MDL-42885_master' of https://github.com/markn86/moodle 2013-12-03 10:01:19 +01:00
Damyon Wiese
a5ec4f7ae9 Merge branch 'wip-MDL-43026-master' of git://github.com/marinaglancy/moodle 2013-12-03 16:11:48 +08:00
Dan Poltawski
6ca388028e Revert "MDL-42932 core_calendar: introduced calendar type system setting" 
This reverts commit bb32a499e1.
 2013-12-03 14:57:10 +08:00
Dan Poltawski
753eb47edc Merge branch 'wip-mdl-43028' of https://github.com/rajeshtaneja/moodle 2013-12-03 13:45:59 +08:00
Dan Poltawski
8d8e6f9607 Merge branch 'MDL-42932_master' of https://github.com/markn86/moodle 2013-12-03 10:07:10 +08:00
Sam Hemelryk
a59a423926 Merge branch 'MDL-42084-master' of git://github.com/sammarshallou/moodle 2013-12-03 11:12:34 +13:00
Marina Glancy
6dfd8325f0 MDL-42731 behat: load 'Site administration' when expanding node in non-javascript mode 2013-12-02 17:44:32 +11:00
Rajesh Taneja
c1b3ac4358 MDL-40079 repositories: Replaced const with configs 2013-12-02 09:41:41 +08:00
Marina Glancy
dd47f2107f MDL-43026 behat: add tests for all available module generators 2013-11-29 17:24:12 +11:00
Mark Nelson
275d958e62 MDL-42885 tool_uploaduser: removed misleading debugging message 2013-11-26 21:26:03 -08:00
Dan Poltawski
ab47c758d1 MDL-42942 behat: increment version 2013-11-27 11:33:11 +08:00
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
Mark Nelson
bb32a499e1 MDL-42932 core_calendar: introduced calendar type system setting 2013-11-25 23:11:17 -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
Marina Glancy
b884e46d5d MDL-43028 navigation: correct capability check 2013-11-25 13:27:01 +08:00
Rajesh Taneja
823c593fc5 MDL-43028 Navigation: Setting proper page properties on admin pages 2013-11-25 12:12:38 +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
db0f0097e8 MDL-42084 Unit tests: Remove unnecessary 'clear time limit change' lines 2013-11-06 16:40:04 +00:00
sam marshall
3ef7279f26 MDL-42084 Core: Change set_time_limit to core_php_time_limit::raise everywhere 
Exceptions (places where set_time_limit is still left) are:

Third-party libraries:
  ADODB
  PHPMailer

Moodle core:
  PHPUnit - not relevant (CLI mode)
 2013-11-06 16:40:01 +00:00
sam marshall
366b19a954 MDL-42084 Core: Create new static class for use instead of set_time_limit 2013-11-06 16:39:57 +00: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