Commit Graph

1737 Commits

Author SHA1 Message Date
Georg Ehrke 1cf7fc261f better var name in changeview.php 2012-02-20 11:26:43 +01:00
Georg Ehrke 8dff0fb58d add moved files to clean up ajax folder 2012-02-20 11:26:22 +01:00
Georg Ehrke ceb0016bdc remove old ajax files 2012-02-20 11:25:42 +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
Georg Ehrke d8734cee02 fix sql command 2012-02-18 11:21:07 +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
Georg Ehrke 011bc1e764 fix unsharing of groups 2012-02-17 21:19:04 +01:00
Georg Ehrke a3b8d54576 Merge branch 'master' into calendar_sharing 2012-02-17 14:14:53 +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 01827e9340 Merge branch 'master' into calendar_sharing 2012-02-13 17:08:52 +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
Georg Ehrke c9db88aa3b Merge branch 'master' into calendar_sharing 2012-02-12 10:46:34 +01:00
Georg Ehrke 73038156cc check userrights in events.php 2012-02-12 10:40:57 +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
Georg Ehrke db23ec5c1c show shared calendars 2012-02-11 14:02:51 +01:00
Georg Ehrke 66ac6c232c fix sharing calendar manager 2012-02-11 13:30:15 +01:00
Tom Needham 20b9678789 replace database name and table prefix with default values 2012-02-10 20:23:28 +00:00
Georg Ehrke a8b7ae515c Merge branch 'master' into calendar_sharing 2012-02-10 19:36:00 +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
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
Georg Ehrke 9fd07ee10d Merge branch 'master' into calendar 2012-02-08 17:13:50 +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
Georg Ehrke 55be59e738 Merge branch 'master' into calendar 2012-02-04 21:34:38 +01:00
Georg Ehrke 5e08d1bb40 Merge branch 'calendar' of gitorious.org:owncloud/owncloud into calendar 2012-02-04 21:27:18 +01:00
Georg Ehrke b810380d56 add sharing management for calendars 2012-02-04 21:23:31 +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
Georg Ehrke f81ac81550 fix merge conflicts 2012-02-02 17:48:29 +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
Georg Ehrke 91b705cc4f remove debug file 2012-02-02 12:37:58 +01:00
Georg Ehrke f870f9efcf validate parameters in changeview.php 2012-02-02 12:18:29 +01:00
Georg Ehrke 9e5172f75c Merge branch 'master' into calendar 2012-02-02 12:12:48 +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
Georg Ehrke 39d312861a add active to the db structure of shared calendars 2012-01-31 22:33:39 +01:00
Georg Ehrke 2b8ec1cad0 Calendar: fix html of import dialog 2012-01-31 22:03:08 +01:00
Georg Ehrke 153467dbe0 add share as a tab 2012-01-31 21:39:40 +01:00
Georg Ehrke 7b82d153c7 Merge branch 'master' into calendar 2012-01-31 21:35:08 +01:00
Georg Ehrke 3a5d3dfd97 increase version number to force db upgrade 2012-01-31 21:33:50 +01:00
Georg Ehrke 32bff22dc7 change db structure of calendar for sharing calendars 2012-01-31 21:26:09 +01:00
Georg Ehrke 64a617b2a1 fix all day with one day to much - bugfix for oc-126 2012-01-31 20:46:27 +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
Georg Ehrke 149bbeb260 make tab names translatable 2012-01-31 17:15:25 +01:00
Georg Ehrke c72c4dd412 add alarm as a tab 2012-01-31 16:59:34 +01:00
Georg Ehrke 4c1fb4c282 fix style of the tabs 2012-01-31 16:49:21 +01:00
Robin Appelman 803f86e0fc dont try to use the filesystem when it isnt setup yet 2012-01-31 12:44:01 +01:00
Georg Ehrke 538618df62 Merge branch 'master' into calendar 2012-01-31 11:58:40 +01:00
Georg Ehrke fc70c7094a add tabs for repeating and attendees in the event form 2012-01-31 11:57:09 +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
Georg Ehrke f9c4975a45 improve import form for calendar 2012-01-13 13:57:46 +01:00
Thomas Tanghus 0ba472c18a Too quick on the copy/paste trigger... 2012-01-12 23:43:00 +01:00
Thomas Tanghus 1697347045 Oops. Missing ')' :-P 2012-01-12 22:55:43 +01:00
Thomas Tanghus e60860148c Don't chunk_split encoded image string.
Don't return json error but null if card can't be parsed.
Small check for non-parsable card in index.php.
2012-01-12 22:50:12 +01:00
Thomas Tanghus 22356533a0 Added search. Thanks to icewind it was mostly copy/paste :-) 2012-01-12 22:50:12 +01:00
Thomas Tanghus 0d120efda5 Add PRODID to vcards created by ownCloud. 2012-01-12 22:50:12 +01:00
Georg Ehrke 28e15fd487 Merge branch 'calendar' 2012-01-12 22:07:23 +01:00
Georg Ehrke cd8f54ade2 update js of calendar import 2012-01-12 22:06:53 +01:00
Georg Ehrke 9bcd367873 Merge branch 'master' into calendar 2012-01-12 21:44:56 +01:00
Georg Ehrke 0b45d19ea0 change app icon 2012-01-12 16:50:49 +01:00
Thomas Tanghus c6eeb4a808 Don't add address if none of the fields are filled out. 2012-01-12 02:39:33 +01:00
Robin Appelman b71ea287aa reimplement auto playing music from location hash (like from search results) 2012-01-12 02:02:45 +01:00
Robin Appelman 8de4163ba2 fix searching artists and albums 2012-01-12 02:01:59 +01:00
Robin Appelman 25213a790d fix event handler after re-expanding an artist in collection view 2012-01-12 01:18:27 +01:00
Robin Appelman 1b5d206ca7 fix expending artists and albums in collection view 2012-01-12 01:14:16 +01:00
Robin Appelman f4338f631b fix searching music 2012-01-12 00:54:35 +01:00
Bartek Przybylski 118cbf8400 user suggested style change 2012-01-11 23:54:02 +01:00
Bartek Przybylski afa07beda0 resolving depricated script opening 2012-01-11 23:42:13 +01:00
Thomas Tanghus 24dc1aec8e Tweaked some tipsys. 2012-01-11 23:05:34 +01:00
Bartek Przybylski dddcd66ead using new image backend, moving ajax calls to one file, using generated thumnails to speedup covers loading 2012-01-11 22:06:54 +01:00
Thomas Tanghus 237ba65a20 Localizin strings and adding error checking. 2012-01-11 20:07:15 +01:00
Thomas Tanghus eae3e134ff Make sure VERSION is set.
Set REV for each edit.
Download single VCard.
2012-01-11 06:20:06 +01:00
Thomas Tanghus d93a5a0774 Added files for error messages, removed old syle sheet. 2012-01-11 04:05:30 +01:00
Thomas Tanghus 1a6ad816a3 CSS cleanup, more error checking, better error messages, general cleanup. 2012-01-11 04:05:30 +01:00
Thomas Tanghus 5500041cca Added missing } 2012-01-11 04:05:29 +01:00
Robin Appelman d92b083c1d fix old calendar name and color not being preserved when editing a calendar 2012-01-11 01:53:25 +01:00
Robin Appelman 3c910b812b also use translated string for music navigation entry when showing inline controls 2012-01-11 01:26:27 +01:00
Robin Appelman f67e5d18e7 update translations 2012-01-11 01:06:59 +01:00
Thomas Tanghus e316cddf65 More fixes on saving TYPE parameters.
Use jQuery Dialog for error messages instead of alert()
2012-01-10 14:59:31 +01:00
Tom Needham 2a0ed930ef improved ui for go to line button 2012-01-09 22:42:28 +00:00
Tom Needham 66020c5d44 update page title 2012-01-09 22:38:19 +00:00
Tom Needham 6d37c7d351 Added live search 2012-01-09 22:22:12 +00:00
Thomas Tanghus 60653c0544 Return standard thumbnail even if contact couldn't be found as it could be because it was just added, 2012-01-09 23:16:07 +01:00
Thomas Tanghus aadb81a32a OC_DB::insertid was being called too late to get the correct result. 2012-01-09 23:14:11 +01:00
Tom Needham 3f67918522 Merge branch 'master' of gitorious.org:owncloud/owncloud into ace-editor 2012-01-09 21:17:41 +00:00
Tom Needham 27d9cbd8c0 Added 'Go to line' functionality 2012-01-09 21:16:41 +00:00
Thomas Tanghus ac63afbd95 Insert new contacts alphabetically correct in the list.
Added some tipsys to the editor.
2012-01-09 22:05:28 +01:00
Thomas Tanghus 978a08ab1c Fixed Phone types not being saved correctly when adding them. 2012-01-09 20:38:06 +01:00
Thomas Tanghus 604ca61d78 Some cleanup, better error messages and such. 2012-01-09 20:38:06 +01:00
Thomas Tanghus 47548fb8c6 Fixed showing first contact if non is selected. 2012-01-09 20:38:05 +01:00
Thomas Tanghus 85ab3b3924 Modified thumbnail.php to use OC_Image. Cut out 50 loc ;-) 2012-01-09 20:38:05 +01:00
Thomas Tanghus d91a4fcaf3 Changed SQL queries for looking up contacts to only query once and sort at the same time. 2012-01-09 20:38:05 +01:00
Tom Needham 6c78cd2765 Moved .separator to core css 2012-01-09 18:39:09 +00:00
Tom Needham 3be0564040 improved ui and save button action 2012-01-09 18:17:26 +00:00
Tom Needham 19186bf37b hide save button for read-only files 2012-01-09 17:22:51 +00:00
Tom Needham 18b8dc1c21 fixed saving bug 2012-01-09 17:03:19 +00:00
Tom Needham f7f19af816 Handles file permissions. Protect against overwriting changes. 2012-01-08 23:30:50 +00:00
Robin Appelman ccc43f0ea0 merge master into filesystem 2012-01-08 18:01:33 +01:00
Robin Appelman ed5fb902bd remove mp3info from dependency check 2012-01-08 17:35:41 +01:00
Robin Appelman 13784bee18 mp3info is giving to much trouble, get rid of it 2012-01-08 17:35:40 +01:00
Kshitij Parajuli 041e3575d1 When a music file is playing, the page title gets modified. 2012-01-08 17:35:40 +01:00
Georg Ehrke 4c91ca2f86 Merge branch 'master' into calendar 2012-01-08 16:42:32 +01:00
Robin Appelman 9c6248443a dont overwrite the database with the gallery database 2012-01-08 14:35:23 +01:00
Cloud Dumper 4d1ed7e05f Improve music playlist rendering.
This change:
* bolds currently playing song in playlist;
* forces song names in playlist to one line, ellipsize after (...);
* adds jQuery tipsies to get the whole song name, along with the
  artist name, and the album the song is coming from.

