d9914664f6
Text editor display error fixed.
2012-02-22 16:04:31 +01:00
b3f3b8c23f
UI problems solved. Bookmarks app updated.
2012-02-22 16:04:31 +01:00
ed0c99ef14
make sure we always have the encryption key unlocked
2012-02-22 15:18:22 +01:00
1a9ded981b
Merge branch 'master' into enc
2012-02-22 14:26:52 +01:00
faf6055baa
Translate and fix copy/paste error.
2012-02-22 14:19:23 +01:00
9794e7e427
Fix merge conflict.
2012-02-22 11:20:57 +01:00
c5c843bfef
Improved upgrading VCARD v. 2.1 => 3.0. Improved import of malformed cards. Remove duplicate code.
2012-02-21 23:22:06 +01:00
e0c92662f8
JS fix on address book creation.
2012-02-21 23:22:06 +01:00
a79f5d40de
Remove my FIXME comments when I've fixed it :-P
2012-02-21 23:22:06 +01:00
c20319d377
fix incorrect information in the filecache when using encryption
2012-02-21 20:48:49 +01:00
d9c7e4c333
proper mimetypes for encrypted files
2012-02-21 20:48:48 +01:00
325858e9e2
add stream wrapper for in-memory files and dont use global variables for the fakedir stream wrapper
2012-02-21 20:48:48 +01:00
c121a1a1e7
implement file_put_contents with stream data using fopen
2012-02-21 20:48:48 +01:00
6a8364c3ff
rework the way file_put_contents is handeled
2012-02-21 20:48:48 +01:00
b3a974d8bb
only trigger hooks for the default filesystem view
2012-02-21 20:48:48 +01:00
f1cbb9effc
initial integration of encryption
2012-02-21 20:48:48 +01:00
e2b4954176
simple file encryption wip
2012-02-21 20:48:48 +01:00
3d67cd51c2
encryption proxy wip
2012-02-21 20:48:47 +01:00
d3e6ea6ac0
Bookmarks: uses the core action icons
2012-02-21 20:28:24 +01:00
86d2927c02
Calendar: Correct calendarcolor format for ical color property
2012-02-21 20:10:40 +01:00
21f8d0992f
Added missing files
2012-02-21 18:29:49 +01:00
7a49c8e59c
Merge gitorious.org:owncloud/owncloud into vcategories
2012-02-20 23:42:06 +01:00
d5f7a39936
Contact list scroll fix
2012-02-20 23:54:23 +03:00
ffdfe8257b
Contacts: Fix adding/updating address book with empty name.
2012-02-20 15:24:54 +01:00
456ada01fa
Contacts: Apply strip_tags on compound values.
2012-02-20 14:36:21 +01:00
12bcbcdc62
Update ctag in deleteFromDAVData.
2012-02-20 14:24:10 +01:00
8ed4262393
Merge gitorious.org:owncloud/owncloud into vcategories
2012-02-20 13:18:22 +01:00
7ff4e40b20
Combing LDAP backend with LDAP extended backend
2012-02-20 10:39:55 +01:00
490c9db15d
Added bookmarklet for browser. Inspired by Google Bookmarks
2012-02-19 20:18:27 -05:00
c62673d360
Added public static OC_VCategories object to OC_Contacts_App.
...
Parse cards for new categories in add and edit methods.
2012-02-19 23:32:09 +01:00
9d2379742b
apps/calendar: update ctag after deleteFromDAVData
...
Without this clients won't see the update because they compare ctags
before fetching the actual calendar to reduce traffic.
Signed-off-by: Florian Pritz <bluewind@xinu.at>
2012-02-19 21:42:47 +01:00
87627c7a50
Fix overwriting of internal sharing for shared folders - bug oc-260
2012-02-18 19:30:54 -05:00
71a2241aee
Fixed call to OC_User. Thanks Burillo on IRC
2012-02-18 23:53:10 +00:00
2ee2f87efe
Strip tags on address on client side.
2012-02-18 11:49:31 +01:00
868cf6bb83
Avoid errors from missing GD library.
2012-02-18 11:49:31 +01:00
96612c506e
Removed obsolete commented code and made minor speed improvements.
...
Added stub function for loading categories.
2012-02-18 11:49:31 +01:00
6f1ed85f0b
Temporary fix for sharing files
2012-02-17 21:56:20 -05:00
6bbd67c3c6
Calendar: only update default view when it really changed
2012-02-17 22:10:02 +01:00
539fd7240c
Calendar: optimize sending calendar events, also enabled caching of result
2012-02-17 22:09:31 +01:00
a33b757b19
Calendar: Add default repeat values when editing a non-repeating event
2012-02-17 22:09:22 +01:00
dab5531474
Bookmarks: Fix image urls in bookmarks.js
2012-02-17 22:07:15 +01:00
e8b69d45a3
Fixup use of OC_Helper::linkTo function
2012-02-17 22:07:14 +01:00
f47444e1f7
Use separate function to make absolute urls
2012-02-17 22:07:14 +01:00
5f3c549227
Contacts: Add removed app enabled check
2012-02-17 22:07:14 +01:00
86893ea78c
UI tweaks for name selector combobox.
2012-02-16 10:38:00 +01:00
fa7fabf024
Minor tweaks
2012-02-16 10:38:00 +01:00
e6b835bea8
Update breadcrumb css on close
2012-02-14 21:55:51 +00:00
aec6a3c32f
Fix editing shared files and file opening bug. Fixes oc-209 and oc-195
2012-02-14 21:49:51 +00:00
31dab0372d
Added some fixes for what to show when address books are (de)selected, all contacts deleted etc. Still need some cleaning up.
2012-02-14 13:57:11 +01:00
ae426ad115
Added some check for when addinf deleting contacts.
2012-02-14 10:36:22 +01:00
f7161bb48b
Added some error checking as mentioned in http://bugs.owncloud.org/thebuggenie/owncloud/issues/oc-227
2012-02-14 02:15:21 +01:00
dc20900e10
Modify check for missing UID.
2012-02-14 01:56:38 +01:00
53503148f3
Use proper index file.
2012-02-14 01:47:18 +01:00
4446854f75
Don't try to load a profile picture for contacts the doesn't have any.
2012-02-14 01:11:21 +01:00
07c422d81d
Removed superfluous debug.
2012-02-14 01:02:01 +01:00
3adaacc0ce
Added OC_Contacts_VCard::moveToAddressBook
2012-02-14 01:00:41 +01:00
024405e4f1
Added function for later testing.
2012-02-14 01:00:41 +01:00
a37bd93222
External: Use OC_Util::checkLoggedIn
2012-02-14 00:13:04 +01:00
777804fac2
Gallery: remove unused cover.php
2012-02-14 00:12:22 +01:00
525306c1e2
Replace Expires and caching headers by OC_Response functions
2012-02-13 23:48:05 +01:00
29fc82c364
Send gallery album thumbnail with OC_Response::sendFile
2012-02-13 23:35:37 +01:00
594dcf13f2
Contacts+OC_Respone: Move enableCaching out of setEtagHeader and setLastModifiedHeader
2012-02-13 22:47:31 +01:00
169ddc5b0b
Gallery: Only get local file when generating photo thumbnail
2012-02-13 22:39:30 +01:00
e137020f67
Gallery: Use OC_Respone::enableCaching for (album)thumbnails
2012-02-13 22:38:34 +01:00
e084386770
Gallery: Move login check to beginning of galleryOp.php
2012-02-13 22:33:52 +01:00
e402896001
Gallery: Remove autoloaded includes from galleryOp.php
2012-02-13 22:33:48 +01:00
40d343e2af
fix oc-bug 239 - & => &
2012-02-12 22:34:10 +01:00
5c816c0cc9
Contacts: Optimize thumbnail cache handling a bit
2012-02-12 20:40:52 +01:00
125cf79a37
OC_Response: add setExpiresHeader function
2012-02-12 20:40:52 +01:00
45bb6f5fd4
OC_Response: add redirect function
2012-02-12 20:40:52 +01:00
ee7931f457
Contacts: Add missing parameter
2012-02-12 20:40:52 +01:00
0917bdecdd
Contacts: Move response caching to OC_Response
2012-02-12 17:21:33 +01:00
a0bb6079c5
Add description to texteditor info.xml -fix oc-234
2012-02-12 15:42:05 +00:00
f5385e4a63
Contacts: Add id to vars with id in them
2012-02-12 16:12:46 +01:00
623afb69b6
Contacts: cleanup OC_L10N usage
2012-02-12 16:11:41 +01:00
39f342d595
Contacts: Move debug logging of $_POST to after access checks
2012-02-12 15:58:55 +01:00
6eb1427ac0
Contacts: Document usage of OC_Contacts_App::getAddressbook
...
Remove redundant access checks and add comments to the calls to
OC_Contacts_App::getAddressbook that are access checks
2012-02-12 15:55:36 +01:00
b77132edbe
Contacts: Save last-modified time in REV property if not set
2012-02-12 15:14:25 +01:00
6bd0aad117
Contacts: Fix adding N property in getContactVCard
2012-02-12 15:14:24 +01:00
facd4cbe17
Contacts: Cleanup photo and thumbnail code
2012-02-12 15:14:24 +01:00
90d189a8b3
Access check fix in contacts/ajax/activation.php
...
plus small cleanup
2012-02-12 15:14:24 +01:00
8f3da6ee9b
Small coding style update
...
Fixup OC_Contacts_App
2012-02-12 15:14:23 +01:00
1a74f0a18c
Improve logging in OC_Contacts_App
...
Add logging to errors paths in getAddressbook and getContactObject.
2012-02-12 15:14:23 +01:00
c4ee924869
Cleanup OC_Contacts_Addressbook::find usage
...
Use OC_Contacts_App::getAddressbook($id) instead of OC_Contacts_Addressbook::find($id), it contains access checks.
2012-02-12 15:14:23 +01:00
b5418173e5
Derive the user principles from the owncloud users
...
The code for updating the principles table is still there. To make it easier to
revert this commit if that is necessary.
2012-02-11 21:09:51 +01:00
1d6b4f8f3c
Merge branch 'tanghus_contacts'
2012-02-10 16:44:06 +01:00
b4924ed1e5
Variable wasn't reset.
2012-02-10 16:43:40 +01:00
fd9ce6da35
Merge gitorious.org:owncloud/owncloud into tanghus_contacts
2012-02-10 16:42:45 +01:00
c95e8a1fc5
Added custom combobox widget.
2012-02-10 16:40:40 +01:00
9379c3e128
Gallery: remove unset call, not needed anymore
2012-02-09 22:47:05 +01:00
25f1263c11
Merge gitorious.org:owncloud/owncloud into tanghus_contacts
2012-02-09 19:07:54 +01:00
ff53b0c209
Keep js data structure in sync on changes.
...
More checks for missing properties.
2012-02-09 19:04:07 +01:00
88b2391d2b
Fix wrong var name in sharedstorage.php
2012-02-08 21:12:31 +01:00
7cd1a302d3
Gallery: Add caching headers to album thumbnail sending
2012-02-08 21:12:31 +01:00
158360c09b
Gallery: use thumbnails of images for the album thumbnail
...
The thumbnails were already generated in this function, but now we save them
for displaying of the album.
2012-02-08 21:12:31 +01:00
43d2266f5c
Add caching to gallery thumbnail generation
2012-02-08 21:12:30 +01:00
eb5de4d4f7
Change gallery thumbnail generation to OC_Image
2012-02-08 21:12:30 +01:00
7c03b612d2
OC-41: [Calendar] Date format not translatable
2012-02-08 21:12:30 +01:00
c4a6b99814
use oc_filecache and oc_eventsource for music scanning
2012-02-08 17:30:16 +01:00
36d696c30d
dont load pdfview for ie
2012-02-08 16:28:59 +01:00
5f7727629a
Merge branch 'filesystem'
2012-02-08 15:50:58 +01:00
25faa40bd0
More @£#¤ conflicts
...
Merge branch 'temp' into tanghus_contacts
2012-02-08 09:36:16 +01:00
f4a586a52c
Fix merge conflicts
2012-02-08 09:18:58 +01:00
c191ef6459
Added files for new contact editor/viewer.
2012-02-08 09:14:10 +01:00
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
6112cdc7e8
Hide container for emails/phones/adresses if there are none.
2012-02-08 08:47:03 +01:00
9f1370a6d1
Updated copyrights.
...
Element menu didn't update.
2012-02-08 08:47:03 +01:00
c0c6b5310e
Added files for new contact editor/viewer.
2012-02-08 08:47:03 +01:00
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
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
249e46c5b7
Some fixes for malformed VCards.
2012-02-08 07:59:39 +01:00
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
23396721e4
Hide container for emails/phones/adresses if there are none.
2012-02-08 07:59:39 +01:00
1e4444f25b
Updated copyrights.
...
Element menu didn't update.
2012-02-08 07:59:39 +01:00
90a830baba
Added files for new contact editor/viewer.
2012-02-08 07:59:39 +01:00
cdf1cf82ba
merge 64a617b2a1 into master
2012-02-07 22:49:23 +01:00
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
5962e66b6d
Hide container for emails/phones/adresses if there are none.
2012-02-06 08:15:23 +01:00
bc79951f33
Updated copyrights.
...
Element menu didn't update.
2012-02-06 08:04:06 +01:00
3af427fa54
Added files for new contact editor/viewer.
2012-02-06 07:32:57 +01:00
89616d81f0
Modification for adding photos.
2012-02-06 07:24:39 +01:00
30673e4786
writable not writeable
2012-02-05 14:03:44 +01:00
89073970d3
change comments in import.php
2012-02-05 12:13:53 +01:00
8337eaa1ec
add import function for contacts
2012-02-05 12:13:53 +01:00
36bc1a2102
Merge branch 'master' into filesystem
2012-02-05 01:22:29 +01:00
cfc710e768
preferences store fix
2012-02-04 20:15:55 +01:00
f6a27dfa28
stripping root from gallery name
2012-02-04 15:35:58 +01:00
f1672d7d10
handling special chars in dirnames
2012-02-04 11:02:13 +01:00
5a106d1036
gallery: fix FS hooks
2012-02-04 10:30:32 +01:00
8df0650658
gallery settings, defining scan root and shor order
2012-02-03 21:38:44 +01:00
ee01d1a81d
removing console error in safari for bookmarks
2012-02-03 21:37:09 +01:00
ab31a890b6
use strip_tags for calendar names
2012-02-02 21:23:41 +01:00
bfa69c3e59
add a label calendar to the settings page - bugfix for oc-157
2012-02-02 18:37:06 +01:00
6225b5ec86
More in-/output sanitation,
2012-02-02 17:54:30 +01:00
66b96e4440
Sanitize in- and output.
2012-02-02 17:54:30 +01:00
7b9fb84fe9
Merge branch 'master' into filesystem
2012-02-02 17:30:54 +01:00
92b8f32386
Calendar: Bugfix: better input validation
2012-02-02 15:01:05 +01:00
f198296576
gallery works in safari now
2012-02-01 22:15:46 +01:00
f999fbf81a
Bookmark layout updated
2012-02-01 22:02:06 +01:00
bbd10a3c94
Bookmark layout updated
2012-02-01 21:19:31 +01:00
d514b1d92d
Merge branch 'master' into filesystem
2012-02-01 15:57:32 +01:00
6583d30e26
fix javascript
2012-02-01 15:40:59 +01:00
e229a6adec
Added searchprovider for bookmarks, initial l10n support for bookmark plugin
...
moved some code from updateList.php to bookmarks.php, to make it reusable
2012-02-01 15:40:59 +01:00
0124809a42
prevent sharing from making aditional http requests while scanning
...
additional requests to the server can block feedback of scannning depending on server configuration
2012-02-01 15:33:12 +01:00
1f718d31e1
Merge branch 'tanghus_contacts'
2012-01-31 19:35:11 +01:00
6c340416d9
Resize profile picture if bigger than 200px on either x or y.
...
Bolded text on message box.
2012-01-31 19:32:24 +01:00
3f1486534f
- Fixed http://bugs.owncloud.org/thebuggenie/owncloud/issues/oc-93
...
Property was added multiple times.
- Fixed http://bugs.owncloud.org/thebuggenie/owncloud/issues/oc-8
"Missing "N" field: Contacts app not compatible with vcard 3.0 format"
- Almost sure I've fixed http://bugs.owncloud.org/thebuggenie/owncloud/issues/oc-27
"Full name in Contacts app doesn't sync to iOS 5 contacts" because it is caused by oc-8
2012-01-31 19:30:56 +01:00
db1f77e4f5
Some reminders in the code of what I have to change post OC3.0
2012-01-31 19:30:56 +01:00
803f86e0fc
dont try to use the filesystem when it isnt setup yet
2012-01-31 12:44:01 +01:00
1191b57b34
Merge branch 'master' into filesystem
2012-01-30 23:20:47 +01:00
Marvin Thomas Rabe
Robin Appelman
Thomas Tanghus
Robin Appelman
Bart Visscher
VicDeo
Arthur Schiwon
Alessandro Cosentino
Florian Pritz
Michael Gapczynski
Tom Needham
Georg Ehrke
Bartek Przybylski
Georg Ehrke
David Iwanowitsch