Commit graph

2972 commits

Author SHA1 Message Date
Robin Appelman
36d696c30d dont load pdfview for ie 2012-02-08 16:28:59 +01:00
Robin Appelman
5f7727629a Merge branch 'filesystem' 2012-02-08 15:50:58 +01:00
Thomas Tanghus
25faa40bd0 More @£#¤ conflicts
Merge branch 'temp' into tanghus_contacts
2012-02-08 09:36:16 +01:00
Thomas Tanghus
f4a586a52c Fix merge conflicts 2012-02-08 09:18:58 +01:00
Thomas Tanghus
c191ef6459 Added files for new contact editor/viewer. 2012-02-08 09:14:10 +01:00
Thomas Tanghus
0c5eb542bd Fixed broken "Add new" contact.
Possible fix for cards with missing 'FN' property added through DAV.
Misc. UI cleanups.
2012-02-08 08:47:03 +01:00
Thomas Tanghus
6112cdc7e8 Hide container for emails/phones/adresses if there are none. 2012-02-08 08:47:03 +01:00
Thomas Tanghus
9f1370a6d1 Updated copyrights.
Element menu didn't update.
2012-02-08 08:47:03 +01:00
Thomas Tanghus
c0c6b5310e Added files for new contact editor/viewer. 2012-02-08 08:47:03 +01:00
Thomas Tanghus
3e9a69b9b7 Merge branch 'tanghus_contacts' of gitorious.org:owncloud/owncloud into tanghus_contacts
Conflicts:
	apps/contacts/ajax/contactdetails.php
	apps/contacts/js/contacts.js
2012-02-08 08:33:51 +01:00
Thomas Tanghus
424c64c0eb Don't import cards that can't be parsed by Sabre, but log it instead.
Fix missing 'N' or 'FN' fields on import.
2012-02-08 07:59:39 +01:00
Thomas Tanghus
249e46c5b7 Some fixes for malformed VCards. 2012-02-08 07:59:39 +01:00
Thomas Tanghus
4db661ba9d Fixed broken "Add new" contact.
Possible fix for cards with missing 'FN' property added through DAV.
Misc. UI cleanups.
2012-02-08 07:59:39 +01:00
Thomas Tanghus
23396721e4 Hide container for emails/phones/adresses if there are none. 2012-02-08 07:59:39 +01:00
Thomas Tanghus
1e4444f25b Updated copyrights.
Element menu didn't update.
2012-02-08 07:59:39 +01:00
Thomas Tanghus
90a830baba Added files for new contact editor/viewer. 2012-02-08 07:59:39 +01:00
Georg Ehrke
cdf1cf82ba merge 64a617b2a1 into master 2012-02-07 22:49:23 +01:00
Robin Appelman
e50dfbc228 fix filecache when creating a new folder 2012-02-06 19:33:37 +01:00
Thomas Tanghus
2cebfb50a4 Fixed broken "Add new" contact.
Possible fix for cards with missing 'FN' property added through DAV.
Misc. UI cleanups.
2012-02-06 14:18:40 +01:00
Thomas Tanghus
5962e66b6d Hide container for emails/phones/adresses if there are none. 2012-02-06 08:15:23 +01:00
Thomas Tanghus
bc79951f33 Updated copyrights.
Element menu didn't update.
2012-02-06 08:04:06 +01:00
Thomas Tanghus
3af427fa54 Added files for new contact editor/viewer. 2012-02-06 07:32:57 +01:00
Thomas Tanghus
89616d81f0 Modification for adding photos. 2012-02-06 07:24:39 +01:00
Robin Appelman
9f3388ecbc store writable flag for files 2012-02-05 14:04:10 +01:00
Robin Appelman
30673e4786 writable not writeable 2012-02-05 14:03:44 +01:00
Georg Ehrke
89073970d3 change comments in import.php 2012-02-05 12:13:53 +01:00
Georg Ehrke
8337eaa1ec add import function for contacts 2012-02-05 12:13:53 +01:00
Robin Appelman
25e777ef5e watch for changes outside owncloud to the files 2012-02-05 03:06:33 +01:00
Robin Appelman
90c4666b12 fix bug in transactions with PDO 2012-02-05 01:24:06 +01:00
Robin Appelman
0bb48d814b fix bug in transactions with PDO 2012-02-05 01:23:41 +01:00
Robin Appelman
7c00aedc37 some improvements in file scanning 2012-02-05 01:23:04 +01:00
Robin Appelman
36bc1a2102 Merge branch 'master' into filesystem 2012-02-05 01:22:29 +01:00
Tom Needham
493ba20734 Updated readme url for install instructions 2012-02-04 23:40:47 +00:00
Bartek Przybylski
cfc710e768 preferences store fix 2012-02-04 20:15:55 +01:00
Bartek Przybylski
f6a27dfa28 stripping root from gallery name 2012-02-04 15:35:58 +01:00
Bartek Przybylski
f1672d7d10 handling special chars in dirnames 2012-02-04 11:02:13 +01:00
Bartek Przybylski
5a106d1036 gallery: fix FS hooks 2012-02-04 10:30:32 +01:00
Bartek Przybylski
8df0650658 gallery settings, defining scan root and shor order 2012-02-03 21:38:44 +01:00
Bartek Przybylski
ee01d1a81d removing console error in safari for bookmarks 2012-02-03 21:37:09 +01:00
Georg Ehrke
ab31a890b6 use strip_tags for calendar names 2012-02-02 21:23:41 +01:00
Robin Appelman
05d76dcd67 allow the usage of the filecache outside of the users home folder 2012-02-02 19:04:13 +01:00
Georg Ehrke
bfa69c3e59 add a label calendar to the settings page - bugfix for oc-157 2012-02-02 18:37:06 +01:00
Thomas Tanghus
6225b5ec86 More in-/output sanitation, 2012-02-02 17:54:30 +01:00
Thomas Tanghus
66b96e4440 Sanitize in- and output. 2012-02-02 17:54:30 +01:00
Robin Appelman
7b9fb84fe9 Merge branch 'master' into filesystem 2012-02-02 17:30:54 +01:00
Georg Ehrke
92b8f32386 Calendar: Bugfix: better input validation 2012-02-02 15:01:05 +01:00
Bartek Przybylski
f198296576 gallery works in safari now 2012-02-01 22:15:46 +01:00
Marvin Thomas Rabe
f999fbf81a Bookmark layout updated 2012-02-01 22:02:06 +01:00
Marvin Thomas Rabe
bbd10a3c94 Bookmark layout updated 2012-02-01 21:19:31 +01:00
Marvin Thomas Rabe
e4faea8f90 Fixed upload button display error 2012-02-01 20:58:04 +01:00