wbrawner/server
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions
2761 commits 157 branches 562 tags 714 MiB
Commit graph

1149 commits

Author SHA1 Message Date
Bart Visscher
39f342d595 Contacts: Move debug logging of $_POST to after access checks 2012-02-12 15:58:55 +01:00
Bart Visscher
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
Bart Visscher
b77132edbe Contacts: Save last-modified time in REV property if not set 2012-02-12 15:14:25 +01:00
Bart Visscher
6bd0aad117 Contacts: Fix adding N property in getContactVCard 2012-02-12 15:14:24 +01:00
Bart Visscher
facd4cbe17 Contacts: Cleanup photo and thumbnail code 2012-02-12 15:14:24 +01:00
Bart Visscher
90d189a8b3 Access check fix in contacts/ajax/activation.php 
plus small cleanup
 2012-02-12 15:14:24 +01:00
Bart Visscher
8f3da6ee9b Small coding style update 
Fixup OC_Contacts_App
 2012-02-12 15:14:23 +01:00
Bart Visscher
1a74f0a18c Improve logging in OC_Contacts_App 
Add logging to errors paths in getAddressbook and getContactObject.
 2012-02-12 15:14:23 +01:00
Bart Visscher
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
Bart Visscher
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
Thomas Tanghus
1d6b4f8f3c Merge branch 'tanghus_contacts' 2012-02-10 16:44:06 +01:00
Thomas Tanghus
b4924ed1e5 Variable wasn't reset. 2012-02-10 16:43:40 +01:00
Thomas Tanghus
fd9ce6da35 Merge gitorious.org:owncloud/owncloud into tanghus_contacts 2012-02-10 16:42:45 +01:00
Thomas Tanghus
c95e8a1fc5 Added custom combobox widget. 2012-02-10 16:40:40 +01:00
Bart Visscher
9379c3e128 Gallery: remove unset call, not needed anymore 2012-02-09 22:47:05 +01:00
Thomas Tanghus
25f1263c11 Merge gitorious.org:owncloud/owncloud into tanghus_contacts 2012-02-09 19:07:54 +01:00
Thomas Tanghus
ff53b0c209 Keep js data structure in sync on changes. 
More checks for missing properties.
 2012-02-09 19:04:07 +01:00
Bart Visscher
88b2391d2b Fix wrong var name in sharedstorage.php 2012-02-08 21:12:31 +01:00
Bart Visscher
7cd1a302d3 Gallery: Add caching headers to album thumbnail sending 2012-02-08 21:12:31 +01:00
Bart Visscher
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
Bart Visscher
43d2266f5c Add caching to gallery thumbnail generation 2012-02-08 21:12:30 +01:00
Bart Visscher
eb5de4d4f7 Change gallery thumbnail generation to OC_Image 2012-02-08 21:12:30 +01:00
Bart Visscher
7c03b612d2 OC-41: [Calendar] Date format not translatable 2012-02-08 21:12:30 +01:00
Robin Appelman
c4a6b99814 use oc_filecache and oc_eventsource for music scanning 2012-02-08 17:30:16 +01:00
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
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
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
36bc1a2102 Merge branch 'master' into filesystem 2012-02-05 01:22:29 +01:00