Commit Graph

1423 Commits

Author SHA1 Message Date
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 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
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
Georg Ehrke 61166c1002 Merge branch 'master' into calendar_sharing 2012-03-21 09:43:29 +01:00
Georg Ehrke 19bbb61b20 fix spelling fail in texteditor's style.css 2012-03-20 19:48:08 +01:00
Georg Ehrke 194211500b register text/x-vcard as a fileaction for vcard import 2012-03-19 09:58:44 +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
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
Georg Ehrke 27218f85cb Merge branch 'master' into calendar_sharing 2012-03-16 12:17:58 +01: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
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
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
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 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