No need to split this changeset into three different ones for the sake
of atomicity.

Two first elements were on the priorities / bug list available there:
   http://gitorious.org/owncloud/pages/Home
2012-01-08 13:45:44 +01:00
Bartek Przybylski c2392bbace db overwriting, gallery creating fix 2012-01-08 11:25:08 +01:00
Bartek Przybylski 21c4515465 rename fix, licence header added 2012-01-08 11:01:25 +01:00
Robin Appelman d1edc360d9 merge master into filesystem 2012-01-08 01:53:40 +01:00
Bartek Przybylski 23f52aa6fd Merge branch 'master' of gitorious.org:owncloud/owncloud 2012-01-08 01:34:50 +01:00
Bartek Przybylski 2de3b4bd17 rename and delete hooks 2012-01-08 01:32:11 +01:00
Cloud Dumper 5b57cd310e Also use track_number to retrieve song track.
This adds support for id3v2 tags such as TRACK/TOTAL.
2012-01-08 00:30:57 +01:00
Cloud Dumper 6b95d7427a Sort results from music collection getters.
Albums and artists are now ordered by name, song by track number and name.
2012-01-08 00:30:57 +01:00
Bartek Przybylski e51957b4de gallery version bump to force db update 2012-01-08 00:22:28 +01:00
Bartek Przybylski 9ed3c31fc9 automatic adding of photo to album, feedback for user while scanning, general cleanup 2012-01-08 00:14:34 +01:00
Georg Ehrke c3cda81577 update calendar pot file 2012-01-07 18:30:32 +01:00
Georg Ehrke 67a8ae084a fix search function 2012-01-07 14:31:47 +01:00
Frank Karlitschek 33847dd101 enable gallery and admin_export by default at least for the alpha and beta. 2012-01-07 13:33:53 +01:00
Georg Ehrke f18e866a1e improve search function 2012-01-06 14:36:24 +01:00
Georg Ehrke db490fbc8f Merge branch 'master' into calendar 2012-01-05 21:02:58 +01:00
Georg Ehrke cb445deb5f fix login check in ajax files 2012-01-05 21:02:11 +01:00
Georg Ehrke 486694c2ec fix js for repeating events 2012-01-05 20:54:44 +01:00
Georg Ehrke a01a3d412c fix autodetection for the week of the month 2012-01-05 17:53:13 +01:00
Georg Ehrke edc9a150aa fix editeventdialog for monthly repeating events with a specific weekday and weeknumber combination 2012-01-05 17:49:09 +01:00
Georg Ehrke d3a0c7354c fix repeat rule for every weekday 2012-01-05 17:09:01 +01:00
Georg Ehrke a88cc91ad9 fix end for repeating events 2012-01-05 17:05:30 +01:00
Frank Karlitschek e0a058c732 remove error output if symlink already exists. this can happen if a user removed config.php to trigger the setup wizzard 2012-01-03 17:23:50 +01:00
Georg Ehrke fe59015126 Merge branch 'master' into calendar 2012-01-03 13:51:55 +01:00
Georg Ehrke 30857b24ea Merge branch 'master' into calendar 2012-01-02 11:41:18 +01:00
Georg Ehrke 5ccd26959f remove unused js 2012-01-02 11:39:23 +01:00
Georg Ehrke e6739d230e add function to detect always the timezone 2012-01-02 11:35:50 +01:00
Thomas Tanghus fb4c3bd9ce Merge git://gitorious.org/owncloud/owncloud into oc_image 2012-01-02 01:09:22 +01:00
Tom Needham 65c37abef9 added ace source 2012-01-01 23:29:23 +00:00
Robin Appelman 536bc3d3c5 add jplayer source 2012-01-01 23:48:38 +01:00
Tom Needham 67854a94bf Removed old code 2012-01-01 21:27:38 +00:00
Tom Needham 5d9b7bf1dd Added ace license file 2012-01-01 20:05:30 +00:00
Tom Needham ad9a81bf41 Added support for more file types 2012-01-01 20:04:46 +00:00
Tom Needham 4eb7487e61 Updated ace-editor software 2012-01-01 19:45:30 +00:00
Thomas Tanghus 853d1730c7 Merge git://gitorious.org/owncloud/owncloud into oc_image 2012-01-01 20:07:01 +01:00
Michael Gapczynski 64a24191a3 Fix return for empty Shared folder in opendir() 2012-01-01 14:04:16 -05:00
Tom Needham e04951f8fd Fixed keyboard shortcuts 2011-12-31 12:28:25 +00:00
Tom Needham 215cb1e6e0 Merge branch 'master' of gitorious.org:owncloud/owncloud into ace-editor 2011-12-31 12:21:40 +00:00
Thomas Tanghus 1b146b85d2 Removed redundant DB queries. 2011-12-31 01:34:22 +01:00
Thomas Tanghus 97471b5c2a Thumbnails was overwriting default style so hover and active didn't work. Moved them to the 'a' element instead. 2011-12-30 23:39:31 +01:00
Thomas Tanghus 830a34a10a Merge git://gitorious.org/owncloud/owncloud into tanghus_contacts 2011-12-30 21:09:42 +01:00
Thomas Tanghus 4793d25c57 Added license and waiver of conditions for jquery.inview.
CSS fix on contact list.
Query contacts from multiple address books.
2011-12-30 21:07:16 +01:00
Bartek Przybylski 31663cfff5 contacts entry duplication fix 2011-12-30 17:47:14 +01:00
Bartek Przybylski 96dc279e8e Merge branch 'master' of gitorious.org:owncloud/owncloud 2011-12-30 17:06:48 +01:00
Bartek Przybylski 2ea20862fc gallery fixes 2011-12-30 17:06:29 +01:00
Georg Ehrke 3bb11db943 Merge branch 'master' into calendar 2011-12-29 19:16:33 +01:00
Tom Needham 8afb2e98fa Merge branch 'master' of gitorious.org:owncloud/owncloud into ace-editor 2011-12-28 16:16:35 +00:00
Thomas Tanghus a70fbcea28 More missing js. 2011-12-28 10:31:45 +01:00
Thomas Tanghus 5a99310cdf Merge git://gitorious.org/owncloud/owncloud into contact_thumbnails
Fixed some conflicts.
Conflicts:
	apps/contacts/css/styles.css
	apps/contacts/templates/index.php
