59270 Commits

Author SHA1 Message Date
Marina Glancy
898d4975cb MDL-38091 fixed bug with SQL query on Oracle 2013-02-23 12:06:21 +11:00
Damyon Wiese
f29e62cb6c weekly release 2.5dev 2013-02-22 10:55:48 +08:00
Damyon Wiese
41af3cb32c Fix permissions 2013-02-22 10:53:47 +08:00
Dan Poltawski
fc7d3fdc84 Merge branch 'MDL-33996-forum-advanced-timestamp' of git://github.com/mudrd8mz/moodle 2013-02-21 22:11:37 +08:00
David Mudrák
15f83171f5 MDL-33996 Remove the nopostscontaining string from the forum module
After Mark's improvements at the search results display page, the string
is not needed any more.
2013-02-21 14:50:15 +01:00
Mark Johnson
b74c9a9fec MDL-33996 Forum search. Stop displaying raw search strings to users 2013-02-21 14:48:56 +01:00
Dan Poltawski
72c70f9d14 Merge branch 'MDL-37997-muc-stats-display' of git://github.com/mudrd8mz/moodle 2013-02-21 09:38:05 +08:00
Sam Hemelryk
1727057218 MDL-37224 backup-import: better handling of search button 2013-02-21 08:23:58 +13:00
David Mudrák
24798e5df5 MDL-37997 Yet more CSS improvements to display MUC caches usage 2013-02-20 17:00:57 +01:00
Dan Poltawski
d94fc7ece9 Revert "MDL-36380 stats: No more duplicated entries when viewing monthly stats"
This reverts commit 304baba01a8c1de6bf32f98f7c188e12b72a9a99.
2013-02-20 17:04:33 +08:00
Dan Poltawski
aa247695e7 Merge branch 'MDL-35622-master' of git://github.com/FMCorz/moodle 2013-02-20 14:27:27 +08:00
Rajesh Taneja
0627e1cef4 MDL-37329 Navigation: Enrolled courses in category should be added only. 2013-02-20 12:39:21 +08:00
Frederic Massart
5961512aa3 MDL-35622 files: Fixed typo in galleryitem extension 2013-02-20 12:23:18 +08:00
Damyon Wiese
cfd2addf3f Merge branch 'wip-mdl-37329-new' of git://github.com/rajeshtaneja/moodle 2013-02-20 08:54:57 +08:00
Eloy Lafuente (stronk7)
3b00c13bf1 MDL-37894 Amend tests with new openclose rule. 2013-02-20 01:36:20 +01:00
Eloy Lafuente (stronk7)
349c224817 Merge branch 'wip-MDL-37224-m25' of git://github.com/samhemelryk/moodle 2013-02-20 00:48:12 +01:00
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