Commit graph

5361 commits

Author SHA1 Message Date
Bjoern Schiessle
ab036d4764 webdav client crashes for secure connections if he doesn't have the right root certificate for ssl verification. For the moment I print at least a useful error message to the OC log and the Apache log 2012-07-02 17:52:51 +02:00
Arthur Schiwon
515adceace LDAP: reset resource on failed bind
check for resource
2012-07-02 14:03:29 +02:00
Lukas Reschke
90331a3fa1 Remove forced download 2012-07-02 12:20:43 +02:00
Lukas Reschke
f5e0e5587d Merge branch 'master' of gitorious.org:owncloud/owncloud 2012-07-02 10:25:53 +02:00
Lukas Reschke
f8cebed348 Don't display error messages 2012-07-02 10:24:22 +02:00
Georg Ehrke
e4960c3bb4 fix a small PHP fail 2012-07-02 10:23:32 +02:00
Georg Ehrke
5ff72f2cd7 fix a small PHP fail 2012-07-01 21:51:46 +02:00
Michael Gapczynski
eca2e073f8 Don't reload the page after sending private link to email address 2012-07-01 11:54:32 -04:00
Michael Gapczynski
7ceba61413 Revert "bugfix for #1098 (assigning a group to a user, the group appears incrementally many times the more you assign it)"
This reverts commit 265d7e50f5.
2012-07-01 11:29:02 -04:00
Lukas Reschke
4e63981da9 Disable mimesniffing 2012-07-01 13:45:20 +02:00
Tom Needham
b2cb7d54d1 Fixed app path 2012-06-30 22:56:47 +00:00
Tom Needham
cfc78d44bb Return correct json response, fix syntax 2012-06-30 22:56:47 +00:00
Tom Needham
c7a4075aaa Updates contacts migration provider 2012-06-30 22:56:47 +00:00
Georg Ehrke
fa5b31ac9c fix documentation style 2012-06-30 17:09:20 +02:00
Florian Hülsmann
4ed55315e7 fixed linkTo() 2012-06-30 16:53:41 +02:00
Georg Ehrke
8e0addebc3 fix some doc 2012-06-30 15:39:20 +02:00
Georg Ehrke
34b2486d53 some improvements for calendar export 2012-06-30 15:23:21 +02:00
Tom Needham
51173163ce Contacts: align the bottom control buttons 2012-06-30 11:22:09 +00:00
Tom Needham
704a1c655e Contacts: fix add contact icon path 2012-06-30 11:07:54 +00:00
Georg Ehrke
6e6f90a8a2 fix merge conflicts 2012-06-30 12:44:51 +02:00
Michael Gapczynski
edc6a648d1 Fix placeholder value for optional fields in external storage UI 2012-06-29 19:35:57 -04:00
Robin Appelman
2c35e185f7 make sure the filesystem is setup properly for oc_cache_file tests 2012-06-30 01:14:01 +02:00
Robin Appelman
d43ed43b5a cant to ttl tests for xcache 2012-06-30 01:13:33 +02:00
Robin Appelman
252453cd34 fix encryption test cases when not logged in 2012-06-30 01:05:18 +02:00
Michael Gapczynski
c992482e92 Prevent duplicate group showing in multiselect that added the group 2012-06-29 17:52:44 -04:00
Thomas Tanghus
a4614f83ff Don't add duplicate contacts in the list when en-/disable an address book. 2012-06-29 23:18:47 +02:00
Michael Gapczynski
8e4832bd12 Prevent adding a duplicate to a multiselect 2012-06-29 16:44:08 -04:00
Michael Gapczynski
05cb94801a Add new group to other user's group select forms 2012-06-29 16:29:58 -04:00
Michael Gapczynski
719c7f7f6e Fix WebDAV external storage opendir() and stat() for directories, bug fix for oc-1160 2012-06-29 13:01:00 -04:00
Bart Visscher
3ed7738d5e Increment user_openid version to load new app type 2012-06-29 18:38:04 +02:00
Bart Visscher
f61793aa14 Coding style fixes 2012-06-29 18:38:04 +02:00
Bart Visscher
2b4ecbaba0 Whitespace fixes 2012-06-29 18:38:04 +02:00
Georg Ehrke
652a874fa6 fix displaying of events 2012-06-29 18:13:52 +02:00
Georg Ehrke
3bcf176a53 add some hooks to fix calendar sharing 2012-06-29 17:27:29 +02:00
Michael Gapczynski
7e9455c382 Allow multiple Google Drive and Dropbox external storages to be configured 2012-06-29 11:22:54 -04:00
Michael Gapczynski
2d49a491fb Clear the mount point value for the new mount point row 2012-06-29 11:10:51 -04:00
Michael Gapczynski
f311c2a2ff Hide the delete button on new mount point row 2012-06-29 11:10:51 -04:00
Bjoern Schiessle
94add1c000 typo fixed 2012-06-29 16:49:22 +02:00
Georg Ehrke
bda0026374 fix birthday calendar 2012-06-29 15:43:18 +02:00
Bjoern Schiessle
b95996c02c - when creating a new text file or directory which name already exist use the same pattern as for file uploads in such a case (add a (N) to the name)
- don't allow renaming if a file/directory with the name already exists
2012-06-29 15:23:04 +02:00
Bjoern Schiessle
60ec46f706 - remove leading http[s] to let createBaseUri() generate secure/unsecure base URI
- if secure is set to true add 's' to http
2012-06-29 12:01:23 +02:00
Frank Karlitschek
bd908affa3 Merge branch 'master' of gitorious.org:owncloud/owncloud 2012-06-29 11:08:43 +02:00
Frank Karlitschek
6917d74193 move the ownCloud version to admin which makes more sense. A normal user can´t update ownCloud anyways. 2012-06-29 11:07:41 +02:00
Robin Appelman
75af5778a4 pass progresskey the correct way during calender import 2012-06-29 00:49:37 +02:00
Michael Gapczynski
31bba86e87 Fix external storage UI for Admin page 2012-06-28 17:55:22 -04:00
Bart Visscher
1ccbbfad53 Spelling fix 2012-06-28 22:11:04 +02:00
Bart Visscher
02e4e0e08f Gallery: Get all the image information for a directory at once 2012-06-28 22:11:04 +02:00
Bart Visscher
bf09edcbf1 Remember the app root information. 2012-06-28 22:11:04 +02:00
Bart Visscher
19bb4e83c9 Remove redundant code from OC_Helper::linkTo 2012-06-28 22:11:04 +02:00
Brice Maron
b2cbf1199d Pg setup enhancement
do not create a db if already existing .. and reset the user password instead of creating if the user already exists
2012-06-28 19:38:03 +00:00