2011-12-28 10:14:59 +01:00
Bart Visscher 16e4e6dcc3 Contacts: small merge cleanups 2011-12-27 22:44:52 +01:00
Bart Visscher 3e2e5196d2 Merge branch 'tanghus_remote_backup' of git://gitorious.org/~tanghus/owncloud/tanghus-owncloud
Conflicts:
	apps/calendar/export.php
	apps/contacts/index.php
2011-12-27 22:18:01 +01:00
Bart Visscher 5fd595c0bf Calendar: add loading indicator 2011-12-27 21:50:31 +01:00
Robin Appelman 5bff1c8ad1 some coding style fixes for the pdf viewer 2011-12-27 14:19:07 +01:00
Robin Appelman f009ede753 some styling changes for the pdf viewer 2011-12-27 14:09:22 +01:00
Robin Appelman 1efb4a0c61 remove debug messages in console 2011-12-27 13:41:22 +01:00
Bartek Przybylski f7674d06d3 pdf viewer from Google Code-In program 2011-12-27 12:36:51 +01:00
Georg Ehrke ffa835c56f fix the default setting for yearly repeating events 2011-12-26 19:59:15 +01:00
Thomas Tanghus 16c8f62658 Merge git://gitorious.org/owncloud/owncloud into contact_thumbnails 2011-12-26 13:27:53 +01:00
Georg Ehrke 9eef57faed make repeating events editable 2011-12-25 23:19:49 +01:00
Georg Ehrke 8ee53708ae use pre-decrement instead of post-decrement 2011-12-25 15:07:53 +01:00
Georg Ehrke 5e6fa608eb use OC_JSON::checkLoggedIn() in all ajax files 2011-12-22 16:31:01 +01:00
Georg Ehrke 469e983a02 fix merge conflicts 2011-12-21 22:16:46 +01:00
Bartek Przybylski 1383cb51e7 removing and renaming albums 2011-12-21 21:55:52 +01:00
Bartek Przybylski 6a1a7fcd26 merged with stash 2011-12-21 18:40:43 +01:00
Bartek Przybylski 25fa9bf8ec merged with stash 2011-12-21 18:37:17 +01:00
Bartek Przybylski 3c42867109 merged 2011-12-21 18:35:29 +01:00
Bart Visscher d5e9c7d572 Gallery: fix calculation of folder thumbnail selection 2011-12-18 23:10:43 +01:00
Bart Visscher fbad1da9e2 Contacts: check if PREF parameter is set before useing it 2011-12-18 23:10:43 +01:00
Bart Visscher dff9585f64 Contacts: add missing property_options template var 2011-12-18 23:10:43 +01:00
Bart Visscher ff346ad135 Calendar: small for loop fix 2011-12-18 23:10:43 +01:00
Bart Visscher 4eb36b0ecf Calendar: refactor common ajax functions to OC_Calendar_App 2011-12-18 23:10:42 +01:00
Michael Gapczynski 9e50cecf27 Fix shared status for files inside a shared folder 2011-12-17 21:13:54 -05:00
Thomas Tanghus 092c41f375 Added missing files and tried to revert the wrong commit of app/contacts/js/interfaces.js 2011-12-17 20:38:52 +01:00
Thomas Tanghus a7b048dc05 Added thumbnails to contact list. The contacts have a default thumbnail when the page is
first loaded. Once the page is loaded the thumbnails will be lazy-loaded to the contacts
viewable.
2011-12-17 20:05:54 +01:00
Georg Ehrke f6ed7a19be Merge branch 'master' into calendar 2011-12-16 21:21:34 +01:00
Thomas Tanghus f3e8776dc6 Merge git://gitorious.org/owncloud/owncloud into tanghus_remote_backup 2011-12-16 17:43:06 +01:00
Thomas Tanghus feeb0c742a Misc. changes after review by bartv. 2011-12-16 17:42:07 +01:00
Robin Appelman 65214bed0c make the sharing app return the corrrect result for is_writable on the shared folder 2011-12-16 17:31:31 +01:00
Thomas Tanghus 59ad0a6c9c Update README 2011-12-13 10:39:31 +01:00
Robin Appelman 9fdd1bafdc Merge branch 'master' into filesystem 2011-12-11 23:42:22 +01:00
Thomas Tanghus d55e689261 Added readme.tanghus 2011-12-11 21:17:10 +01:00
Tom Needham 3f44a28e28 Merge branch 'master' of gitorious.org:owncloud/owncloud into ace-editor 2011-12-11 18:16:14 +00:00
Thomas Tanghus 39430c837f Merge git://gitorious.org/owncloud/owncloud into tanghus_remote_backup 2011-12-11 16:29:53 +01:00
Thomas Tanghus c7b7758816 Updating of contact list when activating/adding/deleting address books now works. 2011-12-11 16:26:00 +01:00
Georg Ehrke 56f12cbfb1 delete unused files 2011-12-10 17:54:42 +01:00
Georg Ehrke 33caa64cce check for php version is greater than 5.3.0 - we make extensive use of Date Time Libs 2011-12-10 15:11:41 +01:00
Georg Ehrke b7c754cb32 Merge branch 'master' into calendar 2011-12-10 15:03:33 +01:00
Bart Visscher 1746cba249 Some small changes 2011-12-09 22:36:39 +01:00
Bart Visscher a3cb04013e Update OC_VObject 2011-12-09 21:56:03 +01:00
Bart Visscher 2e951c0ce5 Gallary: Fix alignment of album thumbnails 2011-12-09 21:44:13 +01:00
Thomas Tanghus 5cb10548b3 Resolved conflict 2011-12-09 15:28:51 +01:00
Thomas Tanghus 7aa8eb3427 Merge git://gitorious.org/owncloud/owncloud into tanghus_remote_backup
Conflicts:
	apps/contacts/ajax/deletebook.php
	apps/contacts/index.php
