Commit Graph

1941 Commits

Author SHA1 Message Date
Bart Visscher 7d1880078c Merge branch 'master' into tasks 2012-04-14 13:47:56 +02:00
Tom Needham 9b1c881ca8 Merge branch 'master' of gitorious.org:owncloud/owncloud 2012-04-14 11:18:25 +00:00
Bart Visscher 5c55b9c5ac Sharing: Add a filename after public share link
We don't do anythink with the name, but it is nice to know the file the
link point to.
2012-04-14 12:45:32 +02:00
Bart Visscher 524bd2e75f Sharing: Don't get share icon for undefined filename 2012-04-14 12:45:32 +02:00
Bart Visscher 7504ceb6f2 Sharing: Define missing template vars 2012-04-14 12:45:32 +02:00
Robin Appelman 3babb8c22c improve flexibility of search providers a bit 2012-04-14 11:29:54 +02:00
Arthur Schiwon 8ed4606685 LDAP: don't keep possibly outdated passwords 2012-04-14 11:08:50 +02:00
Georg Ehrke e256ac8791 fix unsharing of events 2012-04-13 21:49:24 -04:00
Georg Ehrke c65adc12d5 add chosen script to calendar 2012-04-13 21:29:51 -04:00
Georg Ehrke 5d4c546693 fix public sharing of calendars 2012-04-13 17:36:47 -04:00
Georg Ehrke ea3499a712 fix class name 2012-04-13 17:26:34 -04:00
Georg Ehrke 1e0364baa8 check permission check in share function 2012-04-13 17:16:28 -04:00
Georg Ehrke 77a9e343aa Merge branch 'master' into sabredav_1.6 2012-04-13 16:42:10 -04:00
Georg Ehrke afcb0aee40 fix merge conflicts 2012-04-13 16:40:10 -04:00
Georg Ehrke 02dc343209 fix address of public shared calendars 2012-04-13 16:26:06 -04:00
Georg Ehrke 854eaff34f hide share tab in shared events 2012-04-13 16:20:19 -04:00
Tom Needham 0aaaefbb4b Merge branch 'master' of gitorious.org:owncloud/owncloud 2012-04-13 20:10:35 +00:00
Tom Needham 1165b358b4 Update language string 2012-04-13 20:09:04 +00:00
Bart Visscher b9f9228a22 Contacts: Save the category list update when updating/adding contact 2012-04-13 21:13:58 +02:00
Bart Visscher 4c52007996 Calendar: Update category list when updating/adding event 2012-04-13 21:13:58 +02:00
Bart Visscher 471e735b0c Calendar: Document active parameter in allCalendars 2012-04-13 21:13:58 +02:00
Bart Visscher 7cf7d5c3dd Calendar: Also set repeat options when editing a non repeating event 2012-04-13 21:13:58 +02:00
Bart Visscher 28e0d64ede Calendar: Fix saving of Categories in an event 2012-04-13 21:13:58 +02:00
Bart Visscher f9b7ed3a1f Calendar: Implement rescan of Categories 2012-04-13 21:13:58 +02:00
Thomas Tanghus 6aee6dae6b VCategories css is now in styles.css 2012-04-13 18:50:40 +02:00
Thomas Tanghus b654121b50 Contacts: Better error reporting. 2012-04-13 18:50:40 +02:00
Robin Appelman 6066ea3170 only run tests for files_external when asked for explicitly 2012-04-13 18:49:50 +02:00
Robin Appelman 8686667b10 some idexes for the media player tables 2012-04-13 18:49:50 +02:00
Georg Ehrke df2e788a1c fix calendarid in eventform and validation of calendarid 2012-04-12 23:15:19 -04:00
Georg Ehrke a7908ba76b fix bugs in share class 2012-04-12 22:11:48 -04:00
Bart Visscher e9c1f8b4e6 Contacts: No need to sort the categories anymore 2012-04-12 23:10:49 +02:00
Bart Visscher 43ba23430d Contacts: Change "category" to "group" in UI 2012-04-12 23:10:49 +02:00
Bart Visscher 78189e2247 Contacts: update category list when the categories change 2012-04-12 23:10:49 +02:00
Bart Visscher 9165b5c28e Use the same category input and management as the contacts app 2012-04-12 23:10:49 +02:00
Bart Visscher b2011bd0a0 Remove unused function getCategoryOptions from OC_Calendar_Object 2012-04-12 23:10:49 +02:00
Bart Visscher 5fa90cd214 Contacts: Also initialize org var in updateValuesFromAdd 2012-04-12 23:10:49 +02:00
Bart Visscher 86edc0da31 Contacts: add space before parameter 2012-04-12 23:10:49 +02:00
Bart Visscher fa853102e4 Contacts: Move use of OC_Contacts_App::$categories to inside of OC_Contacts_App
This is in preparation of making $categories protected and initialized
with default categories.
2012-04-12 23:10:49 +02:00
Frank Karlitschek 48f99fe661 off by default. great tool for developers but confusing for users. 2012-04-12 20:23:45 +02:00
Deepak Mittal bd262eaac0 Fixed OC-261 by modifying js files in apps/media/ 2012-04-12 17:56:53 +02:00
Daniele E. Domenichelli d9aa31fd92 Use OC_Helper::serverHost() in openid settings 2012-04-12 17:51:17 +02:00
Robin Appelman 8cea656ad7 upgrade getid3 2012-04-12 15:54:08 +02:00
Georg Ehrke 0f16935763 fix bugs and optimize OC_Calendar_Object Class 2012-04-11 10:21:45 -04:00
Georg Ehrke 613e15035e Merge branch 'master' into sabredav_1.6 2012-04-10 22:44:13 -04:00
Georg Ehrke ac2d14101c Merge branch 'master' into calendar_sharing 2012-04-10 20:10:07 -04:00
Georg Ehrke 64d3301523 make shared events editable and add (empty) classes for alarm and attendees 2012-04-10 16:03:38 -04:00
Bart Visscher 2dfa02a346 Contacts: fix function names to coding standard 2012-04-10 21:53:36 +02:00
Bart Visscher 3f6e971571 Contacts: Don't lowercase categories value when saving 2012-04-10 21:19:39 +02:00
Bart Visscher fd72556fd1 Contacts: Make part.no_contacts.php translatable 2012-04-10 21:15:38 +02:00
Georg Ehrke eaa649cfb2 fix bug in share lib of calendar 2012-04-10 11:18:02 -04:00
Frank Karlitschek 47f94548ce don´t enable by default. still broken 2012-04-10 15:05:33 +02:00
Frank Karlitschek 6cf3f10d35 fix includes 2012-04-09 22:51:53 +02:00
Frank Karlitschek b0894b3148 Add Craigs granite library to 3rdparty and files_versioning. Still not working and lots ot stuff to do. 2012-04-09 22:10:29 +02:00
Thomas Tanghus 4fda6af725 Contacts: Fix for not being able to add contact to empty/non-existant address book. 2012-04-09 16:30:58 +02:00
Thomas Tanghus 9c247ce874 Removed padding. 2012-04-09 16:30:58 +02:00
Thomas Tanghus 53091551d8 Re-added file I had accidentally removed earlier :-P 2012-04-09 16:30:58 +02:00
Tom Needham ecc596534a Decode json response for admin exports 2012-04-08 19:08:17 +00:00
Georg Ehrke 9294a95438 fix view of single shared events 2012-04-07 22:54:38 -04:00
Georg Ehrke 960553f9c4 fix path and class name 2012-04-07 22:45:44 -04:00
Georg Ehrke 5a4237a31d make dropdown menu work with single event sharing 2012-04-07 22:41:24 -04:00
Georg Ehrke 97d216c94d add dropdown to eventform 2012-04-07 22:40:20 -04:00
Georg Ehrke 4d884c3849 clean up events.php of calendar 2012-04-07 22:39:37 -04:00
Georg Ehrke e940152bce fix bugs in share lib of calendar 2012-04-07 22:39:02 -04:00
Georg Ehrke eef9a1e7ed add access check to ajax files 2012-04-07 22:37:26 -04:00
Georg Ehrke e18c0d54f6 add output functions and access function to app.php of calendar 2012-04-07 22:35:29 -04:00
Tom Needham c0869887cf Return JSON for import and export methods of OC_Migrate 2012-04-07 21:55:16 +00:00
Tom Needham 9edf45a324 Merge branch 'master' into migration 2012-04-07 17:31:30 +00:00
Tom Needham d2886f2020 Hide instance import as it eats data 2012-04-07 17:27:09 +00:00
Tom Needham 00449cdf37 rename admin_export -> admin_migrate 2012-04-07 17:23:25 +00:00
Tom Needham 23d39f7ef0 Display errors on import 2012-04-07 16:13:18 +00:00
Thomas Tanghus d1ae6512cc Contacts: Misc. cleanup tweaks. 2012-04-07 16:03:43 +02:00
Thomas Tanghus b71cf1a4f9 Fix bug oc-413: PHP fatal error in contacts page when no contacts in ownCloud. 2012-04-07 16:03:43 +02:00
Tom Needham 660951dc64 Add some filetypes 2012-04-07 13:32:00 +00:00
Tom Needham a098c7c685 Give editor focus after saving 2012-04-06 21:38:38 +00:00
Tom Needham 22466010fc Provide undo when closing editor with unsaved changes 2012-04-06 21:37:28 +00:00
Tom Needham 2fe0716cb4 Show nice errors 2012-04-06 20:52:41 +00:00
Arthur Schiwon 60e3b563e2 webdav needs to load authentication apps 2012-04-04 12:41:32 +02:00
Thomas Tanghus dd4e577f6d Contacts: l11n for geo autocomplete. Not sure if it works though. 2012-04-03 08:13:10 +02:00
Thomas Tanghus fc555b48ec Contacts: Added autocomplete using geonames.org. 2012-04-03 07:29:47 +02:00
Thomas Tanghus b3f107ddda Contacts: First work on cleaner design. 2012-04-03 03:29:12 +02:00
Thomas Tanghus 896bff5748 Contacts: rescan categories on load if there are none. 2012-04-03 03:29:12 +02:00
Florian Hülsmann bd9fa658de merged from upstream 2012-04-02 23:54:18 +02:00
Tom Needham adc9d906e4 confirm close when there are unsaved changes 2012-04-02 17:44:15 +00:00
Tom Needham dc499c5b4e add * to filename when changes have been made 2012-04-02 17:27:06 +00:00
Tom Needham d0cb99e347 use OC_Dialogs instead of alert() 2012-04-02 16:35:11 +00:00
Florian Hülsmann 33c1fa6e28 webfinger protocol compatible + minor changes 2012-04-02 17:12:52 +02:00
Georg Ehrke 72a43b3929 revert 0fd8b1a044 2012-04-02 08:32:27 -04:00
Scott Shambarger d896c19011 cal import should group events by uid, export should have correct newlines, fix for oc-384 2012-03-31 20:16:42 -07:00
Tom Needham eba6a65908 try to use transactions to replace db 2012-04-01 00:25:47 +00:00
Tom Needham a248cc73e6 Merge branch 'master' into migration 2012-03-31 23:56:16 +00:00
Tom Needham daf742c086 Fix owncloud log 2012-03-31 23:55:41 +00:00
Tom Needham 3e84d85482 remove debug 2012-03-31 22:50:57 +00:00
Tom Needham aba3182a7d Fix loading image after export failure 2012-03-31 22:47:38 +00:00
Tom Needham f7d8a8c571 Merge branch 'master' into migration 2012-03-31 22:44:50 +00:00
Tom Needham d20eea9761 Use ajax to download file, OC_Dialogs for errors 2012-03-31 22:41:43 +00:00
Georg Ehrke 0fd8b1a044 fix events.php for rewritten OC_Caledar_App class 2012-03-31 16:16:34 -04:00
Georg Ehrke ca2c7001c4 remove unused code in OC_Calendar_App class 2012-03-31 16:15:04 -04:00
Georg Ehrke 70237f7ecc rewrite OC_Calendar_APP class 2012-03-31 16:13:04 -04:00
Georg Ehrke 10fc51dc92 add public sharing fir calendars and events - add function in Share class 2012-03-31 16:12:27 -04:00
Georg Ehrke cf26f8a6a7 add public sharing for calendars and events 2012-03-31 17:32:43 +01:00
Georg Ehrke 4b3f074309 add new parameters to export file 2012-03-31 17:27:30 +01:00
Georg Ehrke 1f8cf2d8f2 fix name of constants 2012-03-31 13:37:44 +02:00
Georg Ehrke a88305b4cb remove share tab from read only event dialog 2012-03-31 13:11:30 +02:00
Florian Hülsmann f9f91a08b4 webfinger reimplementation started 2012-03-31 02:42:41 +02:00
Bartek Przybylski 6b704a780d select field added to oc.dialogs.form, gallery ported to use it 2012-03-30 22:50:57 +02:00
Florian Hülsmann 5161758921 create static host-meta instead of symlink and .htaccess 2012-03-30 21:35:09 +02:00
Bartek Przybylski 6abb2cb92e fix sharing nested galleries 2012-03-30 21:14:01 +02:00
Georg Ehrke ef1e359c7c Merge branch 'master' into sabredav_1.6 2012-03-30 18:48:30 +02:00
Georg Ehrke e3203f87ff Merge branch 'master' into calendar_sharing 2012-03-30 18:42:09 +02:00
Jan-Christoph Borchardt 284955573c clarifying remoteStorage description 2012-03-30 18:18:37 +02:00
Jan-Christoph Borchardt dde5660915 renamed Gallery to Pictures, still needs to be changed in the code to also reflect in the path 2012-03-30 18:18:37 +02:00
Jan-Christoph Borchardt 011132feb3 renaming remote storage support to External storage support to clear up naming conflict 2012-03-30 18:18:37 +02:00
Robin Appelman 523fdda399 add the option to only load apps of a specific type 2012-03-30 14:39:07 +02:00
Georg Ehrke 90286353e2 Merge branch 'master' into sabredav_1.6 2012-03-29 23:20:03 +02:00
Georg Ehrke d15959d573 Merge branch 'master' into calendar_sharing 2012-03-29 23:19:31 +02:00
Bartek Przybylski f74d11c0c3 fix gallery sharing when root is not / 2012-03-29 20:45:21 +02:00
Thomas Tanghus 4b3282b325 Contacts: Removed obsolete code. 2012-03-29 15:36:04 +02:00
Thomas Tanghus 11f7eeb63a Improve actions on delete. 2012-03-29 15:25:24 +02:00
Thomas Tanghus b559952806 Cleanup stylesheet. 2012-03-29 15:25:24 +02:00
Michael Gapczynski 5fef9dfc22 Make users only able to share with users in groups they belong to 2012-03-28 21:18:17 -04:00
Robin Appelman 72882beb0d enble browsing tar files in the web interface 2012-03-28 23:53:51 +02:00
Robin Appelman 1b6fe4f65e stricter tests for archive backends and make sure we make the tests 2012-03-28 23:47:44 +02:00
Robin Appelman c26e003462 add tar backend for OC_Archive
also handles bz2/gz compression
2012-03-28 23:47:44 +02:00
Robin Appelman e57de98bbe add extract all option to OC_Archive 2012-03-28 23:47:44 +02:00
Georg Ehrke 08b4f996d3 add backslash r to the newline var 2012-03-28 17:06:16 +02:00
Georg Ehrke 0d16f177cb add scrollbar to the music list - bugfix for oc-301 2012-03-28 16:21:54 +02:00
Florian Hülsmann 34a0128ddf whitespace indentation fix 2012-03-28 16:12:34 +02:00
Florian Hülsmann bcda46eda3 webfinger installation creates symlink in document root 2012-03-28 16:07:50 +02:00
Tom Needham bd4fd76bfb Fix bookmarks migration provider 2012-03-27 21:35:29 +00:00
Tom Needham ef33219e4f import method returns each apps' import status 2012-03-27 21:21:14 +00:00
Tom Needham 553f4533c0 look for migrate.php in appinfo folder 2012-03-27 20:45:37 +00:00
Tom Needham c8acd4a594 Merge branch 'master' into migration 2012-03-27 20:19:38 +00:00
Georg Ehrke 536a3ecb42 Merge branch 'master' into sabredav_1.6 2012-03-27 20:54:16 +02:00
Georg Ehrke ede0a675bc Merge branch 'master' into calendar_sharing 2012-03-27 20:53:40 +02:00
Thomas Tanghus cb2dd97509 Trigger autocomplete wo button. 2012-03-27 12:30:20 +02:00
Thomas Tanghus fa165498cc Improvements in adding/deleting properties. 2012-03-27 12:30:20 +02:00
Thomas Tanghus ff038f8766 Contacts: Update contact list thumbnail when deleting PHOTO. 2012-03-27 12:30:20 +02:00
Georg Ehrke ff75d65d7e Merge branch 'master' into calendar_sharing 2012-03-27 09:29:16 +02:00
Georg Ehrke c384e3ba4f fix width of dropdown to select monthdays - bugfix oc-354 2012-03-27 09:24:55 +02:00
Robin Appelman eb3ec05f88 fix gallery scan when an image cant be loaded 2012-03-26 23:56:07 +02:00
Robin Appelman 73c6db5c8e crop and resize in a single step when creating thumbnail
also so more explicit memory cleanup
2012-03-26 23:53:48 +02:00
Robin Appelman 3f881f1ca5 memory cleanup in gallery 2012-03-26 22:40:38 +02:00
Thomas Tanghus 60a939dfcf Small change and muting debug. 2012-03-26 22:26:06 +02:00
Thomas Tanghus 0da988a1bb Check for empty value.
Added missing classes on action icons.
2012-03-26 22:08:03 +02:00
Bart Visscher ee31bc7995 Contacts: Fix saveproperty for categories 2012-03-26 21:47:37 +02:00
Georg Ehrke a867bcab46 Merge branch 'master' into calendar_sharing 2012-03-26 21:46:40 +02:00
Thomas Tanghus 6ff89dcf72 Removed obsolete code. 2012-03-26 19:13:48 +02:00
Georg Ehrke f479105f5e optimize choosecalendar dialog for shared calendars 2012-03-26 16:01:55 +02:00
Georg Ehrke 10ef01b04b fix displayed username of person who shares 2012-03-26 15:44:24 +02:00
Georg Ehrke 8b9d439841 Calendar: fix address for import file 2012-03-26 15:37:47 +02:00
Georg Ehrke 179bf15daf fix group sql generator in calendar's share lib 2012-03-26 15:30:04 +02:00
Georg Ehrke 71b32f7ad4 add read only 'form' for shared events 2012-03-26 15:24:43 +02:00
Georg Ehrke 96dd008f5e Merge branch 'master' into calendar_sharing 2012-03-26 09:50:39 +02:00
Georg Ehrke b7a5ae38c5 fix sql command in calendar's share lib 2012-03-26 09:48:58 +02:00
Thomas Tanghus 102cf150b3 Fixed error in OC_Contacts_VCard::addFromDAVData as pointed out by Guillaume ZITTA 2012-03-26 02:04:34 +02:00
Georg Ehrke ac0c5ba6da Merge branch 'master' into sabredav_1.6 2012-03-25 14:02:40 +02:00
Georg Ehrke 19c101a660 fix merge conflicts 2012-03-25 14:02:02 +02:00
Michael Gapczynski 34c08b3165 Add test for Google Docs storage backend, tester needs to token and token secret to config 2012-03-24 15:46:28 -04:00
Michael Gapczynski d139e3c3cd Move Google Docs storage backend to files_remote app 2012-03-24 15:28:05 -04:00
Bartek Przybylski c23090b43c spaces to tabs in bookmarks 2012-03-24 19:55:44 +01:00
Bartek Przybylski a3125f164e bookmarks tag placement & list width fix 2012-03-24 19:55:43 +01:00
Bartek Przybylski 826cb2c650 fix sharing address construction in opera and firefox 2012-03-24 19:26:53 +01:00
Bartek Przybylski be60b451eb fix albums thumbnails preview for opera 2012-03-24 19:21:36 +01:00
Bartek Przybylski afcf965498 fixup: sharing gallery for loggedin users fail 2012-03-24 18:40:27 +01:00
Bartek Przybylski cbdcb68c2b gallery sharing, experimental version 2012-03-24 18:35:42 +01:00
Robin Appelman e0cbefc727 webdav storage backend 2012-03-23 18:55:26 +01:00
Georg Ehrke 0e11cc9f6f fix previous made bug and fix oc bug - oc-139 2012-03-23 17:27:52 +01:00
Georg Ehrke ac8362e34a check if the title of an event is null - bugfix for oc-139 2012-03-23 17:09:51 +01:00
Georg Ehrke b63b377c4d Bookmarks: make link text click clickable too - bugfix for oc-131 2012-03-23 16:58:48 +01:00
Georg Ehrke 45b320d674 use unnamed as title for a bookmark if no title was entered and curl fails 2012-03-23 16:54:15 +01:00
Georg Ehrke 37963fee28 Merge branch 'master' into calendar_sharing 2012-03-22 20:40:20 +01:00
Georg Ehrke 8e8c4a8edc Merge branch 'master' into sabredav_1.6 2012-03-22 20:40:04 +01:00
Robin Appelman 82b54938e3 ftp storage backend 2012-03-22 19:56:19 +01:00
Georg Ehrke 5b03de9a66 fix comments in crypt lib 2012-03-21 17:43:09 +01:00
Tom Needham 892343c7c1 Fix instance import 2012-03-21 16:30:59 +00:00
Georg Ehrke 61166c1002 Merge branch 'master' into calendar_sharing 2012-03-21 09:43:29 +01:00
Georg Ehrke 8f8d486f35 Merge branch 'master' into sabredav_1.6 2012-03-21 09:42:53 +01:00
Tom Needham 07d7138df0 Register admin pane 2012-03-20 20:34:20 +00:00
Tom Needham 0fa5e196ef Try to use old uid when importing 2012-03-20 20:32:01 +00:00
Tom Needham 514c9ad8e7 Added unified import method. 2012-03-20 20:19:21 +00:00
Georg Ehrke 19bbb61b20 fix spelling fail in texteditor's style.css 2012-03-20 19:48:08 +01:00
Tom Needham 145d6f3566 Add OC_Migration_Content class to help app devs. Restructure OC_Migrate. 2012-03-19 20:44:20 +00:00
Georg Ehrke 194211500b register text/x-vcard as a fileaction for vcard import 2012-03-19 09:58:44 +01:00
Georg Ehrke 33b06c4484 Merge branch 'master' into sabredav_1.6 2012-03-19 08:33:36 +01:00
Georg Ehrke ddb7197c9c Merge branch 'master' into calendar_sharing 2012-03-18 00:53:02 +01:00
Bartek Przybylski de09883d86 creating and retrive thumbnails for intermediate galleries 2012-03-17 23:41:10 +01:00
Tom Needham bc085c3ff4 Create new user, create new data dir, copy files, import app data 2012-03-17 16:25:14 +00:00
Tom Needham 5234e66bab Add exportinfo to user exports. 2012-03-17 13:53:00 +00:00
Tom Needham 27bf34f7be Move user import to the admin 2012-03-17 13:30:58 +00:00
Georg Ehrke eaa1074ccb Merge branch 'master' into calendar_sharing 2012-03-17 13:59:00 +01:00
Tom Needham 122f7e4c2f Dont truncate the time format 2012-03-17 12:41:16 +00:00
Bartek Przybylski 8e22823501 bredcrumb fix 2012-03-17 13:30:45 +01:00
Tom Needham 222bb2303f Added prototype of user import 2012-03-16 22:54:37 +00:00
Tom Needham 5332c319a2 Migration info is an object. Other fixes 2012-03-16 22:50:35 +00:00
Tom Needham c442a06a02 Fix export for admin and users. Added 3 admin export types 2012-03-16 21:09:36 +00:00
Georg Ehrke 27218f85cb Merge branch 'master' into calendar_sharing 2012-03-16 12:17:58 +01:00
Tom Needham 50233d075c Improve admin_export ui and move system export cde to OC_Migrate 2012-03-15 20:52:43 +00:00
Bartek Przybylski 0fadbee699 fix adding photo to incorrect gallery 2012-03-15 00:09:06 +01:00
Bartek Przybylski 193e93e4a9 creating intermediate galleries 2012-03-14 22:28:55 +01:00
Tom Needham c9be325af2 Fix zip creation. Add param to cleanUp() method. Add defaults to createExportFile() method. 2012-03-14 16:43:06 +00:00
Tom Needham a310a81053 move zip creation inside OC_Migrate 2012-03-13 23:09:43 +00:00
Tom Needham a919a136c4 Finish import function for bookmarks 2012-03-13 21:24:07 +00:00
Tom Needham cd2f75fdad Use data dir from config.php 2012-03-13 17:27:47 +00:00
Tom Needham 0f3eebbbd9 added cleanUp() method to OC_Migrate 2012-03-13 17:18:42 +00:00
Tom Needham 7e3b35a57c fix structure of user export zip 2012-03-13 17:08:20 +00:00
Tom Needham 111af7fed5 json encode the output 2012-03-13 17:04:49 +00:00
Tom Needham 4d5646a59f Find migrate.php even for disabled apps. Improve ui for user and admin migrations 2012-03-13 16:21:17 +00:00
Thomas Tanghus 4a91c6dbed Make PHOTO deletable. 2012-03-13 14:56:03 +01:00
Thomas Tanghus 9e83f0247f Added sync path for iOS/OS X. 2012-03-13 14:28:38 +01:00
Thomas Tanghus 6b01d7be9a Fixed NOTE property UI. 2012-03-13 02:55:17 +01:00
Thomas Tanghus dd0daa6e33 Cleanup in Contacts. 2012-03-13 00:55:15 +01:00
Thomas Tanghus 551b4443e1 Force load profile pic after edit hack. 2012-03-12 21:56:28 +01:00
Thomas Tanghus 60fe9dda5d Remember categories when they have changed. 2012-03-12 21:55:54 +01:00
Tom Needham 1cdb4396a4 Fix copyRows() return value. Generate app info and oc info on return 2012-03-12 18:40:14 +00:00
Thomas Tanghus 3efa5f17f2 Rename... 2012-03-12 16:47:29 +01:00
Thomas Tanghus c55d2af6b3 More modifications for using jquery.multiple_autocomplete. 2012-03-12 16:44:16 +01:00
Thomas Tanghus 2b8125f4ba Small fix to jquery.multiple_autocomplete. 2012-03-12 15:30:52 +01:00
Thomas Tanghus d36d317bb2 Contacts: Modifications for using categories. 2012-03-12 14:13:03 +01:00
Tom Needham 9c032ecc33 Fix return value of export 2012-03-11 22:20:01 +00:00
Tom Needham fa5a5649c6 Fix copyRows() and sqlite connection 2012-03-11 22:09:16 +00:00
Bartek Przybylski 618f92b3fb fix thumbnail generation 2012-03-11 20:00:50 +01:00
Bartek Przybylski d5959872e1 disabling file handlers in gallery for now 2012-03-11 19:17:51 +01:00
Bartek Przybylski 4b8ff4d910 media scanner fix 2012-03-11 17:29:21 +01:00
Bartek Przybylski f6075cc1fe gallery migration to events system 2012-03-11 16:49:42 +01:00
Tom Needham 92221e98de spaces to tabs 2012-03-11 12:03:41 +00:00
Tom Needham d712d7f52c Lots of fixes, improve copyRows() method and update settings page. 2012-03-10 18:18:58 +00:00
Tom Needham 3ca76d24a9 Add OC_Migrate::copyRows() method 2012-03-10 15:52:38 +00:00
Tom Needham dc3dd272f7 Text editor will now wrap text based on window size 2012-03-10 14:32:57 +00:00
Tom Needham 1aaf008020 fix character encoding bug oc-278 2012-03-10 14:06:30 +00:00
Tom Needham 3f507898d0 update file extensions in editor 2012-03-10 14:00:57 +00:00
Bartek Przybylski 84d6c53970 filecache search comparition fix 2012-03-09 16:28:26 +01:00
Thomas Tanghus 2582fe1c89 Yet a missing file :-P 2012-03-09 13:56:20 +01:00
Thomas Tanghus 98bf8cfeb6 Added missing template. 2012-03-09 12:11:52 +01:00
Thomas Tanghus 2cbd281637 Merge branch 'vcategories' 2012-03-09 10:29:58 +01:00
Thomas Tanghus 8228a554a4 Temporarily disabled multi_autoselect. 2012-03-09 10:29:00 +01:00
Thomas Tanghus bc5d9f5868 Parses malformed N fields a bit more tolerantly. Thanks to nibbler for the patch :-) 2012-03-09 07:39:35 +01:00
Thomas Tanghus 8495e1a63e Add missing file. 2012-03-09 07:39:35 +01:00
Bart Visscher f8b62d49ee Tasks: Ordering of the task list 2012-03-08 22:27:29 +01:00
Bart Visscher d1b2c10422 Tasks: Update task list when adding or updating tasks 2012-03-08 22:26:54 +01:00
Robin Appelman 700a120c22 fix write hook for gallery 2012-03-08 15:47:49 +01:00
Thomas Tanghus a33a62bf60 Merge branch 'vcategories' of gitorious.org:owncloud/owncloud into vcategories
Conflicts:
	apps/contacts/lib/vcard.php
	apps/contacts/templates/part.contact.php
