Commit Graph

7107 Commits

Author SHA1 Message Date
Georg Ehrke b8275691e7 Merge branch 'master' into oc_error 2012-06-04 10:35:50 +02:00
Georg Ehrke bb02330bec Merge branch 'master' into calendar_repeat 2012-06-04 10:35:00 +02:00
Georg Ehrke a6e3739671 Merge branch 'master' into calendar_export 2012-06-04 10:34:50 +02:00
Frank Karlitschek f3c1d1eded link to apps.owncloud.com
thanks to guillaume for the patch
2012-06-03 23:48:59 +02:00
Frank Karlitschek 300f6894e0 4.0.1 2012-06-03 21:06:07 +02:00
Georg Ehrke 4d1428db0f Merge branch 'master' into calendar_repeat 2012-06-03 19:17:05 +02:00
Georg Ehrke 865b7d6a7b Merge branch 'master' into calendar_export 2012-06-03 14:56:25 +02:00
Georg Ehrke c2a51d1f48 proper export for calendar app - doesn't work with apple ical yet - even though a ics validator says it's valid 2012-06-03 14:54:53 +02:00
Robin Appelman e90cbcaf5b http user backend 2012-06-03 02:51:05 +02:00
Michael Gapczynski 0145c65bf3 Verify user exists when checking if logged in, fix for bug oc-863 2012-06-02 20:09:44 -04:00
Michael Gapczynski 993ebc4c90 Verify user exists when checking if logged in, fix for bug oc-863 2012-06-02 20:06:52 -04:00
Michael Gapczynski cc84bd2993 Fix typo in log message 2012-06-01 15:15:05 -04:00
Michael Gapczynski 4db5481ad5 Improve efficiency of retrieving log file entries 2012-06-01 14:42:14 -04:00
Michael Gapczynski 66f1957e3b Improve efficiency of retrieving log file entries 2012-06-01 14:39:50 -04:00
Frank Karlitschek 52b3305892 add a pdo check 2012-06-01 20:01:23 +02:00
Sam Tuke 3d7143c730 Merge branch 'master' of gitorious.org:owncloud/owncloud 2012-06-01 19:01:00 +01:00
Frank Karlitschek 4aa96de537 add a check for pdo 2012-06-01 20:00:33 +02:00
Sam Tuke 2ccf3da411 Merge branch 'master' of gitorious.org:owncloud/owncloud 2012-06-01 19:00:28 +01:00
Sam Tuke 410b556a86 Added class comment block 2012-06-01 18:59:57 +01:00
Frank Karlitschek 07e1e3a945 check if apps folder is writable 2012-06-01 19:54:07 +02:00
Frank Karlitschek 3ef944521e add check if apps folder is writable. needed to install 3rd party apps 2012-06-01 19:52:45 +02:00
Sam Tuke 4b4d13165a Minor change to comment 2012-06-01 16:46:18 +01:00
Sam Tuke 7203f6951e Extended class comment 2012-06-01 16:34:09 +01:00
Frank Karlitschek 60b8e172d5 prevent a division by zero problem 2012-06-01 16:49:14 +02:00
Frank Karlitschek e6b0eb3423 prevend a division by zero problem 2012-06-01 16:48:42 +02:00
Frank Karlitschek 1395e411f4 Merge branch 'master' of gitorious.org:owncloud/owncloud 2012-06-01 16:35:14 +02:00
Frank Karlitschek 2c97f4788b Merge branch 'stable4' of gitorious.org:owncloud/owncloud into stable4 2012-06-01 16:34:52 +02:00
Frank Karlitschek aa9824d35b fix proper error reporting 2012-06-01 16:33:24 +02:00
Frank Karlitschek dcb06393a8 fix propper error reporting 2012-06-01 16:30:47 +02:00
Arthur Schiwon e58efd7877 LDAP group backend: Set configured true when it is... fixe oc-887 2012-06-01 16:02:38 +02:00
Arthur Schiwon 34464b1f8b LDAP group backend: Set configured true when it is... fixe oc-887 2012-06-01 16:02:04 +02:00
Frank Karlitschek aa88ec81c7 sort users and groups. fixes oc-779 2012-06-01 14:21:24 +02:00
Frank Karlitschek ad6562d14f sort users and groups. fixes oc-779 2012-06-01 14:18:14 +02:00
Arthur Schiwon 86279bc192 LDAP group backend: If a group filter is not configured, do not do anything. Fixes oc-867 2012-06-01 14:05:08 +02:00
Arthur Schiwon a4f177d75d LDAP group backend: If a group filter is not configured, do not do anything. Fixes oc-867 2012-06-01 13:49:11 +02:00
Georg Ehrke 46b3b30d46 add status
file for repeating events caching
2012-06-01 13:47:48 +02:00
Frank Karlitschek 0468f53f73 switch magic quotes off.
they are evil and deprecated
2012-06-01 12:42:50 +02:00
Frank Karlitschek 75d56f24f2 try to switch magic quotes off.
it´s evil and deprecated
2012-06-01 12:41:38 +02:00
Frank Karlitschek 1b34bda76b fix oc-874 2012-06-01 12:16:04 +02:00
Frank Karlitschek 93295994dc fix oc-769 2012-06-01 12:15:03 +02:00
Frank Karlitschek e44f9ab46e correctly detect https 2012-06-01 11:47:14 +02:00
Frank Karlitschek a2b41a140e correctly detect https 2012-06-01 11:46:18 +02:00
Georg Ehrke e75146a811 Merge branch 'master' into calendar_repeat 2012-06-01 11:40:39 +02:00
Georg Ehrke 7a8e322679 some work for repeating events caching 2012-06-01 11:30:54 +02:00
Frank Karlitschek 83c6714c72 don´t start a session here. I don´t think it´s needed. Let´s see if it breaks something 2012-06-01 11:12:50 +02:00
Frank Karlitschek 8ed13e627e don´t do warnings.
Not sure if this start_session call is really needed here.
2012-06-01 11:08:40 +02:00
Frank Karlitschek 0d2d613f59 added a serverProtocol function that correctly returns the used protocol even if the ssl connection is terminated at a reverse_proxy or at a load balancer 2012-06-01 11:06:49 +02:00
Frank Karlitschek 24d14783d7 added a serverProtocol function that correctly returns the used protocol even if the ssl connection is terminated at a reverse_proxy or at a load balancer 2012-06-01 10:38:44 +02:00
Frank Karlitschek baae4c741d fix the breadcrumb 2012-05-31 21:44:05 +02:00
Frank Karlitschek 670022cc8a fix the breadcrumb 2012-05-31 21:43:07 +02:00