2011-12-09 15:25:26 +01:00
Thomas Tanghus b3661adf02 Various fixes to multiple address books handling 2011-12-09 15:10:51 +01:00
Georg Ehrke ac8177d83e Merge branch 'master' into calendar 2011-12-09 14:45:41 +01:00
Georg Ehrke bd68cee8cf add resettimezone file for testing timezone detection 2011-12-09 14:36:43 +01:00
Georg Ehrke add48b2657 optimize timezone detection 2011-12-09 14:35:59 +01:00
Bart Visscher eeaf539a44 Gallery: splitout model code 2011-12-08 20:05:12 +01:00
Georg Ehrke 2103c331a0 Merge branch 'master' into calendar 2011-12-08 14:03:14 +01:00
Michiel de Jong d4546cdf37 bump version number to force db rebuild 2011-12-08 17:19:38 +07:00
Bart Visscher a389d94e2b Imageviewer: fix fancybox.png image url in fancybox css 2011-12-07 20:41:00 +01:00
Bart Visscher 546b7279a3 Contacts: Add "Preferred" before phone label for preferred numbers 2011-12-07 20:40:59 +01:00
Bart Visscher 1220edd4df Contacts: Add direct link to details of a contact 2011-12-07 20:40:59 +01:00
Bart Visscher 36abf22a48 Contacts: Fix postname var spelling 2011-12-07 20:40:59 +01:00
Bart Visscher 7e990a8e5c Contacts: refactor common ajax functions to OC_Contacts_App 2011-12-07 20:40:59 +01:00
Bart Visscher 247146f703 Contacts: refactor rendering of part.details template 2011-12-07 20:40:58 +01:00
Bart Visscher c67ac46b6c Use a proxy class to interface with Sabre_VObject classes 2011-12-07 20:40:58 +01:00
Michiel de Jong b9e6f5e42d compliance with http://www.w3.org/community/unhosted/wiki/remoteStorage 2011-12-07 21:51:47 +07:00
Tom Needham afa93c1f28 Merge branch 'master' of gitorious.org:owncloud/owncloud into ace-editor 2011-12-06 23:11:36 +00:00
Thomas Tanghus 830efdccac Fixed adding, editing and deleting address books. One minor UI flaw remains. 2011-12-05 03:38:06 +01:00
Thomas Tanghus 2b48b733a3 Merge gitorious.org:~tanghus/owncloud/tanghus-owncloud into tanghus_remote_backup 2011-12-04 20:42:30 +01:00
Thomas Tanghus 95ae0f23f1 Added UI for selecting/editing address books.
Export, CardDAV link and activation/deactivation of address books done.
2011-12-04 20:25:46 +01:00
Georg Ehrke 361d4ac13b fix merge conflicts 2011-12-03 17:25:17 +01:00
Bart Visscher 31846141b0 Contacts: make name editable again 2011-12-02 21:24:48 +01:00
Tom Needham 25a6679c1e Merge branch 'master' of gitorious.org:owncloud/owncloud into ace-editor 2011-12-02 16:12:29 +00:00
Thomas Tanghus 58d1a3516a Removed some debug statements.
Changed double quotes to single quotes.
2011-12-01 16:06:27 +01:00
Thomas Olsen 21d613cbc6 Added export.php for contacts app. Works the same way as the one in the calendar app, except there is no UI for it.
Fixed indentation in /index.php
2011-12-01 02:02:45 +01:00
Bart Visscher 0bbeb13e26 Calendar: Also check if the enddate is in the requested range for events 2011-11-30 21:13:26 +01:00
Bart Visscher e5fdc6013a Calendar: Use the default timezone that is set in lib/base.php 2011-11-30 21:13:04 +01:00
Tom Needham bf719d6670 Disable save button whilst saving. Refined code. 2011-11-29 22:54:51 +00:00
Tom Needham ced944258a Merge branch 'master' of gitorious.org:owncloud/owncloud into ace-editor 2011-11-29 22:45:26 +00:00
Tom Needham dd7a411f9a Disable save button while saving. Streamlined code. 2011-11-29 22:11:42 +00:00
Robin Appelman a8e4d2946a Merge branch 'database' into filesystem 2011-11-26 01:25:08 +01:00
Brice Maron 1d312cf070 Correct ldap check in dependencies_chk app 2011-11-25 23:43:24 +01:00
Bart Visscher 53ff85e2ad Contacts: layout updates 2011-11-24 21:36:35 +01:00
Bart Visscher 6ce6cbf489 Contacts: better label for saving a property 2011-11-24 21:36:35 +01:00
Bart Visscher 9701145f83 Contacts: make type of phone property also multiselect in addproperty 2011-11-24 21:36:34 +01:00
Bart Visscher 4a57728ddd Bookmarks: make a soft-requirement of php-curl 2011-11-24 21:36:34 +01:00
Insanemal c945989a70 Total rewite of fix.
This now re-looks up the username and returns that for use.

