Commit Graph

7107 Commits

Author SHA1 Message Date
Georg Ehrke 1c1ed52867 fix status
of timezone detection
2012-05-29 13:14:36 +02:00
Georg Ehrke 75afc09b9d fix status
of timezone detection
2012-05-29 13:14:05 +02:00
Brice Maron d1f0261b5d Correct typo in last_insert_id for calendar and pg fix #oc-731 2012-05-28 20:57:52 +00:00
Brice Maron 2f8412defc Set table prefix if not set in postgresql install 2012-05-28 20:56:21 +00:00
Brice Maron 22cd0f1cda Correct typo in last_insert_id for calendar and pg fix #oc-731 2012-05-28 20:41:39 +00:00
Benjamin Diele 7b8664bbe5 Check for valid LDAP-resource before querying.
Check if we have get valid link identifier from
self::getConnectionResource() before using ldap_search() and
ldap_get_entries(), otherwise return an empty array.

Signed-off-by: Benjamin Diele <benjamin@diele.be>
2012-05-28 17:54:38 +04:00
Thomas Tanghus 817f9ff57d Contacts: Fix XSS. 2012-05-28 14:42:57 +02:00
Thomas Tanghus cf113409ad Contacts: Fix XSS. 2012-05-28 14:41:48 +02:00
Frank Karlitschek 1eebbaebdb Merge branch 'master' of gitorious.org:owncloud/owncloud 2012-05-28 13:59:47 +02:00
Frank Karlitschek c79a529edd remove not needed includes 2012-05-28 13:57:45 +02:00
Thomas Tanghus df5bdc8e42 Contacts: Double check XSS, and fix a rookie error ;-) 2012-05-28 13:19:31 +02:00
Thomas Tanghus 53da328aa1 Contacts: Double check XSS. 2012-05-28 12:56:56 +02:00
Thomas Tanghus 8bd6d862b8 Please don't tell me I did that :-P 2012-05-28 12:52:18 +02:00
Georg Ehrke 5b7ef90d3a add urlencode for caldav link 2012-05-28 10:50:10 +02:00
Georg Ehrke 5e7b318e42 add urlencode for caldav link 2012-05-28 10:49:27 +02:00
Georg Ehrke b14f2d0388 update When 2012-05-27 12:31:51 +02:00
Georg Ehrke 94c633b6b7 Merge branch 'master' into oc_error 2012-05-26 22:54:49 +02:00
Georg Ehrke 459114b994 Merge branch 'master' into calendar_repeat 2012-05-26 22:54:24 +02:00
Robin Appelman 3db5fb891c allow longer paths for gallery 2012-05-26 21:54:49 +02:00
Robin Appelman 143287738a allow longer paths for gallery 2012-05-26 21:50:54 +02:00
Frank Karlitschek 54c421f384 check during ownCloud upgrade if all the installed apps are compatible with the new ownCloud version. Disable them if not 2012-05-26 20:40:12 +02:00
Frank Karlitschek 982cde0bb1 check during ownCloud upgrade if all the installed apps are compatible with the new ownCloud version. Disable them if not 2012-05-26 20:37:10 +02:00
Frank Karlitschek a945fa10a6 update copyright 2012-05-26 19:14:24 +02:00
Arthur Schiwon d2369b6e96 LDAP: support for 'member' as group-member-association 2012-05-26 16:38:37 +02:00
Georg Ehrke 1645f77aad fix share for users with a point within their name 2012-05-26 15:41:32 +02:00
Georg Ehrke a1c9191006 fix share for users with a point within their name 2012-05-26 15:23:46 +02:00
Brice Maron 85dbfc8165 Correct small typo to Crypt_Blowfish 3drparty fix oc-810 2012-05-25 22:18:02 +00:00
BlackEagle c704e8077f remote.php :: use non apache-only env vars
- fixes following error when using nginx + php-fpm

[error] *6568 FastCGI sent in stderr: "PHP message:
PHP Warning:  strpos(): Offset not contained in string in
/some-path/owncloud/remote.php on line 10"

Signed-off-by: BlackEagle <ike.devolder@gmail.com>
2012-05-25 21:08:04 +02:00
Frank Karlitschek dfd5a9759c only enable compatible apps 2012-05-25 11:31:46 +02:00
Brice Maron 2774ff1ad8 Add HEAD request management for files ajax/download.php 2012-05-25 11:19:38 +02:00
Georg Ehrke 79bf933319 Merge branch 'master' into oc_error 2012-05-25 10:30:44 +02:00
Georg Ehrke bc9accd26e Merge branch 'master' into calendar_repeat 2012-05-25 10:30:00 +02:00
Brice Maron 9c2a6fb551 Add HEAD request management for files ajax/download.php 2012-05-24 22:48:10 +00:00
Brice Maron 5fa14806c8 Add translation for error message 2012-05-24 19:16:00 +00:00
Brice Maron 2c9311cf48 Add error message when uploading folder or null files. ref oc-739 2012-05-24 18:47:34 +00:00
Robin Appelman a1539dace7 share code between smb and ftp filestorage backends 2012-05-24 19:41:32 +02:00
Brice Maron f00a50c76a Add pending line in file list before trying to upload. Correct indentation 2012-05-24 16:56:19 +00:00
Robin Appelman 2f40f11c87 smb filestorage backend 2012-05-24 18:23:59 +02:00
Michael Gapczynski bee724c53e Initial work on UI for mounting external storage 2012-05-24 11:06:03 -04:00
Michael Gapczynski d8ca4f78cf Fix private link sharing via email, fix for bug oc-750 2012-05-23 19:36:39 -04:00
Michael Gapczynski 970124a90b Fix private link sharing via email, fix for bug oc-750 2012-05-23 19:35:29 -04:00
Frank Karlitschek 24318354f2 changed the default from Berlin to UTC.
Greetings form Berlin by the way ;-)
2012-05-24 00:49:21 +02:00
Frank Karlitschek f97f1b4266 use UTC instead of Berlin as default 2012-05-24 00:47:03 +02:00
Brice Maron 20e9903396 Correct small style problem with task app fix #oc-689 2012-05-23 22:36:36 +00:00
Brice Maron 97d682dc13 Correct small style problem with task app fix #oc-689 2012-05-23 21:02:34 +00:00
Robin Appelman 60fdc13ae6 enable running unit tests from cli 2012-05-22 20:22:53 +02:00
Sam Tuke 3fee3a4633 Merge branch 'unstable' of gitorious.org:owncloud/owncloud into unstable 2012-05-22 14:44:40 +01:00
Sam Tuke 27f7dae932 removed closing php tag 2012-05-22 13:42:55 +01:00
Florian Hülsmann d2e2a2b2c0 prevent apps from printing output from app.php 2012-05-22 13:10:42 +02:00
Frank Karlitschek 647888eea2 add a ldap encryption warning 2012-05-22 12:35:28 +02:00