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

2758 commits

This branch
This branch
All branches
Author SHA1 Message Date
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
3eff161bbf OC_Image: Use valid function instead of checking the resource 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
192b8906a3 Add copyright to OC_Connector_Sabre_Principal 2012-02-12 15:14:23 +01:00
Frank Karlitschek
95e7be4aec Merge branch 'master' of gitorious.org:owncloud/owncloud 2012-02-12 00:02:14 +01:00
Frank Karlitschek
5408a26234 add a README 2012-02-12 00:01:46 +01:00
Michael Gapczynski
6929652e14 Redirect to installer if not installed 2012-02-11 17:37:47 -05:00
Frank Karlitschek
26a5c13906 Merge branch 'master' of gitorious.org:owncloud/owncloud 2012-02-11 23:26:42 +01:00
Frank Karlitschek
340b6bf3ad add themeing support and support for autoselection of mobile/tablet and standalone css/jss files and templates 2012-02-11 23:25:35 +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
Klaas Freitag
85853f9ec2 - Added the ability to change a files mtime via webdavs propset. 
- Added some minor debug help to fscache
 2012-02-10 11:30:38 +01:00
Bart Visscher
9379c3e128 Gallery: remove unset call, not needed anymore 2012-02-09 22:47:05 +01:00
Bart Visscher
8684e847b0 OC_Image: change static vars to object vars 2012-02-09 22:44:26 +01:00
Robin Appelman
b4d84bd9bb dont try to remove buffers, can cause trouble with strict warnings 2012-02-09 19:53:02 +01:00
Robin Appelman
c4864b4a54 don't use PDO::inTransaction 2012-02-09 19:53:02 +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
Robin Appelman
25381ac5b1 fix filecache with MDB2 2012-02-08 21:39:09 +01:00
Robin Appelman
398fbe7b82 use fetchRow instead of fetch 2012-02-08 21:26:45 +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
24748ee10f add convinience function to get filesystem view for app storage 2012-02-08 21:01:09 +01:00
Robin Appelman
c4a6b99814 use oc_filecache and oc_eventsource for music scanning 2012-02-08 17:30:16 +01:00
Robin Appelman
bcebfbfbe2 bugfix in searching files by mimetype 2012-02-08 17:29:54 +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