Signed-off-by: Insanemal <insanemal@gmail.com>
2011-11-24 02:57:53 +01:00
Insanemal 8d092434ed Adjusted the check user function to lowercase the return.
Signed-off-by: Insanemal <insanemal@gmail.com>
2011-11-24 02:57:53 +01:00
Insanemal 18d8dc4757 Added option to lowercase all usernames.
This resolves bug with Windows AD servers as LDAP server.
Windows is case insensitve on logon requests.
If users are stored camel case and logon using all lower it causes issues
as OwnCloud is configured to be case sensitive.

Signed-off-by: Insanemal <insanemal@gmail.com>
2011-11-24 02:57:53 +01:00
Ignacio Daniel Rostagno 93502b3ef8 Music - Fix album and artist expand layout. 2011-11-24 02:55:51 +01:00
Robin Appelman 6c01175acd fix ampache htmlentity calls 2011-11-24 02:53:44 +01:00
Bart Visscher bae6c1167c Merge branch 'fullcalendar' 2011-11-23 21:08:26 +01:00
Bart Visscher ee549dfb38 Fix scrolling through months 2011-11-23 21:07:49 +01:00
Bart Visscher 5e037bfd54 Contacts: remove redundant li in setpropertyform template 2011-11-23 21:07:32 +01:00
Bart Visscher a2ecdfcac1 Contacts: support multiple phone type parameter 2011-11-23 21:07:32 +01:00
Bart Visscher ad390d5e42 Add type selects to editing ADR & TEL contact property types 2011-11-23 21:07:32 +01:00
Georg Ehrke a38778f911 fix timeformat setting for fullcalendar 2011-11-20 14:23:26 +01:00
Georg Ehrke 6c4692380f Merge branch 'master' of gitorious.org:owncloud/owncloud into fullcalendar 2011-11-20 11:41:58 +01:00
Robin Appelman 4bebf419d1 use oc_appconfig instead of oc_config for the external apps 2011-11-18 20:19:55 +01:00
Markus Kalkbrenner 48ae18a733 - fixed translateable strings in template
- added explaination about ldap filter and display name
- bugfix: keys in ldap response are lower case => lower display name filed before searching
2011-11-18 14:08:30 +01:00
Markus Kalkbrenner bf84aa23f4 - provide a setting for the ldap user display name instead of hardcoded value 'uid' which is not common for Active Directory
- provide a sorted list of ldap users
- replaced double quotes by single quotes and spaces by tabs according to coding standards
- replaced hardcoded strings in template by translatable ones
2011-11-18 14:08:30 +01:00
Markus Kalkbrenner cff6a41e2b fixed copy&paste error: store ldap_tls setting in user_ldap, not
user_tls
2011-11-18 14:07:11 +01:00
Markus Kalkbrenner 0155effdb7 - bugfix: allow anonymous bind for search, then bind with users credentials.
- added explaination how to setup anonymous bind for search to template
- make usage of TLS configurable
2011-11-18 14:07:11 +01:00
krzaczek 7454af0c79 apps files_sharing - fix in share.js to check the "can edit" checkbox -
there was a bug in share.js so the checbox was always unchecked
2011-11-18 14:05:38 +01:00
krzaczek 82f30c709c apps file_sharing - remove "$RUNTIME_NOAPPS = true" from all ajax file
to enable other user backend
2011-11-18 14:05:38 +01:00
krzaczek a70c2b3cb9 apps file_sharing
changed
 $RUNTIME_NOAPPS = true;
