59357 Commits

Author SHA1 Message Date
Eloy Lafuente (stronk7)
ca1774aea4 Merge branch 'wip-MDL-34298-m25' of git://github.com/samhemelryk/moodle 2013-02-20 00:45:50 +01:00
Eloy Lafuente (stronk7)
b70a3b7106 Merge branch 'MDL-38093' of git://github.com/timhunt/moodle 2013-02-20 00:44:54 +01:00
Eloy Lafuente (stronk7)
f1b011d3a8 Merge branch 'MDL-37894' of git://github.com/timhunt/moodle 2013-02-20 00:39:44 +01:00
Eloy Lafuente (stronk7)
d2761b3aad Merge branch 'MDL-37967' of git://github.com/jmvedrine/moodle 2013-02-20 00:32:19 +01:00
Eloy Lafuente (stronk7)
26581a7420 Merge branch 'wip-MDL-37987-master' of git://github.com/marinaglancy/moodle 2013-02-20 00:10:35 +01:00
Eloy Lafuente (stronk7)
4e6bb9d315 Merge branch 'wip-MDL-38075-m25' of git://github.com/samhemelryk/moodle 2013-02-20 00:07:17 +01:00
Eloy Lafuente (stronk7)
80ba3a4390 Merge branch 'MDL-37982_master' of git://github.com/dmonllao/moodle 2013-02-20 00:01:47 +01:00
Eloy Lafuente (stronk7)
41e94a8d6f Merge branch 'MDL-37872-m' of git://github.com/andrewnicols/moodle 2013-02-19 23:26:09 +01:00
Eloy Lafuente (stronk7)
6d6bd5f114 MDL-32620 whitespace + comment fixes. 2013-02-19 13:21:18 +01:00
Eloy Lafuente (stronk7)
1ead0c63e9 Merge branch 'MDL-32620' of git://github.com/scriby/moodle 2013-02-19 13:13:43 +01:00
Eloy Lafuente (stronk7)
57691c32b7 Merge branch 'MDL-36541' of https://github.com/Lightwork-Marking/moodle 2013-02-19 13:02:56 +01:00
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
Eloy Lafuente (stronk7)
a5b1f1e2f2 Merge branch 'MDL-38031-master' of git://github.com/FMCorz/moodle 2013-02-19 12:46:36 +01:00
Eloy Lafuente (stronk7)
8337ed1e69 Merge branch 'MDL-38033_dnd_uppercase_extn' of git://github.com/davosmith/moodle 2013-02-19 12:23:41 +01:00
Dan Poltawski
61df003d53 Merge branch 'master_MDL-37660' of git://github.com/danmarsden/moodle 2013-02-19 15:04:56 +08:00
Dan Poltawski
d3c6290328 Merge branch 'w07_MDL-38059_m25_cachedir' of git://github.com/skodak/moodle 2013-02-19 14:07:13 +08: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
Dan Poltawski
2810980451 Merge branch 'MDL-38048-master' of git://github.com/FMCorz/moodle 2013-02-19 13:44:15 +08:00
Dan Poltawski
fd507a8715 Merge branch 'm25_MDL-37449_Reports_ORA-00918_column_ambiguously_defined' of https://github.com/scara/moodle 2013-02-19 13:41:45 +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
Dan Poltawski
3770eadb82 Merge branch 'MDL-38047-master' of git://github.com/damyon/moodle 2013-02-19 13:31:11 +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
Damyon Wiese
52cb014ea3 MDL-31636 Comments - Call display callback when adding a new comment. 2013-02-19 11:35:56 +08:00
Aparup Banerjee
6b969e14b5 MDL-31636 Added strftimeformat to comment object being passed through to xxx_comment_display() for further time format changes. 2013-02-19 11:35:56 +08:00
Aparup Banerjee
6c847bbb9e MDL-31636 redirect debugging to error log for ajax 2013-02-19 11:35:56 +08:00
Dan Poltawski
7e94bdcca1 Merge branch 'MDL-38009_master' of git://github.com/dmonllao/moodle 2013-02-19 11:34:07 +08:00
Dan Poltawski
fdd91adabb Merge branch 'MDL-38051' of git://github.com/jmvedrine/moodle 2013-02-19 11:23:39 +08:00
Dan Poltawski
5e4e086fec Merge branch 'MDL-37934' of git://github.com/jmvedrine/moodle 2013-02-19 10:55:51 +08:00
Damyon Wiese
503c14a612 MDL-29938 Remove tabs (Grrr!) 2013-02-19 10:47:04 +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
0c4ba06047 MDL-29938 Version bump for webservices. 2013-02-19 10:31:25 +08:00
Damyon Wiese
ebb1385c39 Merge branch 'MDL-29938-master' of git://github.com/mouneyrac/moodle 2013-02-19 10:10:48 +08:00
Sam Hemelryk
79a809ba44 MDL-34298 course: fixed course search output validation issue 2013-02-19 11:03:58 +13:00
Sam Hemelryk
db6539c62a MDL-37224 backup: fixed bug when searching for a course to import 2013-02-19 09:32:01 +13:00
Tim Hunt
e58b2c326b MDL-38093 quiz settings: make overall feeback editors collapsible. 2013-02-18 18:13:51 +00:00
Tim Hunt
6e78a7bdb4 MDL-37894 Show the quiz close date even if the quiz is not open yet.
People care a lot about deadlines!
2013-02-18 10:27:37 +00: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
35b5c04f0b Merge branch 'MDL-38039_master' of git://github.com/lazydaisy/moodle 2013-02-18 15:59:48 +08:00
Dan Poltawski
9c70147d54 Merge branch 'MDL-31983-master' of git://github.com/FMCorz/moodle 2013-02-18 15:54:22 +08:00
Frederic Massart
dd1c2f5a02 MDL-31983 navigation: Renaming the Settings block to Administration
AMOS BEGIN
 CPY [administration,core],[pluginname,block_settings]
AMOS END
2013-02-18 15:48:12 +08:00
Damyon Wiese
74f3d44d37 Merge branch 'MDL-37687_comments_ajax_fix' of git://github.com/nebgor/moodle 2013-02-18 14:51:50 +08:00
Jean-Michel Vedrine
ded5cddb32 MDL-37967 Improve XML question import format handling of duplicated files 2013-02-18 07:38:22 +01:00
Dan Poltawski
69898d6b9a Merge branch 'MDL-37396' of git://github.com/rwijaya/moodle 2013-02-18 14:22:02 +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
Rossiani Wijaya
62a973cef0 MDL-37396 Enrollmen: pass $perpage as optional_param and set default perpage variable in quickenrolment.js 2013-02-18 13:22:07 +08:00
Dan Poltawski
93d5dc1c03 Merge branch 'MDL-35336' of git://github.com/rwijaya/moodle 2013-02-18 12:23:51 +08:00