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
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
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
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
Robin Appelman
ea8f71a19c
Merge branch 'master' into encryption
2012-02-25 16:36:58 +01:00
Bartek Przybylski
3cf81cadd5
gallery thumbnail creation fix
2012-02-25 10:03:58 +01:00
Robin Appelman
7988541476
cleanup pdfviewer app name
2012-02-24 23:54:38 +01:00
Marvin Thomas Rabe
9df193f051
Calendar selection only available if there are more than one.
2012-02-23 22:28:14 +01:00
Marvin Thomas Rabe
7c738a1384
Sharing dropdown width fixed.
2012-02-23 22:28:13 +01:00
Georg Ehrke
b1fb325d48
rename updatecalendar to update
2012-02-23 22:07:31 +01:00
Georg Ehrke
f285790fa1
change links in the event form for the new ajax folders
2012-02-23 22:07:08 +01:00
Georg Ehrke
319e93f7fb
change pathes in calendar/templates/* files to make them work with the new folder structure in /calendar/ajax
2012-02-23 22:06:43 +01:00
Georg Ehrke
cfa284bfa8
update js files for new ajax pathes
2012-02-23 22:06:16 +01:00
Georg Ehrke
8cd1027214
better var name in changeview.php
2012-02-23 22:00:46 +01:00
Georg Ehrke
b7de1850a0
add moved files to clean up ajax folder
2012-02-23 21:58:39 +01:00
Georg Ehrke
e188b96596
remove old ajax files
2012-02-23 21:58:01 +01:00
Marvin Thomas Rabe
ce4fe9e7cb
Editor fixed.
2012-02-23 20:36:20 +01:00
Frank Karlitschek
a62e109e8c
make the location of the 3rdparty folder flexible.
...
It´s automatically search in the owncloud folder and in the parent folder.
override with an option in config.php is also possible
2012-02-23 15:37:38 +01:00
Marvin Thomas Rabe
196d619689
Little bookmark improvement
2012-02-22 23:58:38 +01:00
Marvin Thomas Rabe
358fd1c024
Changed text
2012-02-22 23:53:54 +01:00
Marvin Thomas Rabe
77493e8d70
Changed bookmarklet to read later widget
2012-02-22 23:52:56 +01:00
Marvin Thomas Rabe
996e6cf419
No bookmarks message will now show up if all bookmarks are delted
2012-02-22 23:28:36 +01:00
Marvin Thomas Rabe
3988ec2813
Updated bookmark form
2012-02-22 23:22:17 +01:00
Marvin Thomas Rabe
5387820a3b
changed look of bookmarklet
2012-02-22 23:08:50 +01:00
Alessandro Cosentino
70f9936651
sharing code between the two bookmarklets
2012-02-22 16:38:05 -05:00
Robin Appelman
814bc2fd2b
make encryption filetype blacklist configurable
2012-02-22 22:20:46 +01:00
Michiel de Jong
3f87c2cedb
correct header Content-Type: application/xrd+xml
2012-02-22 19:05:41 +00:00
Michiel de Jong
9850820b42
BearerAuth and multiple tokens support in remoteStorage app
2012-02-22 18:05:52 +00:00
Michiel de Jong
6c6b570ff1
avoid notice in error log from user_webfinger app
2012-02-22 18:04:21 +00:00
Marvin Thomas Rabe
fd72f2bd29
Removed redundant code.
2012-02-22 16:04:32 +01:00
Marvin Thomas Rabe
e2d6bf4c63
Bookmarklet Window closes itself after submit.
2012-02-22 16:04:32 +01:00
Marvin Thomas Rabe
d9914664f6
Text editor display error fixed.
2012-02-22 16:04:31 +01:00
Marvin Thomas Rabe
b3f3b8c23f
UI problems solved. Bookmarks app updated.
2012-02-22 16:04:31 +01:00
Robin Appelman
ed0c99ef14
make sure we always have the encryption key unlocked
2012-02-22 15:18:22 +01:00
Robin Appelman
1a9ded981b
Merge branch 'master' into enc
2012-02-22 14:26:52 +01:00
Thomas Tanghus
faf6055baa
Translate and fix copy/paste error.
2012-02-22 14:19:23 +01:00
Thomas Tanghus
9794e7e427
Fix merge conflict.
2012-02-22 11:20:57 +01:00
Thomas Tanghus
c5c843bfef
Improved upgrading VCARD v. 2.1 => 3.0. Improved import of malformed cards. Remove duplicate code.
2012-02-21 23:22:06 +01:00
Thomas Tanghus
e0c92662f8
JS fix on address book creation.
2012-02-21 23:22:06 +01:00
Thomas Tanghus
a79f5d40de
Remove my FIXME comments when I've fixed it :-P
2012-02-21 23:22:06 +01:00
Robin Appelman
c20319d377
fix incorrect information in the filecache when using encryption
2012-02-21 20:48:49 +01:00
Robin Appelman
d9c7e4c333
proper mimetypes for encrypted files
2012-02-21 20:48:48 +01:00
Robin Appelman
325858e9e2
add stream wrapper for in-memory files and dont use global variables for the fakedir stream wrapper
2012-02-21 20:48:48 +01:00
Robin Appelman
c121a1a1e7
implement file_put_contents with stream data using fopen
2012-02-21 20:48:48 +01:00
Robin Appelman
6a8364c3ff
rework the way file_put_contents is handeled
2012-02-21 20:48:48 +01:00
Robin Appelman
b3a974d8bb
only trigger hooks for the default filesystem view
2012-02-21 20:48:48 +01:00
Robin Appelman
f1cbb9effc
initial integration of encryption
2012-02-21 20:48:48 +01:00
Robin Appelman
e2b4954176
simple file encryption wip
2012-02-21 20:48:48 +01:00
Robin Appelman
3d67cd51c2
encryption proxy wip
2012-02-21 20:48:47 +01:00
Bart Visscher
d3e6ea6ac0
Bookmarks: uses the core action icons
2012-02-21 20:28:24 +01:00
Bart Visscher
86d2927c02
Calendar: Correct calendarcolor format for ical color property
2012-02-21 20:10:40 +01:00
Marvin Thomas Rabe
21f8d0992f
Added missing files
2012-02-21 18:29:49 +01:00
Thomas Tanghus
7a49c8e59c
Merge gitorious.org:owncloud/owncloud into vcategories
2012-02-20 23:42:06 +01:00
VicDeo
d5f7a39936
Contact list scroll fix
2012-02-20 23:54:23 +03:00
Thomas Tanghus
ffdfe8257b
Contacts: Fix adding/updating address book with empty name.
2012-02-20 15:24:54 +01:00
Thomas Tanghus
456ada01fa
Contacts: Apply strip_tags on compound values.
2012-02-20 14:36:21 +01:00
Thomas Tanghus
12bcbcdc62
Update ctag in deleteFromDAVData.
2012-02-20 14:24:10 +01:00
Thomas Tanghus
8ed4262393
Merge gitorious.org:owncloud/owncloud into vcategories
2012-02-20 13:18:22 +01:00
Arthur Schiwon
7ff4e40b20
Combing LDAP backend with LDAP extended backend
2012-02-20 10:39:55 +01:00
Alessandro Cosentino
490c9db15d
Added bookmarklet for browser. Inspired by Google Bookmarks
2012-02-19 20:18:27 -05:00
Thomas Tanghus
c62673d360
Added public static OC_VCategories object to OC_Contacts_App.
...
Parse cards for new categories in add and edit methods.
2012-02-19 23:32:09 +01:00
Florian Pritz
9d2379742b
apps/calendar: update ctag after deleteFromDAVData
...
Without this clients won't see the update because they compare ctags
before fetching the actual calendar to reduce traffic.
Signed-off-by: Florian Pritz <bluewind@xinu.at>
2012-02-19 21:42:47 +01:00
Michael Gapczynski
87627c7a50
Fix overwriting of internal sharing for shared folders - bug oc-260
2012-02-18 19:30:54 -05:00
Tom Needham
71a2241aee
Fixed call to OC_User. Thanks Burillo on IRC
2012-02-18 23:53:10 +00:00
Thomas Tanghus
2ee2f87efe
Strip tags on address on client side.
2012-02-18 11:49:31 +01:00
Thomas Tanghus
868cf6bb83
Avoid errors from missing GD library.
2012-02-18 11:49:31 +01:00
Thomas Tanghus
96612c506e
Removed obsolete commented code and made minor speed improvements.
...
Added stub function for loading categories.
2012-02-18 11:49:31 +01:00
Michael Gapczynski
6f1ed85f0b
Temporary fix for sharing files
2012-02-17 21:56:20 -05:00
Bart Visscher
6bbd67c3c6
Calendar: only update default view when it really changed
2012-02-17 22:10:02 +01:00
Bart Visscher
539fd7240c
Calendar: optimize sending calendar events, also enabled caching of result
2012-02-17 22:09:31 +01:00
Bart Visscher
a33b757b19
Calendar: Add default repeat values when editing a non-repeating event
2012-02-17 22:09:22 +01:00
Bart Visscher
dab5531474
Bookmarks: Fix image urls in bookmarks.js
2012-02-17 22:07:15 +01:00
Bart Visscher
e8b69d45a3
Fixup use of OC_Helper::linkTo function
2012-02-17 22:07:14 +01:00
Bart Visscher
f47444e1f7
Use separate function to make absolute urls
2012-02-17 22:07:14 +01:00
Bart Visscher
5f3c549227
Contacts: Add removed app enabled check
2012-02-17 22:07:14 +01:00
Thomas Tanghus
86893ea78c
UI tweaks for name selector combobox.
2012-02-16 10:38:00 +01:00
Thomas Tanghus
fa7fabf024
Minor tweaks
2012-02-16 10:38:00 +01:00
Tom Needham
e6b835bea8
Update breadcrumb css on close
2012-02-14 21:55:51 +00:00
Tom Needham
aec6a3c32f
Fix editing shared files and file opening bug. Fixes oc-209 and oc-195
2012-02-14 21:49:51 +00:00
Thomas Tanghus
31dab0372d
Added some fixes for what to show when address books are (de)selected, all contacts deleted etc. Still need some cleaning up.
2012-02-14 13:57:11 +01:00
Thomas Tanghus
ae426ad115
Added some check for when addinf deleting contacts.
2012-02-14 10:36:22 +01:00
Thomas Tanghus
f7161bb48b
Added some error checking as mentioned in http://bugs.owncloud.org/thebuggenie/owncloud/issues/oc-227
2012-02-14 02:15:21 +01:00
Thomas Tanghus
dc20900e10
Modify check for missing UID.
2012-02-14 01:56:38 +01:00
Thomas Tanghus
53503148f3
Use proper index file.
2012-02-14 01:47:18 +01:00
Thomas Tanghus
4446854f75
Don't try to load a profile picture for contacts the doesn't have any.
2012-02-14 01:11:21 +01:00
Thomas Tanghus
07c422d81d
Removed superfluous debug.
2012-02-14 01:02:01 +01:00
Thomas Tanghus
3adaacc0ce
Added OC_Contacts_VCard::moveToAddressBook
2012-02-14 01:00:41 +01:00
Thomas Tanghus
024405e4f1
Added function for later testing.
2012-02-14 01:00:41 +01:00
Bart Visscher
a37bd93222
External: Use OC_Util::checkLoggedIn
2012-02-14 00:13:04 +01:00
Bart Visscher
777804fac2
Gallery: remove unused cover.php
2012-02-14 00:12:22 +01:00
Bart Visscher
525306c1e2
Replace Expires and caching headers by OC_Response functions
2012-02-13 23:48:05 +01:00
Bart Visscher
29fc82c364
Send gallery album thumbnail with OC_Response::sendFile
2012-02-13 23:35:37 +01:00
Bart Visscher
594dcf13f2
Contacts+OC_Respone: Move enableCaching out of setEtagHeader and setLastModifiedHeader
2012-02-13 22:47:31 +01:00
Bart Visscher
169ddc5b0b
Gallery: Only get local file when generating photo thumbnail
2012-02-13 22:39:30 +01:00
Bart Visscher
e137020f67
Gallery: Use OC_Respone::enableCaching for (album)thumbnails
2012-02-13 22:38:34 +01:00
Bart Visscher
e084386770
Gallery: Move login check to beginning of galleryOp.php
2012-02-13 22:33:52 +01:00
Bart Visscher
e402896001
Gallery: Remove autoloaded includes from galleryOp.php
2012-02-13 22:33:48 +01:00
Georg Ehrke
40d343e2af
fix oc-bug 239 - & => &
2012-02-12 22:34:10 +01:00
Bart Visscher
5c816c0cc9
Contacts: Optimize thumbnail cache handling a bit
2012-02-12 20:40:52 +01:00
Bart Visscher
125cf79a37
OC_Response: add setExpiresHeader function
2012-02-12 20:40:52 +01:00
Bart Visscher
45bb6f5fd4
OC_Response: add redirect function
2012-02-12 20:40:52 +01:00
Bart Visscher
ee7931f457
Contacts: Add missing parameter
2012-02-12 20:40:52 +01:00
Bart Visscher
0917bdecdd
Contacts: Move response caching to OC_Response
2012-02-12 17:21:33 +01:00
Tom Needham
a0bb6079c5
Add description to texteditor info.xml -fix oc-234
2012-02-12 15:42:05 +00:00
Bart Visscher
f5385e4a63
Contacts: Add id to vars with id in them
2012-02-12 16:12:46 +01:00
Bart Visscher
623afb69b6
Contacts: cleanup OC_L10N usage
2012-02-12 16:11:41 +01:00
Bart Visscher
39f342d595
Contacts: Move debug logging of $_POST to after access checks
2012-02-12 15:58:55 +01:00
Bart Visscher
6eb1427ac0
Contacts: Document usage of OC_Contacts_App::getAddressbook
...
Remove redundant access checks and add comments to the calls to
OC_Contacts_App::getAddressbook that are access checks
2012-02-12 15:55:36 +01:00
Bart Visscher
b77132edbe
Contacts: Save last-modified time in REV property if not set
2012-02-12 15:14:25 +01:00
Bart Visscher
6bd0aad117
Contacts: Fix adding N property in getContactVCard
2012-02-12 15:14:24 +01:00
Bart Visscher
facd4cbe17
Contacts: Cleanup photo and thumbnail code
2012-02-12 15:14:24 +01:00
Bart Visscher
90d189a8b3
Access check fix in contacts/ajax/activation.php
...
plus small cleanup
2012-02-12 15:14:24 +01:00
Bart Visscher
8f3da6ee9b
Small coding style update
...
Fixup OC_Contacts_App
2012-02-12 15:14:23 +01:00
Bart Visscher
1a74f0a18c
Improve logging in OC_Contacts_App
...
Add logging to errors paths in getAddressbook and getContactObject.
2012-02-12 15:14:23 +01:00
Bart Visscher
c4ee924869
Cleanup OC_Contacts_Addressbook::find usage
...
Use OC_Contacts_App::getAddressbook($id) instead of OC_Contacts_Addressbook::find($id), it contains access checks.
2012-02-12 15:14:23 +01:00
Bart Visscher
b5418173e5
Derive the user principles from the owncloud users
...
The code for updating the principles table is still there. To make it easier to
revert this commit if that is necessary.
2012-02-11 21:09:51 +01:00
Tom Needham
20b9678789
replace database name and table prefix with default values
2012-02-10 20:23:28 +00:00
Thomas Tanghus
1d6b4f8f3c
Merge branch 'tanghus_contacts'
2012-02-10 16:44:06 +01:00
Thomas Tanghus
b4924ed1e5
Variable wasn't reset.
2012-02-10 16:43:40 +01:00
Thomas Tanghus
fd9ce6da35
Merge gitorious.org:owncloud/owncloud into tanghus_contacts
2012-02-10 16:42:45 +01:00
Thomas Tanghus
c95e8a1fc5
Added custom combobox widget.
2012-02-10 16:40:40 +01:00
Tom Needham
2f80df1f9e
Merge branch 'master' of gitorious.org:owncloud/owncloud into migration
2012-02-10 15:24:26 +00:00
Bart Visscher
9379c3e128
Gallery: remove unset call, not needed anymore
2012-02-09 22:47:05 +01:00
Thomas Tanghus
25f1263c11
Merge gitorious.org:owncloud/owncloud into tanghus_contacts
2012-02-09 19:07:54 +01:00
Thomas Tanghus
ff53b0c209
Keep js data structure in sync on changes.
...
More checks for missing properties.
2012-02-09 19:04:07 +01:00
Bart Visscher
88b2391d2b
Fix wrong var name in sharedstorage.php
2012-02-08 21:12:31 +01:00
Bart Visscher
7cd1a302d3
Gallery: Add caching headers to album thumbnail sending
2012-02-08 21:12:31 +01:00
Bart Visscher
158360c09b
Gallery: use thumbnails of images for the album thumbnail
...
The thumbnails were already generated in this function, but now we save them
for displaying of the album.
2012-02-08 21:12:31 +01:00
Bart Visscher
43d2266f5c
Add caching to gallery thumbnail generation
2012-02-08 21:12:30 +01:00
Bart Visscher
eb5de4d4f7
Change gallery thumbnail generation to OC_Image
2012-02-08 21:12:30 +01:00
Bart Visscher
7c03b612d2
OC-41: [Calendar] Date format not translatable
2012-02-08 21:12:30 +01:00
Robin Appelman
c4a6b99814
use oc_filecache and oc_eventsource for music scanning
2012-02-08 17:30:16 +01:00
Robin Appelman
36d696c30d
dont load pdfview for ie
2012-02-08 16:28:59 +01:00
Robin Appelman
5f7727629a
Merge branch 'filesystem'
2012-02-08 15:50:58 +01:00
Thomas Tanghus
25faa40bd0
More @£#¤ conflicts
...
Merge branch 'temp' into tanghus_contacts
2012-02-08 09:36:16 +01:00
Thomas Tanghus
f4a586a52c
Fix merge conflicts
2012-02-08 09:18:58 +01:00
Thomas Tanghus
c191ef6459
Added files for new contact editor/viewer.
2012-02-08 09:14:10 +01:00
Thomas Tanghus
0c5eb542bd
Fixed broken "Add new" contact.
...
Possible fix for cards with missing 'FN' property added through DAV.
Misc. UI cleanups.
2012-02-08 08:47:03 +01:00
Thomas Tanghus
6112cdc7e8
Hide container for emails/phones/adresses if there are none.
2012-02-08 08:47:03 +01:00
Thomas Tanghus
9f1370a6d1
Updated copyrights.
...
Element menu didn't update.
2012-02-08 08:47:03 +01:00
Thomas Tanghus
c0c6b5310e
Added files for new contact editor/viewer.
2012-02-08 08:47:03 +01:00
Thomas Tanghus
3e9a69b9b7
Merge branch 'tanghus_contacts' of gitorious.org:owncloud/owncloud into tanghus_contacts
...
Conflicts:
apps/contacts/ajax/contactdetails.php
apps/contacts/js/contacts.js
2012-02-08 08:33:51 +01:00
Thomas Tanghus
424c64c0eb
Don't import cards that can't be parsed by Sabre, but log it instead.
...
Fix missing 'N' or 'FN' fields on import.
2012-02-08 07:59:39 +01:00
Thomas Tanghus
249e46c5b7
Some fixes for malformed VCards.
2012-02-08 07:59:39 +01:00
Thomas Tanghus
4db661ba9d
Fixed broken "Add new" contact.
...
Possible fix for cards with missing 'FN' property added through DAV.
Misc. UI cleanups.
2012-02-08 07:59:39 +01:00
Thomas Tanghus
23396721e4
Hide container for emails/phones/adresses if there are none.
2012-02-08 07:59:39 +01:00
Thomas Tanghus
1e4444f25b
Updated copyrights.
...
Element menu didn't update.
2012-02-08 07:59:39 +01:00
Thomas Tanghus
90a830baba
Added files for new contact editor/viewer.
2012-02-08 07:59:39 +01:00
Georg Ehrke
cdf1cf82ba
merge 64a617b2a1
into master
2012-02-07 22:49:23 +01:00
Thomas Tanghus
2cebfb50a4
Fixed broken "Add new" contact.
...
Possible fix for cards with missing 'FN' property added through DAV.
Misc. UI cleanups.
2012-02-06 14:18:40 +01:00
Thomas Tanghus
5962e66b6d
Hide container for emails/phones/adresses if there are none.
2012-02-06 08:15:23 +01:00
Thomas Tanghus
bc79951f33
Updated copyrights.
...
Element menu didn't update.
2012-02-06 08:04:06 +01:00
Thomas Tanghus
3af427fa54
Added files for new contact editor/viewer.
2012-02-06 07:32:57 +01:00
Thomas Tanghus
89616d81f0
Modification for adding photos.
2012-02-06 07:24:39 +01:00
Tom Needham
960dd750c9
Added dbexport to export output. Initial import code.
2012-02-05 23:00:38 +00:00
Robin Appelman
30673e4786
writable not writeable
2012-02-05 14:03:44 +01:00
Georg Ehrke
89073970d3
change comments in import.php
2012-02-05 12:13:53 +01:00
Georg Ehrke
8337eaa1ec
add import function for contacts
2012-02-05 12:13:53 +01:00
Robin Appelman
36bc1a2102
Merge branch 'master' into filesystem
2012-02-05 01:22:29 +01:00
Bartek Przybylski
cfc710e768
preferences store fix
2012-02-04 20:15:55 +01:00
Bartek Przybylski
f6a27dfa28
stripping root from gallery name
2012-02-04 15:35:58 +01:00
Bartek Przybylski
f1672d7d10
handling special chars in dirnames
2012-02-04 11:02:13 +01:00
Bartek Przybylski
5a106d1036
gallery: fix FS hooks
2012-02-04 10:30:32 +01:00
Tom Needham
24c79c5bce
Updated Migrate_provider bookmakr implementation
2012-02-03 22:41:39 +00:00
Tom Needham
1133eaa679
load bookmarks provider class
2012-02-03 21:28:58 +00:00
Tom Needham
ee88ded463
more commenting out for debugging, added logging commands
2012-02-03 21:00:12 +00:00
Tom Needham
0bbc9ade7d
fix syntax, add logging, debug xml output instead of zip
2012-02-03 20:48:32 +00:00
Bartek Przybylski
8df0650658
gallery settings, defining scan root and shor order
2012-02-03 21:38:44 +01:00
Bartek Przybylski
ee01d1a81d
removing console error in safari for bookmarks
2012-02-03 21:37:09 +01:00
Tom Needham
5507db9b15
Initial migration code, and basic export for bookmarks
2012-02-03 20:32:06 +00:00
Georg Ehrke
ab31a890b6
use strip_tags for calendar names
2012-02-02 21:23:41 +01:00
Georg Ehrke
bfa69c3e59
add a label calendar to the settings page - bugfix for oc-157
2012-02-02 18:37:06 +01:00