to
 $RUNTIME_NOAPPS = false;
 
in ajax/userautocomplete.php - to fetch users also from different user
backends - not only database backend
2011-11-18 14:05:37 +01:00
krzaczek 28cd41a2a4 users_ldap - added getUsers() method to fetch all existing users from
LDAP server
2011-11-18 14:05:37 +01:00
Weng Xuetian 96b91e5b0b fix ampache encoding problem. use htmlentities encoding parameter directly. 2011-11-18 14:03:26 +01:00
Weng Xuetian 0d274b0268 fix id3 tag resolve. should use utf8 from getID3 directly but not
to convert them from ISO8859-1 to utf8 after analyze.
2011-11-18 14:03:26 +01:00
Georg Ehrke 3d498002d0 first implementation of the search function 2011-11-14 22:52:34 +01:00
Georg Ehrke 89b3a395df fix timezone for repeating events 2011-11-12 22:30:09 +01:00
Georg Ehrke a303992d78 support for repeating events 2011-11-12 22:02:04 +01:00
Georg Ehrke eea20e51d8 another fix of caldav url 2011-11-12 16:13:27 +01:00
Georg Ehrke 7fd52de2d3 fix merge conflicts 2011-11-12 15:13:44 +01:00
Georg Ehrke e5a3ab8aad Merge branch 'master' into fullcalendar 2011-11-12 15:09:37 +01:00
Georg Ehrke 03d9fab3c0 fix caldav url 2011-11-12 14:06:14 +01:00
Tom Needham 88de9e4050 Keyboard shortcuts for saving. Refined code. 2011-11-11 20:46:06 +00:00
Georg Ehrke 26272c4252 automatic timezone detection 2011-11-11 15:51:44 +01:00
Robin Appelman 524e3686a0 tell the user when the files are being scanned 2011-11-10 16:40:09 +01:00
Bart Visscher ef124c3e21 Use a function to generate select options 2011-11-09 22:19:52 +01:00
Bart Visscher b095859a92 Use Last-Modified property to check for changed events 2011-11-09 22:17:09 +01:00
Bart Visscher c65e417666 Use parse function in Calendar_Object 2011-11-09 22:16:24 +01:00
Robin Appelman 5a6aba1e11 provide caching for file metadata 2011-11-09 18:41:57 +01:00
Jakob Sack 938c5ef21c contacts: every card needs a version! 2011-11-09 11:35:50 +01:00
Jakob Sack 4b424e12df contacts: put property key in background, the value is important! 2011-11-09 11:35:50 +01:00
Jakob Sack 841be90939 Improve style in contacts 2011-11-09 11:35:50 +01:00
Robin Appelman 5cc6635eb8 remove OC_Filesystem::fromUploadedFile 2011-11-08 22:36:05 +01:00
Robin Appelman ca6c500799 remove OC_Filesystem::fileatime 2011-11-08 22:26:03 +01:00
Robin Appelman ec015a2e68 remove the need to register storage providers, pass the classname during mounting instead 2011-11-08 22:21:25 +01:00
Tom Needham c33884779d Fixed problem closing the editor. 2011-11-07 22:45:26 +00:00
Tom Needham 059ab889bd Fixed error where saving message appears twice. 2011-11-07 22:27:49 +00:00
Tom Needham 7a8c762e48 Merge branch 'master' of gitorious.org:owncloud/owncloud into ace-editor 2011-11-07 17:16:56 +00:00
Brice Maron 97291fda58 Add allow_url_fopen directive to admin_dependencies_chk 2011-11-06 16:54:05 +01:00
Brice Maron cc35cb74e1 Try to avoid closing the share box too soon on multiple selections 2011-11-06 15:29:51 +01:00
Brice Maron ce2b39b398 Merge commit 'refs/merge-requests/69' of git://gitorious.org/owncloud/owncloud into merge-requests/69 2011-11-04 00:31:35 +01:00
Robin Appelman 8eda6f8feb make webfinger work properly if owncloud is installed in a subdirectory 2011-11-03 13:09:51 +01:00
Robin Appelman e2907eb99d no longer rely on PEAR::isError since we can use PDO now 2011-11-03 13:09:51 +01:00
Brice Maron c7d1737d47 attempt to manage some special chars in file list
Added a jquery function to filter by attributes.
Add more logging in rename file
Use the new function to avoid errors
2011-11-01 22:35:13 +01:00
Brice Maron e533e82bc9 Add sequence name in insertid to be more portable 2011-10-29 11:40:48 +02:00
Brice Maron eaad3ab45f Be consistent with licencing 2011-10-29 10:15:29 +02:00
Brice Maron a21908cf18 Change name and fix a typo 2011-10-29 10:07:01 +02:00
Brice Maron a809fe9a04 Add a dependencies check apps 2011-10-29 00:27:25 +02:00
Bart Visscher 8dd2f463f8 Cleanup tipsy popups on more actions 2011-10-27 22:56:22 +02:00
Bart Visscher 1e8e2ae353 Move unselect call to after the dialog starts 2011-10-27 22:54:39 +02:00
Bart Visscher 6d4d15b221 Fix html id's in part.addcardform.php 2011-10-27 22:47:56 +02:00
Bart Visscher c0e9c805ec Disable loading non-existing settings script in bookmark app 2011-10-27 22:46:52 +02:00
Bartek Przybylski 865be6064a adjusting to new db "api", merge with master 2011-10-27 21:16:04 +02:00
Bartek Przybylski 0d022de0f4 Merge branch 'master' into gallery 2011-10-27 20:27:57 +02:00
Tom Needham 6eee638482 Merge branch 'master' of gitorious.org:owncloud/owncloud into ace-editor 2011-10-25 20:48:59 +01:00
Bart Visscher 715e376cd2 Fix setproperty form 2011-10-25 20:01:40 +02:00
Bart Visscher d0e9c81399 Quickfix hanging tipsy popups 2011-10-25 20:01:04 +02:00
Bart Visscher 55d957489d Fix fromtime/totime warnings 2011-10-25 19:59:23 +02:00
Bart Visscher 50649ad0d1 Implement select event creation 2011-10-25 19:57:20 +02:00
Bart Visscher 950018b5c3 Fix scrolling calendar 2011-10-25 19:56:57 +02:00
Bart Visscher 9832a0817d Merge branch 'master' into fullcalendar
Conflicts:
	apps/calendar/index.php