2012-03-08 02:55:48 +01:00
Thomas Tanghus ae7aab2d6e Merge gitorious.org:owncloud/owncloud into vcategories
Conflicts:
	apps/contacts/ajax/saveproperty.php
	apps/contacts/lib/vcard.php
2012-03-07 23:38:44 +01:00
Thomas Tanghus 91d85e9b16 Use OC.dialogs. 2012-03-07 22:57:37 +01:00
Bart Visscher 340320625e Contacts: Add UI for categories 2012-03-07 21:50:55 +01:00
Bart Visscher 9908adb320 Merge branch 'master' into vcategories
Conflicts:
	apps/contacts/lib/vcard.php
2012-03-07 21:49:46 +01:00
Bart Visscher d8cfe77ba5 Contacts: small fixes and cleanups 2012-03-07 21:46:42 +01:00
Bart Visscher 9599548203 Contacts: change card parameter type of VCard::edit and VCard::add
changed to OC_VObject
2012-03-07 21:46:42 +01:00
Bart Visscher 97ab706a6a Contacts: No random token for contactphoto 2012-03-07 21:46:42 +01:00
Bart Visscher 46aa011ef9 Contacts: Add Organisation as Name property choice 2012-03-07 21:46:41 +01:00
Bart Visscher 9ccf46d350 Contacts: convert class attribute selectors to class selectors 2012-03-07 21:46:41 +01:00
Thomas Tanghus 57c4d39b1e Fix conflict. 2012-03-07 20:57:05 +01:00
Robin Appelman cf5d63f0ab some js cleanup for gallary
also tabs no spaces
2012-03-07 18:58:10 +01:00
Robin Appelman d8d2939668 dont use numRows and fix some of the gallary hooks 2012-03-07 17:31:01 +01:00
Thomas Tanghus 75323b86d1 Contacts: UI updates and ajax methods for categories. 2012-03-07 16:39:56 +01:00
Robin Appelman 1d88ab57ec dont open the album when clicking the remove/rename button 2012-03-07 16:28:57 +01:00
Robin Appelman 41817db2e2 no rounded borders for album decoration 2012-03-07 16:27:51 +01:00
Robin Appelman a4543175ce make gallary work with archives 2012-03-07 16:24:49 +01:00
rok fb88bdba69 Ability to save an arbitrary number of external sites 2012-03-07 14:59:19 +01:00
Bartek Przybylski 0a78849391 multilevel gallery 2012-03-04 18:28:41 +01:00
Georg Ehrke c40668e3a9 Merge branch 'master' into calendar_sharing 2012-03-04 10:10:19 +01:00
Bartek Przybylski c411826fe5 moving gallery op to one file, migrate gallery dialogs to oc dialogs 2012-03-04 00:35:37 +01:00
Robin Appelman af214d9dcd change gallary scanning to support gallaries inside archives 2012-03-03 22:04:34 +01:00
Robin Appelman a5df3f8ea7 allow transparent opening of zip files from the web interface 2012-03-03 21:23:35 +01:00
Tom Needham 691103acd5 Use json for migration data 2012-03-03 17:30:21 +00:00
Tom Needham 34f05ba180 Udpdate bookmarks migration provider. App version included in export. 2012-03-03 14:35:17 +00:00
Georg Ehrke f2dcab50b5 fix merge conflicts 2012-03-03 15:06:51 +01:00
Georg Ehrke 4c45483ad3 make calendar compatible with php 5.2 - works for me with PHP 5.2.12 2012-03-03 14:30:52 +01:00
Tom Needham 188a304625 Replace db on import. Update user_migration export function. 2012-03-03 13:26:01 +00:00
Tom Needham 6906988b4e Update bookmarks migration provider. 2012-03-03 13:22:45 +00:00
Robin Appelman 23b64cd9ce remove the archive after a testcase is done 2012-03-03 01:37:00 +01:00
Robin Appelman 042878a5a9 add archive library and a storage provider on top of the archive library
only zip backend is implemented atm
2012-03-03 00:57:52 +01:00
Tom Needham 86fed4c226 Update database.xml locations. Fix dbexport.xml. 2012-03-02 22:19:06 +00:00
Tom Needham 8188a9f51b change <create> value in db export 2012-03-02 21:54:44 +00:00
Tom Needham 45ef2ecf52 Fix merge conflict 2012-03-02 21:35:48 +00:00
Jakob Sack 1865659ce1 Fix missing bracket 2012-03-02 21:01:44 +01:00
Jakob Sack 503e5cada3 Add /dav.php, a single location bundling all *DAV-operations. 2012-03-02 20:25:20 +01:00
Bart Visscher d1dcd7893c Search: Change provider registration to class name, for lazy loading of search providers 2012-03-01 22:59:35 +01:00
Michiel de Jong 1471d8f710 remoteStorage app version 0.5 2012-03-01 20:58:14 +00:00
Michiel de Jong e10402c61b remoteStorage app version 0.5 2012-03-01 20:55:20 +00:00
Michiel de Jong 5d8d7ef2a1 remoteStorage app version 0.5 2012-03-01 20:55:12 +00:00
Bart Visscher 5dcd9e20d0 Small cleanups 2012-03-01 21:00:23 +01:00
Bart Visscher ec2f49833d Calendar: Don't request edit form for readonly events 2012-03-01 21:00:23 +01:00
Bart Visscher f914cd0144 Implement showing Birthdays of contacts in the calendar 2012-03-01 21:00:22 +01:00
Bart Visscher fe3bcb5fe2 Calendar: fix bug in creating DTEND from DTSTART 2012-03-01 21:00:22 +01:00
Bart Visscher 642ccd27ab Bookmarks: fix loading and displaying of the bookmarks 2012-03-01 20:57:11 +01:00
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
Georg Ehrke bfb67286c8 fix merge conflicts 2012-02-25 16:54:27 +01:00
Robin Appelman ea8f71a19c Merge branch 'master' into encryption 2012-02-25 16:36:58 +01:00
Georg Ehrke 097ce76fc4 Merge branch 'master' into sabredav_1.6 2012-02-25 16:29:32 +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
Georg Ehrke 1d1dfcbc1a replace Sabre_VObject_Element_DateTime with Sabre_VObject_Property_DateTime 2012-02-24 22:20:40 +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
Bart Visscher 8f9c852325 Add filtering on category, priority and location 2012-02-23 21:11:31 +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
Bart Visscher c768751c23 Display more information in the task list 2012-02-22 22:06:06 +01:00
Bart Visscher f3ebd29661 Fix updating task for new calendar API 2012-02-22 21:15:57 +01:00
Bart Visscher 18bac944b4 Change loading of tasks to ajax call 2012-02-22 20:21:27 +01:00
Bart Visscher 92db4f8be0 Update edittaskform for new calendar API 2012-02-22 20:12:54 +01:00
Bart Visscher 7f754c02f3 Change code from using OC_Tasks_VTodo to OC_Tasks_App 2012-02-22 20:11:38 +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