]>
source.dussan.org Git - nextcloud-server.git/log
Georg Ehrke [Mon, 26 Mar 2012 07:50:39 +0000 (09:50 +0200)]
Merge branch 'master' into calendar_sharing
Georg Ehrke [Mon, 26 Mar 2012 07:48:58 +0000 (09:48 +0200)]
fix sql command in calendar's share lib
Thomas Tanghus [Mon, 26 Mar 2012 00:04:34 +0000 (02:04 +0200)]
Fixed error in OC_Contacts_VCard::addFromDAVData as pointed out by Guillaume ZITTA
Georg Ehrke [Sun, 25 Mar 2012 12:16:39 +0000 (14:16 +0200)]
add error 403 site
Georg Ehrke [Sun, 25 Mar 2012 12:02:02 +0000 (14:02 +0200)]
fix merge conflicts
Michael Gapczynski [Sat, 24 Mar 2012 19:46:28 +0000 (15:46 -0400)]
Add test for Google Docs storage backend, tester needs to token and token secret to config
Michael Gapczynski [Sat, 24 Mar 2012 19:27:42 +0000 (15:27 -0400)]
Move Google Docs storage backend to files_remote app
Bartek Przybylski [Sat, 24 Mar 2012 18:54:54 +0000 (19:54 +0100)]
spaces to tabs in bookmarks
Bartek Przybylski [Sat, 24 Mar 2012 18:53:39 +0000 (19:53 +0100)]
bookmarks tag placement & list width fix
Michael Gapczynski [Sat, 24 Mar 2012 18:49:44 +0000 (14:49 -0400)]
Implement fopen() for Google Docs storage backend
Bartek Przybylski [Sat, 24 Mar 2012 18:26:53 +0000 (19:26 +0100)]
fix sharing address construction in opera and firefox
Bartek Przybylski [Sat, 24 Mar 2012 18:21:36 +0000 (19:21 +0100)]
fix albums thumbnails preview for opera
Bartek Przybylski [Sat, 24 Mar 2012 17:40:27 +0000 (18:40 +0100)]
fixup: sharing gallery for loggedin users fail
Bartek Przybylski [Sat, 24 Mar 2012 17:35:16 +0000 (18:35 +0100)]
gallery sharing, experimental version
Robin Appelman [Fri, 23 Mar 2012 17:54:38 +0000 (18:54 +0100)]
webdav storage backend
Robin Appelman [Fri, 23 Mar 2012 17:52:41 +0000 (18:52 +0100)]
make sure we can load OC_Config when we need it
Georg Ehrke [Fri, 23 Mar 2012 16:27:52 +0000 (17:27 +0100)]
fix previous made bug and fix oc bug - oc-139
Georg Ehrke [Fri, 23 Mar 2012 16:09:51 +0000 (17:09 +0100)]
check if the title of an event is null - bugfix for oc-139
Georg Ehrke [Fri, 23 Mar 2012 15:58:48 +0000 (16:58 +0100)]
Bookmarks: make link text click clickable too - bugfix for oc-131
Georg Ehrke [Fri, 23 Mar 2012 15:53:44 +0000 (16:53 +0100)]
use unnamed as title for a bookmark if no title was entered and curl fails
Frank Karlitschek [Fri, 23 Mar 2012 15:48:16 +0000 (16:48 +0100)]
don´t show ugly error message
Frank Karlitschek [Fri, 23 Mar 2012 14:52:41 +0000 (15:52 +0100)]
make it possible to connect to other ocs appstores and other ocs knowledgebase servers.
also make it possible to switch the app store and the knowledgebase off completely.
Georg Ehrke [Thu, 22 Mar 2012 19:40:20 +0000 (20:40 +0100)]
Merge branch 'master' into calendar_sharing
Robin Appelman [Thu, 22 Mar 2012 18:56:19 +0000 (19:56 +0100)]
ftp storage backend
Robin Appelman [Thu, 22 Mar 2012 18:54:24 +0000 (19:54 +0100)]
loosen tests for mtime and ctime a bit
Georg Ehrke [Wed, 21 Mar 2012 10:57:15 +0000 (11:57 +0100)]
fix comments in crypt lib
Arthur Schiwon [Wed, 21 Mar 2012 12:10:02 +0000 (13:10 +0100)]
use placeholder in template file
Arthur Schiwon [Wed, 21 Mar 2012 12:05:15 +0000 (13:05 +0100)]
Config file is more appropriate here
adjust default value
Georg Ehrke [Wed, 21 Mar 2012 08:43:29 +0000 (09:43 +0100)]
Merge branch 'master' into calendar_sharing
Georg Ehrke [Tue, 20 Mar 2012 18:48:08 +0000 (19:48 +0100)]
fix spelling fail in texteditor's style.css
Georg Ehrke [Tue, 20 Mar 2012 17:46:56 +0000 (18:46 +0100)]
add microsoft office mimetypes to the fixlist - bugfix for oc-357
Bart Visscher [Mon, 19 Mar 2012 20:55:27 +0000 (21:55 +0100)]
Cleanup the template code for redundant code
Bart Visscher [Mon, 19 Mar 2012 20:42:59 +0000 (21:42 +0100)]
Split the init function in lib/base.php a bit
Georg Ehrke [Mon, 19 Mar 2012 11:41:10 +0000 (12:41 +0100)]
fix mimetype detection
Arthur Schiwon [Mon, 19 Mar 2012 10:56:02 +0000 (11:56 +0100)]
enable admin to turn off ZIP downloads
user interface offers multi-file/folder downloads only if available
make function name more clear
Georg Ehrke [Mon, 19 Mar 2012 08:58:44 +0000 (09:58 +0100)]
register text/x-vcard as a fileaction for vcard import
Georg Ehrke [Mon, 19 Mar 2012 08:09:18 +0000 (09:09 +0100)]
add a proper email address for lostpassword service - bugfix for oc-178
Georg Ehrke [Sat, 17 Mar 2012 23:53:02 +0000 (00:53 +0100)]
Merge branch 'master' into calendar_sharing
Bartek Przybylski [Sat, 17 Mar 2012 22:41:10 +0000 (23:41 +0100)]
creating and retrive thumbnails for intermediate galleries
Georg Ehrke [Sat, 17 Mar 2012 12:59:00 +0000 (13:59 +0100)]
Merge branch 'master' into calendar_sharing
Tom Needham [Sat, 17 Mar 2012 12:51:11 +0000 (12:51 +0000)]
Don't truncate users email
Tom Needham [Sat, 17 Mar 2012 12:41:16 +0000 (12:41 +0000)]
Dont truncate the time format
Bartek Przybylski [Sat, 17 Mar 2012 12:30:18 +0000 (13:30 +0100)]
bredcrumb fix
Georg Ehrke [Fri, 16 Mar 2012 23:00:04 +0000 (00:00 +0100)]
Merge branch 'master' into calendar_sharing
Arthur Schiwon [Fri, 16 Mar 2012 15:25:41 +0000 (16:25 +0100)]
it may take time for zip file download, so give a message
Arthur Schiwon [Fri, 16 Mar 2012 15:25:15 +0000 (16:25 +0100)]
check if selected files for zip archive are not too large
offer config option
Arthur Schiwon [Fri, 16 Mar 2012 15:00:12 +0000 (16:00 +0100)]
make Files settings work
Georg Ehrke [Fri, 16 Mar 2012 11:17:58 +0000 (12:17 +0100)]
Merge branch 'master' into calendar_sharing
Bartek Przybylski [Wed, 14 Mar 2012 23:09:06 +0000 (00:09 +0100)]
fix adding photo to incorrect gallery
Bartek Przybylski [Wed, 14 Mar 2012 21:28:55 +0000 (22:28 +0100)]
creating intermediate galleries
Thomas Tanghus [Tue, 13 Mar 2012 13:56:03 +0000 (14:56 +0100)]
Make PHOTO deletable.
Thomas Tanghus [Tue, 13 Mar 2012 13:28:38 +0000 (14:28 +0100)]
Added sync path for iOS/OS X.
Thomas Tanghus [Tue, 13 Mar 2012 01:55:17 +0000 (02:55 +0100)]
Fixed NOTE property UI.
Thomas Tanghus [Mon, 12 Mar 2012 23:55:15 +0000 (00:55 +0100)]
Cleanup in Contacts.
Thomas Tanghus [Mon, 12 Mar 2012 20:56:28 +0000 (21:56 +0100)]
Force load profile pic after edit hack.
Thomas Tanghus [Mon, 12 Mar 2012 20:55:54 +0000 (21:55 +0100)]
Remember categories when they have changed.
Thomas Tanghus [Mon, 12 Mar 2012 15:47:29 +0000 (16:47 +0100)]
Rename...
Thomas Tanghus [Mon, 12 Mar 2012 15:44:16 +0000 (16:44 +0100)]
More modifications for using jquery.multiple_autocomplete.
Thomas Tanghus [Mon, 12 Mar 2012 14:30:52 +0000 (15:30 +0100)]
Small fix to jquery.multiple_autocomplete.
Thomas Tanghus [Mon, 12 Mar 2012 13:12:27 +0000 (14:12 +0100)]
Contacts: Modifications for using categories.
Thomas Tanghus [Mon, 12 Mar 2012 13:07:48 +0000 (14:07 +0100)]
Added category editor for apps using OC_VObjects.
Robin Appelman [Sun, 11 Mar 2012 20:48:35 +0000 (21:48 +0100)]
oc_db isn't pdo
Bartek Przybylski [Sun, 11 Mar 2012 19:00:50 +0000 (20:00 +0100)]
fix thumbnail generation
Bartek Przybylski [Sun, 11 Mar 2012 18:17:51 +0000 (19:17 +0100)]
disabling file handlers in gallery for now
Bartek Przybylski [Sun, 11 Mar 2012 16:29:21 +0000 (17:29 +0100)]
media scanner fix
Bartek Przybylski [Sun, 11 Mar 2012 15:49:21 +0000 (16:49 +0100)]
gallery migration to events system
Tom Needham [Sun, 11 Mar 2012 12:03:41 +0000 (12:03 +0000)]
spaces to tabs
Tom Needham [Sat, 10 Mar 2012 14:32:57 +0000 (14:32 +0000)]
Text editor will now wrap text based on window size
Tom Needham [Sat, 10 Mar 2012 14:06:30 +0000 (14:06 +0000)]
fix character encoding bug oc-278
Tom Needham [Sat, 10 Mar 2012 14:00:57 +0000 (14:00 +0000)]
update file extensions in editor
Bartek Przybylski [Fri, 9 Mar 2012 15:47:53 +0000 (16:47 +0100)]
spaces to tabs replacement
Bartek Przybylski [Fri, 9 Mar 2012 15:45:57 +0000 (16:45 +0100)]
filescan by mimetype scan
Bartek Przybylski [Fri, 9 Mar 2012 15:28:26 +0000 (16:28 +0100)]
filecache search comparition fix
Thomas Tanghus [Fri, 9 Mar 2012 12:56:20 +0000 (13:56 +0100)]
Yet a missing file :-P
Thomas Tanghus [Fri, 9 Mar 2012 11:11:52 +0000 (12:11 +0100)]
Added missing template.
Thomas Tanghus [Fri, 9 Mar 2012 09:29:58 +0000 (10:29 +0100)]
Merge branch 'vcategories'
Thomas Tanghus [Fri, 9 Mar 2012 09:29:00 +0000 (10:29 +0100)]
Temporarily disabled multi_autoselect.
Thomas Tanghus [Fri, 9 Mar 2012 06:36:05 +0000 (07:36 +0100)]
Parses malformed N fields a bit more tolerantly. Thanks to nibbler for the patch :-)
Thomas Tanghus [Wed, 22 Feb 2012 10:25:45 +0000 (11:25 +0100)]
Add missing file.
Robin Appelman [Thu, 8 Mar 2012 14:47:49 +0000 (15:47 +0100)]
fix write hook for gallery
Thomas Tanghus [Thu, 8 Mar 2012 01:55:48 +0000 (02:55 +0100)]
Merge branch 'vcategories' of gitorious.org:owncloud/owncloud into vcategories
Conflicts:
apps/contacts/lib/vcard.php
apps/contacts/templates/part.contact.php
Thomas Tanghus [Wed, 7 Mar 2012 22:38:44 +0000 (23:38 +0100)]
Merge gitorious.org:owncloud/owncloud into vcategories
Conflicts:
apps/contacts/ajax/saveproperty.php
apps/contacts/lib/vcard.php
Thomas Tanghus [Wed, 7 Mar 2012 21:57:37 +0000 (22:57 +0100)]
Use OC.dialogs.
Bart Visscher [Wed, 7 Mar 2012 20:50:55 +0000 (21:50 +0100)]
Contacts: Add UI for categories
Bart Visscher [Wed, 7 Mar 2012 20:49:46 +0000 (21:49 +0100)]
Merge branch 'master' into vcategories
Conflicts:
apps/contacts/lib/vcard.php
Bart Visscher [Wed, 7 Mar 2012 20:29:23 +0000 (21:29 +0100)]
Contacts: small fixes and cleanups
Bart Visscher [Wed, 7 Mar 2012 20:27:03 +0000 (21:27 +0100)]
Contacts: change card parameter type of VCard::edit and VCard::add
changed to OC_VObject
Bart Visscher [Mon, 5 Mar 2012 21:06:01 +0000 (22:06 +0100)]
Allow overflow of rightcontent area
Bart Visscher [Mon, 5 Mar 2012 21:05:30 +0000 (22:05 +0100)]
Contacts: No random token for contactphoto
Bart Visscher [Mon, 5 Mar 2012 21:03:33 +0000 (22:03 +0100)]
Contacts: Add Organisation as Name property choice
Bart Visscher [Mon, 5 Mar 2012 21:02:44 +0000 (22:02 +0100)]
Contacts: convert class attribute selectors to class selectors
Robin Appelman [Wed, 7 Mar 2012 20:43:44 +0000 (21:43 +0100)]
add option to add file from url
Thomas Tanghus [Wed, 7 Mar 2012 19:57:05 +0000 (20:57 +0100)]
Fix conflict.
Robin Appelman [Wed, 7 Mar 2012 17:58:10 +0000 (18:58 +0100)]
some js cleanup for gallary
also tabs no spaces
Robin Appelman [Wed, 7 Mar 2012 16:31:01 +0000 (17:31 +0100)]
dont use numRows and fix some of the gallary hooks
Thomas Tanghus [Wed, 7 Mar 2012 15:39:56 +0000 (16:39 +0100)]
Contacts: UI updates and ajax methods for categories.
Robin Appelman [Wed, 7 Mar 2012 15:28:57 +0000 (16:28 +0100)]
dont open the album when clicking the remove/rename button
Robin Appelman [Wed, 7 Mar 2012 15:27:51 +0000 (16:27 +0100)]
no rounded borders for album decoration
Robin Appelman [Wed, 7 Mar 2012 15:24:49 +0000 (16:24 +0100)]
make gallary work with archives
Robin Appelman [Wed, 7 Mar 2012 14:44:46 +0000 (15:44 +0100)]
fix for webdav when having additional storage backends mounted