2011-10-24 22:40:22 +02:00
David Iwanowitsch 74740fb71a Do not set incorrect components for default calendar 2011-10-23 11:35:29 +02:00
Jakob Sack 4d60f9d3bd improved style in contacts 2011-10-22 21:32:07 +02:00
Jakob Sack d89666261f Some improvements on the contact application 2011-10-22 19:23:22 +02:00
Jakob Sack b224991ea2 Fix translations, empty properties 2011-10-22 19:23:22 +02:00
Georg Ehrke dc9c5f10f5 Merge branch 'master' of gitorious.org:owncloud/owncloud into fullcalendar 2011-10-22 16:28:24 +02:00
Frank Karlitschek 045c42aa99 new "external" application. you can integrate external application like roundcube, squirellmail or a wiki into ownCloud. 2011-10-22 15:44:34 +02:00
Georg Ehrke 9761a1de3e translatable error messages 2011-10-22 13:14:54 +02:00
Georg Ehrke 0011c42669 Merge branch 'master' of gitorious.org:owncloud/owncloud into fullcalendar 2011-10-22 13:12:13 +02:00
Brice Maron 42306f1e35 Avoid error when no image is provided for cover or thumbnail 2011-10-22 11:34:49 +02:00
Brice Maron 9d46c378b9 Fix unescessary use of non portable 'replace' sql and add loging when GD not installed 2011-10-22 11:01:06 +02:00
Michael Gapczynski 0d4240e196 Fix music navigation entry controls going over the sidebar 2011-10-22 02:31:16 -04:00
Georg Ehrke cf5686def0 Merge branch 'master' of gitorious.org:owncloud/owncloud into fullcalendar 2011-10-21 23:24:39 +02:00
Georg Ehrke 433b57c315 fix new allday bug 2011-10-21 22:59:26 +02:00
Georg Ehrke d50b014aba fix allday bug 2011-10-21 22:47:31 +02:00
Tom Needham ba3d139de8 Merged from master and fixed issue with opening multiple editors 2011-10-21 21:22:06 +01:00
Bart Visscher eb68201bc5 Better event popup 2011-10-21 22:08:55 +02:00
Georg Ehrke a1eda425ed added transition function from 'old' calendar to fullcalendar (fixed currentview bug) 2011-10-21 22:08:30 +02:00
Bart Visscher 61660c068a Fix function name error in contacts app 2011-10-21 21:49:58 +02:00
Florian Pritz f0565de900 use fancybox instead of lightbox
Signed-off-by: Florian Pritz <bluewind@xinu.at>
2011-10-21 20:19:39 +02:00
Georg Ehrke c40383b610 enable listview button 2011-10-21 18:27:12 +02:00
Georg Ehrke e48377d85b added transition function from 'old' calendar to fullcalendar (fixed currentview bug) and removed listview (it is not implemented in fullcalendar yet) 2011-10-21 18:19:44 +02:00
Georg Ehrke d09b3ad2e7 Revert "first implementation of fullcalendar plugin with old buttons working"
This reverts commit b40122832f.
2011-10-21 17:50:10 +02:00
Georg Ehrke b40122832f first implementation of fullcalendar plugin with old buttons working 2011-10-21 16:11:38 +02:00
Bart Visscher 085001fa24 Disable calendar scrolling, doesn't work yet 2011-10-20 23:49:29 +02:00
Bart Visscher 96002c8c8f Implement listview for fullcalendar 2011-10-20 23:49:29 +02:00
Bart Visscher beb5d62779 Optimize deleting event 2011-10-20 23:49:28 +02:00
Bart Visscher 2269f74c27 Fix changing calendar data 2011-10-20 23:49:28 +02:00
Bart Visscher 3d8a1ccb3f Implement resizing of events 2011-10-20 23:49:28 +02:00
Bart Visscher a8bca282df Implement moving of event 2011-10-20 23:49:28 +02:00
Bart Visscher bb5ccc5731 Connect popup to fullcalendar 2011-10-20 23:49:28 +02:00
Bart Visscher 0eb6c759d7 Connect newEvent & editEvent to fullcalendar 2011-10-20 23:49:28 +02:00
Bart Visscher 4fe48a50f0 Translation of calendar interface 2011-10-20 23:49:27 +02:00
Bart Visscher 2e6ec6ce0b Connect calendar buttons to actions 2011-10-20 23:49:27 +02:00
Bart Visscher 4075d18050 Implement loading of events in calendar 2011-10-20 23:49:27 +02:00
Bart Visscher a12cdb55b1 Replace ownCloud calendar html with fullcalendar implementation 2011-10-20 23:49:27 +02:00
Brice Maron 2906ea3d78 Add caching for filelist sharing icon status to avoid many http req. 2011-10-20 23:03:05 +02:00
Robin Appelman e9b6a1018d remove unneeded definiton of get_temp_dir 2011-10-20 01:27:04 +02:00
Robin Appelman 8f77179d29 Merge commit 'refs/merge-requests/64' of git://gitorious.org/owncloud/owncloud 2011-10-20 01:24:23 +02:00
Hendrik Langer 466b41c36b Don't use sys_get_temp_dir(), as it reports the wrong path in restricted environments 2011-10-19 23:38:35 +02:00
Brice Maron 7e34452746 Little trick to avoid editor loading twice on double click 2011-10-19 22:42:44 +02:00
Brice Maron da8d32ae38 Tweak bookmarklet to not change the current page. Correct encoding when add bookmark 2011-10-18 23:27:53 +02:00
Brice Maron 9ea34250a0 Lower also the album name in media scanner... 2011-10-18 23:15:47 +02:00
Brice Maron b15d8878b7 Correct use of null for not null columns in media scanner 2011-10-18 22:41:25 +02:00
Bartek Przybylski c32cce4b35 new way of showing gallery covers, missing files 2011-10-18 21:43:33 +02:00
Bartek Przybylski 55e8b02a09 new way of showing gallery covers 2011-10-18 21:42:27 +02:00
Brice Maron 29368d1c58 Add 3 More log writing in files sharing app 2011-10-18 21:30:08 +02:00
Robin Appelman b975f11514 make sharing work with the new mouting mechanism 2011-10-18 21:19:13 +02:00
Brice Maron 59eac3bc29 Correct little typo/bug in log display and remove ending php tag 2011-10-18 20:10:17 +02:00
Brice Maron 2ac00b378a Fix file sharing : Don't give a unused param to execute 2011-10-17 23:39:23 +02:00
Brice Maron 492931562f Fix bookmark listing with mysql: limit is binded as string. 2011-10-17 13:49:33 +02:00
Robin Appelman 4d1776faf9 catch some edge cases in media player 2011-10-17 01:25:11 +02:00
Robin Appelman 595b13f1e0 prevent the remaining ob_clean related errors 2011-10-17 01:18:02 +02:00
Robin Appelman 330c513015 prevent error in media player ajax api 2011-10-17 00:25:13 +02:00