Commit Graph

1538 Commits

Author SHA1 Message Date
Arthur Schiwon fa6ad6ba68 LDAP: set also quota, when there is no explicit default value 2012-03-01 14:31:06 +01:00
Arthur Schiwon b192f86d84 LDPA: fix setting variables and add missing ones to the array 2012-03-01 14:21:38 +01:00
Arthur Schiwon eb8ffd9315 LDAP fix: set user quota, if attribute is provided 2012-03-01 14:18:28 +01:00
Robin Appelman e76e4e7540 add touch() to all storage backands, and make parameter optional 2012-02-29 23:44:05 +01:00
Arthur Schiwon f040ce044c consider changed/new setting variables for user_ldap 2012-02-29 13:03:44 +01:00
Arthur Schiwon 3c72a7c934 make ldap settings a little bit less ugly 2012-02-29 12:57:11 +01:00
Bartek Przybylski 2754cac21f dialogs library for apps 2012-02-28 23:02:30 +01:00
Arthur Schiwon ea15c17149 typo in function call 2012-02-28 21:04:56 +01:00
Arthur Schiwon de642697bb make LDAP filter for user list configurable 2012-02-28 14:12:53 +01:00
Alessandro Cosentino 630cee0ef2 bookmarklets should not look like buttons 2012-02-27 18:20:40 -05:00
Georg Ehrke aae0d990ca fix baseUri of the Carddav server 2012-02-26 21:46:20 +01:00
Georg Ehrke 089c24e650 fix baseUri of the Caldav server 2012-02-26 21:44:35 +01:00
Georg Ehrke 8c09330959 add missing parameter to addEventListener function - bugfix for oc-225 2012-02-26 21:29:52 +01:00
Georg Ehrke 04c9cc6034 give users the possibility to choose between monday and sunday as first day of the week 2012-02-26 21:23:20 +01:00
Frank Karlitschek ab96fa67c8 first part of the abstraction work of the apps folder. more to come 2012-02-26 18:26:41 +01:00
Robin Appelman 8148480cfe dont enable encryption on default 2012-02-26 16:49:57 +01:00
Robin Appelman 01fcc080bb dont set the encryption flag for existing non-encrypted files 2012-02-26 15:56:47 +01:00
Robin Appelman ff0a542e48 always set encrypted flag when overwriting a file we should encrypt 2012-02-26 15:32:45 +01:00
Robin Appelman d4d09b06f8 merge master into encryption 2012-02-26 14:21:06 +01:00
Georg Ehrke 89865cb8a0 stop using 3rdparty services for timezone detection 2012-02-26 13:45:51 +01:00
Robin Appelman 0af31a5328 missed one is_writeable 2012-02-26 03:56:45 +01:00
Robin Appelman c8c3b8a63e chunked implementation for readfile
prevents memory issues when downloading large files
2012-02-26 03:54:21 +01:00
Robin Appelman 0b19af5e10 application/ogg is music to 2012-02-26 03:42:48 +01:00
Michiel de Jong a7d7597d55 fix type error in dir creation for categories 2012-02-25 23:15:31 +00:00
Michiel de Jong 42735429da bump up version and update license 2012-02-25 22:03:14 +00:00
Michiel de Jong 28650191c3 bump up version and update license 2012-02-25 22:01:04 +00:00
Michiel de Jong 820f2f27f6 security hardening in remoteStorage app 2012-02-25 21:59:58 +00:00
Michiel de Jong a1d03de666 Merge branch 'master' of gitorious.org:owncloud/owncloud 2012-02-25 21:58:59 +00:00
Bartek Przybylski 8fe5251029 unicode chars in gallery name fix 2012-02-25 20:38:22 +01:00
Robin Appelman ea8f71a19c Merge branch 'master' into encryption 2012-02-25 16:36:58 +01:00
Bartek Przybylski 3cf81cadd5 gallery thumbnail creation fix 2012-02-25 10:03:58 +01:00
Robin Appelman 7988541476 cleanup pdfviewer app name 2012-02-24 23:54:38 +01:00
Marvin Thomas Rabe 9df193f051 Calendar selection only available if there are more than one. 2012-02-23 22:28:14 +01:00
Marvin Thomas Rabe 7c738a1384 Sharing dropdown width fixed. 2012-02-23 22:28:13 +01:00
Georg Ehrke b1fb325d48 rename updatecalendar to update 2012-02-23 22:07:31 +01:00
Georg Ehrke f285790fa1 change links in the event form for the new ajax folders 2012-02-23 22:07:08 +01:00
Georg Ehrke 319e93f7fb change pathes in calendar/templates/* files to make them work with the new folder structure in /calendar/ajax 2012-02-23 22:06:43 +01:00
Georg Ehrke cfa284bfa8 update js files for new ajax pathes 2012-02-23 22:06:16 +01:00
Georg Ehrke 8cd1027214 better var name in changeview.php 2012-02-23 22:00:46 +01:00
Georg Ehrke b7de1850a0 add moved files to clean up ajax folder 2012-02-23 21:58:39 +01:00
Georg Ehrke e188b96596 remove old ajax files 2012-02-23 21:58:01 +01:00
Marvin Thomas Rabe ce4fe9e7cb Editor fixed. 2012-02-23 20:36:20 +01:00
Frank Karlitschek a62e109e8c make the location of the 3rdparty folder flexible.
It´s automatically search in the owncloud folder and in the parent folder.
override with an option in config.php is also possible
2012-02-23 15:37:38 +01:00
Marvin Thomas Rabe 196d619689 Little bookmark improvement 2012-02-22 23:58:38 +01:00
Marvin Thomas Rabe 358fd1c024 Changed text 2012-02-22 23:53:54 +01:00
Marvin Thomas Rabe 77493e8d70 Changed bookmarklet to read later widget 2012-02-22 23:52:56 +01:00
Marvin Thomas Rabe 996e6cf419 No bookmarks message will now show up if all bookmarks are delted 2012-02-22 23:28:36 +01:00
Marvin Thomas Rabe 3988ec2813 Updated bookmark form 2012-02-22 23:22:17 +01:00
Marvin Thomas Rabe 5387820a3b changed look of bookmarklet 2012-02-22 23:08:50 +01:00
Alessandro Cosentino 70f9936651 sharing code between the two bookmarklets 2012-02-22 16:38:05 -05:00
Robin Appelman 814bc2fd2b make encryption filetype blacklist configurable 2012-02-22 22:20:46 +01:00
Michiel de Jong 3f87c2cedb correct header Content-Type: application/xrd+xml 2012-02-22 19:05:41 +00:00
Michiel de Jong 9850820b42 BearerAuth and multiple tokens support in remoteStorage app 2012-02-22 18:05:52 +00:00
Michiel de Jong 6c6b570ff1 avoid notice in error log from user_webfinger app 2012-02-22 18:04:21 +00:00
Marvin Thomas Rabe fd72f2bd29 Removed redundant code. 2012-02-22 16:04:32 +01:00
Marvin Thomas Rabe e2d6bf4c63 Bookmarklet Window closes itself after submit. 2012-02-22 16:04:32 +01:00
Marvin Thomas Rabe d9914664f6 Text editor display error fixed. 2012-02-22 16:04:31 +01:00
Marvin Thomas Rabe b3f3b8c23f UI problems solved. Bookmarks app updated. 2012-02-22 16:04:31 +01:00
Robin Appelman ed0c99ef14 make sure we always have the encryption key unlocked 2012-02-22 15:18:22 +01:00
Robin Appelman 1a9ded981b Merge branch 'master' into enc 2012-02-22 14:26:52 +01:00
Thomas Tanghus faf6055baa Translate and fix copy/paste error. 2012-02-22 14:19:23 +01:00
Thomas Tanghus 9794e7e427 Fix merge conflict. 2012-02-22 11:20:57 +01:00
Thomas Tanghus 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
Thomas Tanghus e0c92662f8 JS fix on address book creation. 2012-02-21 23:22:06 +01:00
Thomas Tanghus a79f5d40de Remove my FIXME comments when I've fixed it :-P 2012-02-21 23:22:06 +01:00
Robin Appelman c20319d377 fix incorrect information in the filecache when using encryption 2012-02-21 20:48:49 +01:00
Robin Appelman d9c7e4c333 proper mimetypes for encrypted files 2012-02-21 20:48:48 +01:00
Robin Appelman 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
Robin Appelman c121a1a1e7 implement file_put_contents with stream data using fopen 2012-02-21 20:48:48 +01:00
Robin Appelman 6a8364c3ff rework the way file_put_contents is handeled 2012-02-21 20:48:48 +01:00
Robin Appelman b3a974d8bb only trigger hooks for the default filesystem view 2012-02-21 20:48:48 +01:00
Robin Appelman f1cbb9effc initial integration of encryption 2012-02-21 20:48:48 +01:00
Robin Appelman e2b4954176 simple file encryption wip 2012-02-21 20:48:48 +01:00
Robin Appelman 3d67cd51c2 encryption proxy wip 2012-02-21 20:48:47 +01:00
Bart Visscher d3e6ea6ac0 Bookmarks: uses the core action icons 2012-02-21 20:28:24 +01:00
Bart Visscher 86d2927c02 Calendar: Correct calendarcolor format for ical color property 2012-02-21 20:10:40 +01:00
Marvin Thomas Rabe 21f8d0992f Added missing files 2012-02-21 18:29:49 +01:00
Thomas Tanghus 7a49c8e59c Merge gitorious.org:owncloud/owncloud into vcategories 2012-02-20 23:42:06 +01:00
VicDeo d5f7a39936 Contact list scroll fix 2012-02-20 23:54:23 +03:00
Thomas Tanghus ffdfe8257b Contacts: Fix adding/updating address book with empty name. 2012-02-20 15:24:54 +01:00
Thomas Tanghus 456ada01fa Contacts: Apply strip_tags on compound values. 2012-02-20 14:36:21 +01:00
Thomas Tanghus 12bcbcdc62 Update ctag in deleteFromDAVData. 2012-02-20 14:24:10 +01:00
Thomas Tanghus 8ed4262393 Merge gitorious.org:owncloud/owncloud into vcategories 2012-02-20 13:18:22 +01:00
Arthur Schiwon 7ff4e40b20 Combing LDAP backend with LDAP extended backend 2012-02-20 10:39:55 +01:00
Alessandro Cosentino 490c9db15d Added bookmarklet for browser. Inspired by Google Bookmarks 2012-02-19 20:18:27 -05:00
Thomas Tanghus 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
Florian Pritz 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
Michael Gapczynski 87627c7a50 Fix overwriting of internal sharing for shared folders - bug oc-260 2012-02-18 19:30:54 -05:00
Tom Needham 71a2241aee Fixed call to OC_User. Thanks Burillo on IRC 2012-02-18 23:53:10 +00:00
Thomas Tanghus 2ee2f87efe Strip tags on address on client side. 2012-02-18 11:49:31 +01:00
Thomas Tanghus 868cf6bb83 Avoid errors from missing GD library. 2012-02-18 11:49:31 +01:00
Thomas Tanghus 96612c506e Removed obsolete commented code and made minor speed improvements.
Added stub function for loading categories.
2012-02-18 11:49:31 +01:00
Michael Gapczynski 6f1ed85f0b Temporary fix for sharing files 2012-02-17 21:56:20 -05:00
Bart Visscher 6bbd67c3c6 Calendar: only update default view when it really changed 2012-02-17 22:10:02 +01:00
Bart Visscher 539fd7240c Calendar: optimize sending calendar events, also enabled caching of result 2012-02-17 22:09:31 +01:00
Bart Visscher a33b757b19 Calendar: Add default repeat values when editing a non-repeating event 2012-02-17 22:09:22 +01:00
Bart Visscher dab5531474 Bookmarks: Fix image urls in bookmarks.js 2012-02-17 22:07:15 +01:00
Bart Visscher e8b69d45a3 Fixup use of OC_Helper::linkTo function 2012-02-17 22:07:14 +01:00
Bart Visscher f47444e1f7 Use separate function to make absolute urls 2012-02-17 22:07:14 +01:00
Bart Visscher 5f3c549227 Contacts: Add removed app enabled check 2012-02-17 22:07:14 +01:00
Thomas Tanghus 86893ea78c UI tweaks for name selector combobox. 2012-02-16 10:38:00 +01:00
Thomas Tanghus fa7fabf024 Minor tweaks 2012-02-16 10:38:00 +01:00
Tom Needham e6b835bea8 Update breadcrumb css on close 2012-02-14 21:55:51 +00:00
Tom Needham aec6a3c32f Fix editing shared files and file opening bug. Fixes oc-209 and oc-195 2012-02-14 21:49:51 +00:00
Thomas Tanghus 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
Thomas Tanghus ae426ad115 Added some check for when addinf deleting contacts. 2012-02-14 10:36:22 +01:00
Thomas Tanghus 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
Thomas Tanghus dc20900e10 Modify check for missing UID. 2012-02-14 01:56:38 +01:00
Thomas Tanghus 53503148f3 Use proper index file. 2012-02-14 01:47:18 +01:00
Thomas Tanghus 4446854f75 Don't try to load a profile picture for contacts the doesn't have any. 2012-02-14 01:11:21 +01:00
Thomas Tanghus 07c422d81d Removed superfluous debug. 2012-02-14 01:02:01 +01:00
Thomas Tanghus 3adaacc0ce Added OC_Contacts_VCard::moveToAddressBook 2012-02-14 01:00:41 +01:00
Thomas Tanghus 024405e4f1 Added function for later testing. 2012-02-14 01:00:41 +01:00
Bart Visscher a37bd93222 External: Use OC_Util::checkLoggedIn 2012-02-14 00:13:04 +01:00
Bart Visscher 777804fac2 Gallery: remove unused cover.php 2012-02-14 00:12:22 +01:00
Bart Visscher 525306c1e2 Replace Expires and caching headers by OC_Response functions 2012-02-13 23:48:05 +01:00
Bart Visscher 29fc82c364 Send gallery album thumbnail with OC_Response::sendFile 2012-02-13 23:35:37 +01:00
Bart Visscher 594dcf13f2 Contacts+OC_Respone: Move enableCaching out of setEtagHeader and setLastModifiedHeader 2012-02-13 22:47:31 +01:00
Bart Visscher 169ddc5b0b Gallery: Only get local file when generating photo thumbnail 2012-02-13 22:39:30 +01:00
Bart Visscher e137020f67 Gallery: Use OC_Respone::enableCaching for (album)thumbnails 2012-02-13 22:38:34 +01:00
Bart Visscher e084386770 Gallery: Move login check to beginning of galleryOp.php 2012-02-13 22:33:52 +01:00
Bart Visscher e402896001 Gallery: Remove autoloaded includes from galleryOp.php 2012-02-13 22:33:48 +01:00
Georg Ehrke 40d343e2af fix oc-bug 239 - & => &amp; 2012-02-12 22:34:10 +01:00
Bart Visscher 5c816c0cc9 Contacts: Optimize thumbnail cache handling a bit 2012-02-12 20:40:52 +01:00
Bart Visscher 125cf79a37 OC_Response: add setExpiresHeader function 2012-02-12 20:40:52 +01:00
Bart Visscher 45bb6f5fd4 OC_Response: add redirect function 2012-02-12 20:40:52 +01:00
Bart Visscher ee7931f457 Contacts: Add missing parameter 2012-02-12 20:40:52 +01:00
Bart Visscher 0917bdecdd Contacts: Move response caching to OC_Response 2012-02-12 17:21:33 +01:00
Tom Needham a0bb6079c5 Add description to texteditor info.xml -fix oc-234 2012-02-12 15:42:05 +00:00
Bart Visscher f5385e4a63 Contacts: Add id to vars with id in them 2012-02-12 16:12:46 +01:00
Bart Visscher 623afb69b6 Contacts: cleanup OC_L10N usage 2012-02-12 16:11:41 +01:00
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
Tom Needham 20b9678789 replace database name and table prefix with default values 2012-02-10 20:23:28 +00: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
Tom Needham 2f80df1f9e Merge branch 'master' of gitorious.org:owncloud/owncloud into migration 2012-02-10 15:24:26 +00: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
Tom Needham 960dd750c9 Added dbexport to export output. Initial import code. 2012-02-05 23:00:38 +00: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
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
Tom Needham 24c79c5bce Updated Migrate_provider bookmakr implementation 2012-02-03 22:41:39 +00:00
Tom Needham 1133eaa679 load bookmarks provider class 2012-02-03 21:28:58 +00:00
Tom Needham ee88ded463 more commenting out for debugging, added logging commands 2012-02-03 21:00:12 +00:00
Tom Needham 0bbc9ade7d fix syntax, add logging, debug xml output instead of zip 2012-02-03 20:48:32 +00: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
Tom Needham 5507db9b15 Initial migration code, and basic export for bookmarks 2012-02-03 20:32:06 +00:00
Georg Ehrke ab31a890b6 use strip_tags for calendar names 2012-02-02 21:23:41 +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
Robin Appelman d514b1d92d Merge branch 'master' into filesystem 2012-02-01 15:57:32 +01:00
David Iwanowitsch 6583d30e26 fix javascript 2012-02-01 15:40:59 +01:00
David Iwanowitsch 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
Robin Appelman 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
Thomas Tanghus 1f718d31e1 Merge branch 'tanghus_contacts' 2012-01-31 19:35:11 +01:00
Thomas Tanghus 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
Thomas Tanghus 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
Thomas Tanghus db1f77e4f5 Some reminders in the code of what I have to change post OC3.0 2012-01-31 19:30:56 +01:00
Robin Appelman 803f86e0fc dont try to use the filesystem when it isnt setup yet 2012-01-31 12:44:01 +01:00
Robin Appelman 1191b57b34 Merge branch 'master' into filesystem 2012-01-30 23:20:47 +01:00
Michael Gapczynski e0f655fb70 Sharing app needs to be loaded for public link of file in Shared folder - fixes bug 113 2012-01-30 16:49:24 -05:00
Robin Appelman 4522d19b4c merge master into filesystem 2012-01-30 20:29:33 +01:00
Bartek Przybylski 5574b87e9b new gallery look and feel 2012-01-30 19:36:33 +01:00
Georg Ehrke 30f1de71a6 remove debug file 2012-01-29 16:08:09 +01:00
Georg Ehrke 928e9b121b fix version-compare in calendars app.php 2012-01-29 10:59:15 +01:00
Robin Appelman ad4e305c96 update translations 2012-01-27 00:59:24 +01:00
Robin Appelman 830cf87697 use the correct hooks to remove contact/calendars of remvoed users 2012-01-26 19:05:46 +01:00
Robin Appelman 266fbb442e use oc_filesystem::getlocalfile instead of manually trying to get the correct local file when creating album covers
fixes broken album covers on shared files
2012-01-26 18:12:59 +01:00
Bartek Przybylski 63ae4b3dfc db cleanup after gallery remove 2012-01-25 21:15:27 +01:00
Bartek Przybylski 5172e0a7a3 creating thumbnails on upload, recursive remove 2012-01-25 21:07:43 +01:00
Thomas Tanghus e6298325f6 Removed debug output 2012-01-24 23:08:40 +01:00
Thomas Tanghus 5458e52935 Fixed http://bugs.owncloud.org/thebuggenie/owncloud/issues/oc-92
"Character '&' in address data causes wrong data".
This was also the case for the 'N' property.
2012-01-24 23:08:40 +01:00
Robin Appelman a77f3a07a1 Fix some issues in ampache resonponse
Patch by Markus Germeier
2012-01-24 02:56:57 +01:00
Robin Appelman 6fccf12299 update translations 2012-01-24 00:42:08 +01:00
Robin Appelman cdfb252ced Merge branch 'master' of gitorious.org:owncloud/owncloud 2012-01-24 00:24:09 +01:00
Bartek Przybylski 456394d3ec oc-89 handling no photos in collection alert 2012-01-23 23:25:36 +01:00
Tom Needham e1a499f65d disable keyboard shortcuts as temp fix 2012-01-23 20:59:37 +00:00
Georg Ehrke b8e01939e9 fix undefined indices - bugfix for oc-99 2012-01-23 15:05:53 +01:00
Georg Ehrke 66f8a0e1a3 validate the calendar name 2012-01-21 17:42:52 +01:00
Georg Ehrke 78c5c2e7d5 fix Undefined variable - bugfix for oc-69 2012-01-21 17:42:52 +01:00
Robin Appelman 01ebb74a33 some gallery css fixes 2012-01-21 00:54:02 +01:00
Bartek Przybylski 437d50c6f6 recognizing img basing on extension 2012-01-20 23:28:40 +01:00
Robin Appelman 97901391f4 make media detection based on extention case insensitive 2012-01-20 19:34:34 +01:00
Robin Appelman 415e968612 fix renaming albums 2012-01-20 19:32:08 +01:00
Robin Appelman b5ae924031 dont show errors when not renaming an album 2012-01-20 19:28:57 +01:00
Robin Appelman 9dcdf517f5 fix deleting/renaming albums with a ' in the name 2012-01-20 19:26:09 +01:00
Robin Appelman 7ea2923fa8 translation updates 2012-01-20 18:53:45 +01:00
Robin Appelman 735fcf8bd2 only double quoted string seems to be detected in js 2012-01-20 17:47:55 +01:00
Robin Appelman 1c311c36bf add translation wrappers to gallery strings in js 2012-01-20 17:09:31 +01:00
Robin Appelman 42ef44e1b4 show proper feedback that collection scanning is done and show the collection afterwards 2012-01-20 01:41:37 +01:00
Cloud Dumper 6ccb1187df Don't wrap collection cells.
This change makes sure cells are never wrapped.

If the text is too big for the column, ellipsis is
used instead.
2012-01-20 01:14:21 +01:00
Cloud Dumper d12afe0541 Sort songs also by path.
Add song_path in the ORDER BY.

Fix oc-31.
2012-01-20 01:14:01 +01:00
Robin Appelman 3552626358 Merge branch 'master' into filesystem 2012-01-20 00:48:03 +01:00
Bart Visscher ccad24a925 [Calendar] Use class for active view button 2012-01-19 21:00:19 +01:00
Bart Visscher 838766add0 OC-23: [Calendar] Double vertical scrollbar in week view 2012-01-19 20:50:22 +01:00
Thomas Tanghus ca03a26f15 - Added fix for empty 'FN' field on import via CardDAV clients.
- Make sure that the contact in the list has a display name.
- More tweaks on thumbnail caching.
2012-01-19 19:47:09 +01:00
Thomas Tanghus 137c630377 Optimizations and more aggressive caching. 2012-01-19 18:28:17 +01:00
Thomas Tanghus 5bd117dd6d UI fixes in contact editor and address book dialog.
Error checking in ajax methods.
Localize menu entry.
2012-01-19 16:07:17 +01:00
Thomas Tanghus dc942d6f3e Added redirecting to static image file and caching for contacts with no photo embedded. 2012-01-19 16:07:17 +01:00
Georg Ehrke ce13b3b7cd fix double new calendar button - bugfix for oc 59 2012-01-19 12:27:16 +01:00
Bartek Przybylski b44a7dc36a enhancement: oc-36 2012-01-17 20:12:26 +01:00
Bartek Przybylski 10aa296895 fix: oc-33 2012-01-17 20:00:12 +01:00
Georg Ehrke 69ca0ae177 move loading icon to the top bar 2012-01-17 19:48:29 +01:00
Georg Ehrke 1f95231801 use button for new calendar 2012-01-17 19:09:11 +01:00
Georg Ehrke 6e86b34586 Merge branch 'master' into calendar 2012-01-17 15:57:29 +01:00
Georg Ehrke 91016e37d4 fix ocbug 34 2012-01-17 15:38:32 +01:00
Georg Ehrke 42b1c75a66 fix ocbug 24 2012-01-17 15:18:01 +01:00
Michael Gapczynski 7859c1105c Apps need to be enabled in order to search through Shared directory for media scanning 2012-01-16 22:18:16 -05:00
Michael Gapczynski de16537231 Emit hooks in OC_Share when sharing a file and forward hooks for deletion and writing of source file 2012-01-16 20:16:32 -05:00
Michael Gapczynski 1f35c94242 Make media app listen for post_delete instead of delete 2012-01-16 19:52:04 -05:00
Georg Ehrke 2179437726 use timepicker to force users to use HH:MM 2012-01-16 20:22:54 +01:00
Robin Appelman 965ea96439 update translations 2012-01-16 17:34:53 +01:00
Robin Appelman 96e2f15d8a merge master into filesystem 2012-01-16 03:06:11 +01:00
Robin Appelman b0dbca0cc7 fix export link for contacts 2012-01-16 02:27:59 +01:00
Robin Appelman 15ea83834d prevent multiply owncloud instances on the same domain intefering with each others playlists 2012-01-15 19:25:55 +01:00
Robin Appelman a44bbd8005 don't use depricated <? use the full <?php 2012-01-15 18:58:08 +01:00
Cloud Dumper 6b50980469 Remove reference to unexisting file in music.css.
`img/pbar-ani.gif' is not on the repository.
2012-01-15 18:47:17 +01:00
Georg Ehrke c81beab96d Merge branch 'master' into calendar 2012-01-15 18:33:46 +01:00
Georg Ehrke 3364502f00 use svg icon for calendar 2012-01-15 18:29:44 +01:00
Bartek Przybylski 07cf709eeb better scanning model for gallery, more feedback to user while scanning 2012-01-15 15:31:37 +01:00
Robin Appelman 7cd809b286 update translations 2012-01-15 15:12:58 +01:00
Bartek Przybylski 3ec5ffe24e Simple translation for gallery 2012-01-15 12:15:22 +01:00
Bartek Przybylski 5ecc10b756 recursive gallery removing on parent dir remove 2012-01-15 12:15:22 +01:00
Georg Ehrke ec3955b158 change description of the changed colors (calendar) 2012-01-15 10:58:39 +01:00
Georg Ehrke cf1023567b change calendar colors 2012-01-15 10:52:07 +01:00
Georg Ehrke 360778e520 use backslash n instead of a real new line 2012-01-15 00:56:11 +01:00
Georg Ehrke 0e428ec595 fix newline problem in contacts 2012-01-15 00:47:50 +01:00
Georg Ehrke 43f7b2fd2d fix newline problem in calendar 2012-01-15 00:45:27 +01:00
Georg Ehrke fed7eef4f3 Merge branch 'master' of gitorious.org:owncloud/owncloud 2012-01-15 00:31:23 +01:00
Georg Ehrke 87b46decfa added bart to the authors in info.xml 2012-01-15 00:30:04 +01:00
Robin Appelman 5cd6e0f4d9 remove some of the flickering in opera 2012-01-15 00:14:42 +01:00
Georg Ehrke b1433119cc highlight the current view 2012-01-15 00:06:26 +01:00
Bartek Przybylski ef69abd4dc constans for signals handling 2012-01-14 23:13:01 +01:00
Robin Appelman b106686382 remove ununsed copy-paste leftovers 2012-01-14 22:27:20 +01:00
Robin Appelman 0615d096ce make pdf viewer work with text editor 2012-01-14 22:25:07 +01:00
Robin Appelman 352d73f1e0 some minor changes to the text editor loading 2012-01-14 21:58:16 +01:00
Robin Appelman 4cc68eac6d make pdf viewer work a bit better with the rest of owncloud 2012-01-14 21:38:33 +01:00
Tom Needham bfdbcbee12 Fix breadcrumb issue when closing editor 2012-01-14 15:45:19 +00:00
Tom Needham e979aa0c32 fix editor js 2012-01-14 15:36:57 +00:00
Tom Needham 58a781d9e4 Merge branch 'master' of gitorious.org:owncloud/owncloud into ace-editor 2012-01-14 15:31:49 +00:00
Bartek Przybylski e0dc8b8ab2 handle gallery remove when removing dir via webinterface 2012-01-14 15:01:57 +01:00
Georg Ehrke 4d1c414ffb Merge branch 'calendar' 2012-01-14 14:25:49 +01:00
Georg Ehrke 868cf46290 improve import function 2012-01-14 14:22:30 +01:00
Bartek Przybylski 06388e1339 handling directory renaming and thumbnail move on gallery name chenge 2012-01-14 13:52:24 +01:00
Bartek Przybylski a9878dca6d content divs alignment 2012-01-14 11:19:24 +01:00
Tom Needham ffd47ef4d7 Merge branch 'master' of gitorious.org:owncloud/owncloud into ace-editor 2012-01-13 16:55:55 +00:00