b3f107ddda
Contacts: First work on cleaner design.
2012-04-03 03:29:12 +02:00
896bff5748
Contacts: rescan categories on load if there are none.
2012-04-03 03:29:12 +02:00
bd9fa658de
merged from upstream
2012-04-02 23:54:18 +02:00
adc9d906e4
confirm close when there are unsaved changes
2012-04-02 17:44:15 +00:00
dc499c5b4e
add * to filename when changes have been made
2012-04-02 17:27:06 +00:00
d0cb99e347
use OC_Dialogs instead of alert()
2012-04-02 16:35:11 +00:00
33c1fa6e28
webfinger protocol compatible + minor changes
2012-04-02 17:12:52 +02:00
72a43b3929
revert 0fd8b1a044
2012-04-02 08:32:27 -04:00
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
eba6a65908
try to use transactions to replace db
2012-04-01 00:25:47 +00:00
a248cc73e6
Merge branch 'master' into migration
2012-03-31 23:56:16 +00:00
daf742c086
Fix owncloud log
2012-03-31 23:55:41 +00:00
3e84d85482
remove debug
2012-03-31 22:50:57 +00:00
aba3182a7d
Fix loading image after export failure
2012-03-31 22:47:38 +00:00
f7d8a8c571
Merge branch 'master' into migration
2012-03-31 22:44:50 +00:00
d20eea9761
Use ajax to download file, OC_Dialogs for errors
2012-03-31 22:41:43 +00:00
0fd8b1a044
fix events.php for rewritten OC_Caledar_App class
2012-03-31 16:16:34 -04:00
ca2c7001c4
remove unused code in OC_Calendar_App class
2012-03-31 16:15:04 -04:00
70237f7ecc
rewrite OC_Calendar_APP class
2012-03-31 16:13:04 -04:00
10fc51dc92
add public sharing fir calendars and events - add function in Share class
2012-03-31 16:12:27 -04:00
cf26f8a6a7
add public sharing for calendars and events
2012-03-31 17:32:43 +01:00
4b3f074309
add new parameters to export file
2012-03-31 17:27:30 +01:00
1f8cf2d8f2
fix name of constants
2012-03-31 13:37:44 +02:00
a88305b4cb
remove share tab from read only event dialog
2012-03-31 13:11:30 +02:00
f9f91a08b4
webfinger reimplementation started
2012-03-31 02:42:41 +02:00
6b704a780d
select field added to oc.dialogs.form, gallery ported to use it
2012-03-30 22:50:57 +02:00
5161758921
create static host-meta instead of symlink and .htaccess
2012-03-30 21:35:09 +02:00
6abb2cb92e
fix sharing nested galleries
2012-03-30 21:14:01 +02:00
ef1e359c7c
Merge branch 'master' into sabredav_1.6
2012-03-30 18:48:30 +02:00
e3203f87ff
Merge branch 'master' into calendar_sharing
2012-03-30 18:42:09 +02:00
284955573c
clarifying remoteStorage description
2012-03-30 18:18:37 +02:00
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
011132feb3
renaming remote storage support to External storage support to clear up naming conflict
2012-03-30 18:18:37 +02:00
523fdda399
add the option to only load apps of a specific type
2012-03-30 14:39:07 +02:00
90286353e2
Merge branch 'master' into sabredav_1.6
2012-03-29 23:20:03 +02:00
d15959d573
Merge branch 'master' into calendar_sharing
2012-03-29 23:19:31 +02:00
f74d11c0c3
fix gallery sharing when root is not /
2012-03-29 20:45:21 +02:00
4b3282b325
Contacts: Removed obsolete code.
2012-03-29 15:36:04 +02:00
11f7eeb63a
Improve actions on delete.
2012-03-29 15:25:24 +02:00
b559952806
Cleanup stylesheet.
2012-03-29 15:25:24 +02:00
5fef9dfc22
Make users only able to share with users in groups they belong to
2012-03-28 21:18:17 -04:00
72882beb0d
enble browsing tar files in the web interface
2012-03-28 23:53:51 +02:00
1b6fe4f65e
stricter tests for archive backends and make sure we make the tests
2012-03-28 23:47:44 +02:00
c26e003462
add tar backend for OC_Archive
...
also handles bz2/gz compression
2012-03-28 23:47:44 +02:00
e57de98bbe
add extract all option to OC_Archive
2012-03-28 23:47:44 +02:00
08b4f996d3
add backslash r to the newline var
2012-03-28 17:06:16 +02:00
0d16f177cb
add scrollbar to the music list - bugfix for oc-301
2012-03-28 16:21:54 +02:00
34a0128ddf
whitespace indentation fix
2012-03-28 16:12:34 +02:00
bcda46eda3
webfinger installation creates symlink in document root
2012-03-28 16:07:50 +02:00
bd4fd76bfb
Fix bookmarks migration provider
2012-03-27 21:35:29 +00:00
ef33219e4f
import method returns each apps' import status
2012-03-27 21:21:14 +00:00
553f4533c0
look for migrate.php in appinfo folder
2012-03-27 20:45:37 +00:00
c8acd4a594
Merge branch 'master' into migration
2012-03-27 20:19:38 +00:00
536a3ecb42
Merge branch 'master' into sabredav_1.6
2012-03-27 20:54:16 +02:00
ede0a675bc
Merge branch 'master' into calendar_sharing
2012-03-27 20:53:40 +02:00
cb2dd97509
Trigger autocomplete wo button.
2012-03-27 12:30:20 +02:00
fa165498cc
Improvements in adding/deleting properties.
2012-03-27 12:30:20 +02:00
ff038f8766
Contacts: Update contact list thumbnail when deleting PHOTO.
2012-03-27 12:30:20 +02:00
ff75d65d7e
Merge branch 'master' into calendar_sharing
2012-03-27 09:29:16 +02:00
c384e3ba4f
fix width of dropdown to select monthdays - bugfix oc-354
2012-03-27 09:24:55 +02:00
eb3ec05f88
fix gallery scan when an image cant be loaded
2012-03-26 23:56:07 +02:00
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
3f881f1ca5
memory cleanup in gallery
2012-03-26 22:40:38 +02:00
60a939dfcf
Small change and muting debug.
2012-03-26 22:26:06 +02:00
0da988a1bb
Check for empty value.
...
Added missing classes on action icons.
2012-03-26 22:08:03 +02:00
ee31bc7995
Contacts: Fix saveproperty for categories
2012-03-26 21:47:37 +02:00
a867bcab46
Merge branch 'master' into calendar_sharing
2012-03-26 21:46:40 +02:00
6ff89dcf72
Removed obsolete code.
2012-03-26 19:13:48 +02:00
f479105f5e
optimize choosecalendar dialog for shared calendars
2012-03-26 16:01:55 +02:00
10ef01b04b
fix displayed username of person who shares
2012-03-26 15:44:24 +02:00
8b9d439841
Calendar: fix address for import file
2012-03-26 15:37:47 +02:00
179bf15daf
fix group sql generator in calendar's share lib
2012-03-26 15:30:04 +02:00
71b32f7ad4
add read only 'form' for shared events
2012-03-26 15:24:43 +02:00
96dd008f5e
Merge branch 'master' into calendar_sharing
2012-03-26 09:50:39 +02:00
b7a5ae38c5
fix sql command in calendar's share lib
2012-03-26 09:48:58 +02:00
102cf150b3
Fixed error in OC_Contacts_VCard::addFromDAVData as pointed out by Guillaume ZITTA
2012-03-26 02:04:34 +02:00
ac0c5ba6da
Merge branch 'master' into sabredav_1.6
2012-03-25 14:02:40 +02:00
19c101a660
fix merge conflicts
2012-03-25 14:02:02 +02:00
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
d139e3c3cd
Move Google Docs storage backend to files_remote app
2012-03-24 15:28:05 -04:00
c23090b43c
spaces to tabs in bookmarks
2012-03-24 19:55:44 +01:00
a3125f164e
bookmarks tag placement & list width fix
2012-03-24 19:55:43 +01:00
826cb2c650
fix sharing address construction in opera and firefox
2012-03-24 19:26:53 +01:00
be60b451eb
fix albums thumbnails preview for opera
2012-03-24 19:21:36 +01:00
afcf965498
fixup: sharing gallery for loggedin users fail
2012-03-24 18:40:27 +01:00
cbdcb68c2b
gallery sharing, experimental version
2012-03-24 18:35:42 +01:00
e0cbefc727
webdav storage backend
2012-03-23 18:55:26 +01:00
0e11cc9f6f
fix previous made bug and fix oc bug - oc-139
2012-03-23 17:27:52 +01:00
ac8362e34a
check if the title of an event is null - bugfix for oc-139
2012-03-23 17:09:51 +01:00
b63b377c4d
Bookmarks: make link text click clickable too - bugfix for oc-131
2012-03-23 16:58:48 +01:00
45b320d674
use unnamed as title for a bookmark if no title was entered and curl fails
2012-03-23 16:54:15 +01:00
37963fee28
Merge branch 'master' into calendar_sharing
2012-03-22 20:40:20 +01:00
8e8c4a8edc
Merge branch 'master' into sabredav_1.6
2012-03-22 20:40:04 +01:00
82b54938e3
ftp storage backend
2012-03-22 19:56:19 +01:00
5b03de9a66
fix comments in crypt lib
2012-03-21 17:43:09 +01:00
892343c7c1
Fix instance import
2012-03-21 16:30:59 +00:00
61166c1002
Merge branch 'master' into calendar_sharing
2012-03-21 09:43:29 +01:00
8f8d486f35
Merge branch 'master' into sabredav_1.6
2012-03-21 09:42:53 +01:00
07d7138df0
Register admin pane
2012-03-20 20:34:20 +00:00
0fa5e196ef
Try to use old uid when importing
2012-03-20 20:32:01 +00:00
514c9ad8e7
Added unified import method.
2012-03-20 20:19:21 +00:00
19bbb61b20
fix spelling fail in texteditor's style.css
2012-03-20 19:48:08 +01:00
145d6f3566
Add OC_Migration_Content class to help app devs. Restructure OC_Migrate.
2012-03-19 20:44:20 +00:00
194211500b
register text/x-vcard as a fileaction for vcard import
2012-03-19 09:58:44 +01:00
33b06c4484
Merge branch 'master' into sabredav_1.6
2012-03-19 08:33:36 +01:00
ddb7197c9c
Merge branch 'master' into calendar_sharing
2012-03-18 00:53:02 +01:00
de09883d86
creating and retrive thumbnails for intermediate galleries
2012-03-17 23:41:10 +01:00
bc085c3ff4
Create new user, create new data dir, copy files, import app data
2012-03-17 16:25:14 +00:00
5234e66bab
Add exportinfo to user exports.
2012-03-17 13:53:00 +00:00
27bf34f7be
Move user import to the admin
2012-03-17 13:30:58 +00:00
eaa1074ccb
Merge branch 'master' into calendar_sharing
2012-03-17 13:59:00 +01:00
122f7e4c2f
Dont truncate the time format
2012-03-17 12:41:16 +00:00
8e22823501
bredcrumb fix
2012-03-17 13:30:45 +01:00
222bb2303f
Added prototype of user import
2012-03-16 22:54:37 +00:00
5332c319a2
Migration info is an object. Other fixes
2012-03-16 22:50:35 +00:00
c442a06a02
Fix export for admin and users. Added 3 admin export types
2012-03-16 21:09:36 +00:00
27218f85cb
Merge branch 'master' into calendar_sharing
2012-03-16 12:17:58 +01:00
50233d075c
Improve admin_export ui and move system export cde to OC_Migrate
2012-03-15 20:52:43 +00:00
0fadbee699
fix adding photo to incorrect gallery
2012-03-15 00:09:06 +01:00
193e93e4a9
creating intermediate galleries
2012-03-14 22:28:55 +01:00
c9be325af2
Fix zip creation. Add param to cleanUp() method. Add defaults to createExportFile() method.
2012-03-14 16:43:06 +00:00
a310a81053
move zip creation inside OC_Migrate
2012-03-13 23:09:43 +00:00
a919a136c4
Finish import function for bookmarks
2012-03-13 21:24:07 +00:00
cd2f75fdad
Use data dir from config.php
2012-03-13 17:27:47 +00:00
0f3eebbbd9
added cleanUp() method to OC_Migrate
2012-03-13 17:18:42 +00:00
7e3b35a57c
fix structure of user export zip
2012-03-13 17:08:20 +00:00
111af7fed5
json encode the output
2012-03-13 17:04:49 +00:00
4d5646a59f
Find migrate.php even for disabled apps. Improve ui for user and admin migrations
2012-03-13 16:21:17 +00:00
4a91c6dbed
Make PHOTO deletable.
2012-03-13 14:56:03 +01:00
9e83f0247f
Added sync path for iOS/OS X.
2012-03-13 14:28:38 +01:00
6b01d7be9a
Fixed NOTE property UI.
2012-03-13 02:55:17 +01:00
dd0daa6e33
Cleanup in Contacts.
2012-03-13 00:55:15 +01:00
551b4443e1
Force load profile pic after edit hack.
2012-03-12 21:56:28 +01:00
60fe9dda5d
Remember categories when they have changed.
2012-03-12 21:55:54 +01:00
1cdb4396a4
Fix copyRows() return value. Generate app info and oc info on return
2012-03-12 18:40:14 +00:00
3efa5f17f2
Rename...
2012-03-12 16:47:29 +01:00
c55d2af6b3
More modifications for using jquery.multiple_autocomplete.
2012-03-12 16:44:16 +01:00
2b8125f4ba
Small fix to jquery.multiple_autocomplete.
2012-03-12 15:30:52 +01:00
d36d317bb2
Contacts: Modifications for using categories.
2012-03-12 14:13:03 +01:00
9c032ecc33
Fix return value of export
2012-03-11 22:20:01 +00:00
fa5a5649c6
Fix copyRows() and sqlite connection
2012-03-11 22:09:16 +00:00
618f92b3fb
fix thumbnail generation
2012-03-11 20:00:50 +01:00
d5959872e1
disabling file handlers in gallery for now
2012-03-11 19:17:51 +01:00
4b8ff4d910
media scanner fix
2012-03-11 17:29:21 +01:00
f6075cc1fe
gallery migration to events system
2012-03-11 16:49:42 +01:00
92221e98de
spaces to tabs
2012-03-11 12:03:41 +00:00
d712d7f52c
Lots of fixes, improve copyRows() method and update settings page.
2012-03-10 18:18:58 +00:00
3ca76d24a9
Add OC_Migrate::copyRows() method
2012-03-10 15:52:38 +00:00
dc3dd272f7
Text editor will now wrap text based on window size
2012-03-10 14:32:57 +00:00
1aaf008020
fix character encoding bug oc-278
2012-03-10 14:06:30 +00:00
3f507898d0
update file extensions in editor
2012-03-10 14:00:57 +00:00
84d6c53970
filecache search comparition fix
2012-03-09 16:28:26 +01:00
2582fe1c89
Yet a missing file :-P
2012-03-09 13:56:20 +01:00
98bf8cfeb6
Added missing template.
2012-03-09 12:11:52 +01:00
2cbd281637
Merge branch 'vcategories'
2012-03-09 10:29:58 +01:00
8228a554a4
Temporarily disabled multi_autoselect.
2012-03-09 10:29:00 +01:00
bc5d9f5868
Parses malformed N fields a bit more tolerantly. Thanks to nibbler for the patch :-)
2012-03-09 07:39:35 +01:00
8495e1a63e
Add missing file.
2012-03-09 07:39:35 +01:00
700a120c22
fix write hook for gallery
2012-03-08 15:47:49 +01:00
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
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
91d85e9b16
Use OC.dialogs.
2012-03-07 22:57:37 +01:00
340320625e
Contacts: Add UI for categories
2012-03-07 21:50:55 +01:00
9908adb320
Merge branch 'master' into vcategories
...
Conflicts:
apps/contacts/lib/vcard.php
2012-03-07 21:49:46 +01:00
d8cfe77ba5
Contacts: small fixes and cleanups
2012-03-07 21:46:42 +01:00
9599548203
Contacts: change card parameter type of VCard::edit and VCard::add
...
changed to OC_VObject
2012-03-07 21:46:42 +01:00
97ab706a6a
Contacts: No random token for contactphoto
2012-03-07 21:46:42 +01:00
46aa011ef9
Contacts: Add Organisation as Name property choice
2012-03-07 21:46:41 +01:00
9ccf46d350
Contacts: convert class attribute selectors to class selectors
2012-03-07 21:46:41 +01:00
57c4d39b1e
Fix conflict.
2012-03-07 20:57:05 +01:00
cf5d63f0ab
some js cleanup for gallary
...
also tabs no spaces
2012-03-07 18:58:10 +01:00
d8d2939668
dont use numRows and fix some of the gallary hooks
2012-03-07 17:31:01 +01:00
75323b86d1
Contacts: UI updates and ajax methods for categories.
2012-03-07 16:39:56 +01:00
1d88ab57ec
dont open the album when clicking the remove/rename button
2012-03-07 16:28:57 +01:00
41817db2e2
no rounded borders for album decoration
2012-03-07 16:27:51 +01:00
a4543175ce
make gallary work with archives
2012-03-07 16:24:49 +01:00
fb88bdba69
Ability to save an arbitrary number of external sites
2012-03-07 14:59:19 +01:00
0a78849391
multilevel gallery
2012-03-04 18:28:41 +01:00
c40668e3a9
Merge branch 'master' into calendar_sharing
2012-03-04 10:10:19 +01:00
c411826fe5
moving gallery op to one file, migrate gallery dialogs to oc dialogs
2012-03-04 00:35:37 +01:00
af214d9dcd
change gallary scanning to support gallaries inside archives
2012-03-03 22:04:34 +01:00
a5df3f8ea7
allow transparent opening of zip files from the web interface
2012-03-03 21:23:35 +01:00
691103acd5
Use json for migration data
2012-03-03 17:30:21 +00:00
34f05ba180
Udpdate bookmarks migration provider. App version included in export.
2012-03-03 14:35:17 +00:00
f2dcab50b5
fix merge conflicts
2012-03-03 15:06:51 +01:00
4c45483ad3
make calendar compatible with php 5.2 - works for me with PHP 5.2.12
2012-03-03 14:30:52 +01:00
188a304625
Replace db on import. Update user_migration export function.
2012-03-03 13:26:01 +00:00
6906988b4e
Update bookmarks migration provider.
2012-03-03 13:22:45 +00:00
23b64cd9ce
remove the archive after a testcase is done
2012-03-03 01:37:00 +01:00
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
86fed4c226
Update database.xml locations. Fix dbexport.xml.
2012-03-02 22:19:06 +00:00
8188a9f51b
change <create> value in db export
2012-03-02 21:54:44 +00:00
45ef2ecf52
Fix merge conflict
2012-03-02 21:35:48 +00:00
1865659ce1
Fix missing bracket
2012-03-02 21:01:44 +01:00
503e5cada3
Add /dav.php, a single location bundling all *DAV-operations.
2012-03-02 20:25:20 +01:00
d1dcd7893c
Search: Change provider registration to class name, for lazy loading of search providers
2012-03-01 22:59:35 +01:00
1471d8f710
remoteStorage app version 0.5
2012-03-01 20:58:14 +00:00
e10402c61b
remoteStorage app version 0.5
2012-03-01 20:55:20 +00:00
5d8d7ef2a1
remoteStorage app version 0.5
2012-03-01 20:55:12 +00:00
5dcd9e20d0
Small cleanups
2012-03-01 21:00:23 +01:00
ec2f49833d
Calendar: Don't request edit form for readonly events
2012-03-01 21:00:23 +01:00
f914cd0144
Implement showing Birthdays of contacts in the calendar
2012-03-01 21:00:22 +01:00
fe3bcb5fe2
Calendar: fix bug in creating DTEND from DTSTART
2012-03-01 21:00:22 +01:00
642ccd27ab
Bookmarks: fix loading and displaying of the bookmarks
2012-03-01 20:57:11 +01:00
fa6ad6ba68
LDAP: set also quota, when there is no explicit default value
2012-03-01 14:31:06 +01:00
b192f86d84
LDPA: fix setting variables and add missing ones to the array
2012-03-01 14:21:38 +01:00
eb8ffd9315
LDAP fix: set user quota, if attribute is provided
2012-03-01 14:18:28 +01:00
e76e4e7540
add touch() to all storage backands, and make parameter optional
2012-02-29 23:44:05 +01:00
f040ce044c
consider changed/new setting variables for user_ldap
2012-02-29 13:03:44 +01:00
3c72a7c934
make ldap settings a little bit less ugly
2012-02-29 12:57:11 +01:00
2754cac21f
dialogs library for apps
2012-02-28 23:02:30 +01:00
ea15c17149
typo in function call
2012-02-28 21:04:56 +01:00
de642697bb
make LDAP filter for user list configurable
2012-02-28 14:12:53 +01:00
630cee0ef2
bookmarklets should not look like buttons
2012-02-27 18:20:40 -05:00
aae0d990ca
fix baseUri of the Carddav server
2012-02-26 21:46:20 +01:00
089c24e650
fix baseUri of the Caldav server
2012-02-26 21:44:35 +01:00
8c09330959
add missing parameter to addEventListener function - bugfix for oc-225
2012-02-26 21:29:52 +01:00
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
ab96fa67c8
first part of the abstraction work of the apps folder. more to come
2012-02-26 18:26:41 +01:00
8148480cfe
dont enable encryption on default
2012-02-26 16:49:57 +01:00
01fcc080bb
dont set the encryption flag for existing non-encrypted files
2012-02-26 15:56:47 +01:00
ff0a542e48
always set encrypted flag when overwriting a file we should encrypt
2012-02-26 15:32:45 +01:00
d4d09b06f8
merge master into encryption
2012-02-26 14:21:06 +01:00
89865cb8a0
stop using 3rdparty services for timezone detection
2012-02-26 13:45:51 +01:00
0af31a5328
missed one is_writeable
2012-02-26 03:56:45 +01:00
c8c3b8a63e
chunked implementation for readfile
...
prevents memory issues when downloading large files
2012-02-26 03:54:21 +01:00
0b19af5e10
application/ogg is music to
2012-02-26 03:42:48 +01:00
a7d7597d55
fix type error in dir creation for categories
2012-02-25 23:15:31 +00:00
42735429da
bump up version and update license
2012-02-25 22:03:14 +00:00
28650191c3
bump up version and update license
2012-02-25 22:01:04 +00:00
820f2f27f6
security hardening in remoteStorage app
2012-02-25 21:59:58 +00:00
a1d03de666
Merge branch 'master' of gitorious.org:owncloud/owncloud
2012-02-25 21:58:59 +00:00
8fe5251029
unicode chars in gallery name fix
2012-02-25 20:38:22 +01:00
bfb67286c8
fix merge conflicts
2012-02-25 16:54:27 +01:00
ea8f71a19c
Merge branch 'master' into encryption
2012-02-25 16:36:58 +01:00
097ce76fc4
Merge branch 'master' into sabredav_1.6
2012-02-25 16:29:32 +01:00
3cf81cadd5
gallery thumbnail creation fix
2012-02-25 10:03:58 +01:00
7988541476
cleanup pdfviewer app name
2012-02-24 23:54:38 +01:00
1d1dfcbc1a
replace Sabre_VObject_Element_DateTime with Sabre_VObject_Property_DateTime
2012-02-24 22:20:40 +01:00
9df193f051
Calendar selection only available if there are more than one.
2012-02-23 22:28:14 +01:00
7c738a1384
Sharing dropdown width fixed.
2012-02-23 22:28:13 +01:00
b1fb325d48
rename updatecalendar to update
2012-02-23 22:07:31 +01:00
f285790fa1
change links in the event form for the new ajax folders
2012-02-23 22:07:08 +01:00
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
cfa284bfa8
update js files for new ajax pathes
2012-02-23 22:06:16 +01:00
8cd1027214
better var name in changeview.php
2012-02-23 22:00:46 +01:00
b7de1850a0
add moved files to clean up ajax folder
2012-02-23 21:58:39 +01:00
e188b96596
remove old ajax files
2012-02-23 21:58:01 +01:00
ce4fe9e7cb
Editor fixed.
2012-02-23 20:36:20 +01:00
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
196d619689
Little bookmark improvement
2012-02-22 23:58:38 +01:00
358fd1c024
Changed text
2012-02-22 23:53:54 +01:00
77493e8d70
Changed bookmarklet to read later widget
2012-02-22 23:52:56 +01:00
996e6cf419
No bookmarks message will now show up if all bookmarks are delted
2012-02-22 23:28:36 +01:00
3988ec2813
Updated bookmark form
2012-02-22 23:22:17 +01:00
5387820a3b
changed look of bookmarklet
2012-02-22 23:08:50 +01:00
70f9936651
sharing code between the two bookmarklets
2012-02-22 16:38:05 -05:00
814bc2fd2b
make encryption filetype blacklist configurable
2012-02-22 22:20:46 +01:00
3f87c2cedb
correct header Content-Type: application/xrd+xml
2012-02-22 19:05:41 +00:00
9850820b42
BearerAuth and multiple tokens support in remoteStorage app
2012-02-22 18:05:52 +00:00
6c6b570ff1
avoid notice in error log from user_webfinger app
2012-02-22 18:04:21 +00:00
fd72f2bd29
Removed redundant code.
2012-02-22 16:04:32 +01:00
e2d6bf4c63
Bookmarklet Window closes itself after submit.
2012-02-22 16:04:32 +01:00
d9914664f6
Text editor display error fixed.
2012-02-22 16:04:31 +01:00
b3f3b8c23f
UI problems solved. Bookmarks app updated.
2012-02-22 16:04:31 +01:00
ed0c99ef14
make sure we always have the encryption key unlocked
2012-02-22 15:18:22 +01:00
1a9ded981b
Merge branch 'master' into enc
2012-02-22 14:26:52 +01:00
faf6055baa
Translate and fix copy/paste error.
2012-02-22 14:19:23 +01:00
9460c9e907
remove old import.php
2012-02-22 11:53:28 +01:00
9794e7e427
Fix merge conflict.
2012-02-22 11:20:57 +01:00
cff0ac2bf9
better permission check in resize.php
2012-02-22 10:42:33 +01:00
0ae088a50a
add getowner function to OC_Calendar_Object
2012-02-22 10:42:01 +01:00
48f42176cd
add is_editing_allowed function to OC_Calendar_Share
2012-02-22 10:41:16 +01:00
d20b8399c3
clean up sql commands in OC_Calendar_Share
2012-02-22 10:20:58 +01:00
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
e0c92662f8
JS fix on address book creation.
2012-02-21 23:22:06 +01:00
a79f5d40de
Remove my FIXME comments when I've fixed it :-P
2012-02-21 23:22:06 +01:00
c20319d377
fix incorrect information in the filecache when using encryption
2012-02-21 20:48:49 +01:00
d9c7e4c333
proper mimetypes for encrypted files
2012-02-21 20:48:48 +01:00
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
c121a1a1e7
implement file_put_contents with stream data using fopen
2012-02-21 20:48:48 +01:00
6a8364c3ff
rework the way file_put_contents is handeled
2012-02-21 20:48:48 +01:00
b3a974d8bb
only trigger hooks for the default filesystem view
2012-02-21 20:48:48 +01:00
f1cbb9effc
initial integration of encryption
2012-02-21 20:48:48 +01:00
e2b4954176
simple file encryption wip
2012-02-21 20:48:48 +01:00
3d67cd51c2
encryption proxy wip
2012-02-21 20:48:47 +01:00
d3e6ea6ac0
Bookmarks: uses the core action icons
2012-02-21 20:28:24 +01:00
3d8d6d718b
add 'permissions' as a sql condition in allSharedwithuser
2012-02-21 20:10:52 +01:00
86d2927c02
Calendar: Correct calendarcolor format for ical color property
2012-02-21 20:10:40 +01:00
236d2aa5b8
rename updatecalendar to update
2012-02-21 19:42:48 +01:00
e227a65f66
Merge remote-tracking branch 'origin/calendar_sharing' into calendar_sharing
2012-02-21 19:36:42 +01:00
70a369e16d
change links in the event form for the new ajax folders
2012-02-21 19:16:14 +01:00
21f8d0992f
Added missing files
2012-02-21 18:29:49 +01:00
7a49c8e59c
Merge gitorious.org:owncloud/owncloud into vcategories
2012-02-20 23:42:06 +01:00
d5f7a39936
Contact list scroll fix
2012-02-20 23:54:23 +03:00
ffdfe8257b
Contacts: Fix adding/updating address book with empty name.
2012-02-20 15:24:54 +01:00
456ada01fa
Contacts: Apply strip_tags on compound values.
2012-02-20 14:36:21 +01:00
12bcbcdc62
Update ctag in deleteFromDAVData.
2012-02-20 14:24:10 +01:00
8ed4262393
Merge gitorious.org:owncloud/owncloud into vcategories
2012-02-20 13:18:22 +01:00
0ae2e250f5
change pathes in calendar/templates/* files to make them work with the new folder structure in /calendar/ajax
2012-02-20 11:52:19 +01:00
a069d83f44
fix unexspected T-String in calendars index.php
2012-02-20 11:46:10 +01:00
ec7ed3c882
add rw and r to events.php
2012-02-20 11:35:19 +01:00
619c62e681
change parameter names for shared calendars
2012-02-20 11:31:41 +01:00
548a2e6263
add readonly calendar to the eventsources
2012-02-20 11:28:20 +01:00
3efa69bc84
update js files for new ajax pathes
2012-02-20 11:27:25 +01:00
1cf7fc261f
better var name in changeview.php
2012-02-20 11:26:43 +01:00
8dff0fb58d
add moved files to clean up ajax folder
2012-02-20 11:26:22 +01:00
ceb0016bdc
remove old ajax files
2012-02-20 11:25:42 +01:00
7ff4e40b20
Combing LDAP backend with LDAP extended backend
2012-02-20 10:39:55 +01:00
490c9db15d
Added bookmarklet for browser. Inspired by Google Bookmarks
2012-02-19 20:18:27 -05:00
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
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
87627c7a50
Fix overwriting of internal sharing for shared folders - bug oc-260
2012-02-18 19:30:54 -05:00
71a2241aee
Fixed call to OC_User. Thanks Burillo on IRC
2012-02-18 23:53:10 +00:00
2ee2f87efe
Strip tags on address on client side.
2012-02-18 11:49:31 +01:00
868cf6bb83
Avoid errors from missing GD library.
2012-02-18 11:49:31 +01:00
96612c506e
Removed obsolete commented code and made minor speed improvements.
...
Added stub function for loading categories.
2012-02-18 11:49:31 +01:00
d8734cee02
fix sql command
2012-02-18 11:21:07 +01:00
6f1ed85f0b
Temporary fix for sharing files
2012-02-17 21:56:20 -05:00
6bbd67c3c6
Calendar: only update default view when it really changed
2012-02-17 22:10:02 +01:00
539fd7240c
Calendar: optimize sending calendar events, also enabled caching of result
2012-02-17 22:09:31 +01:00
a33b757b19
Calendar: Add default repeat values when editing a non-repeating event
2012-02-17 22:09:22 +01:00
dab5531474
Bookmarks: Fix image urls in bookmarks.js
2012-02-17 22:07:15 +01:00
e8b69d45a3
Fixup use of OC_Helper::linkTo function
2012-02-17 22:07:14 +01:00
f47444e1f7
Use separate function to make absolute urls
2012-02-17 22:07:14 +01:00
5f3c549227
Contacts: Add removed app enabled check
2012-02-17 22:07:14 +01:00
011bc1e764
fix unsharing of groups
2012-02-17 21:19:04 +01:00
a3b8d54576
Merge branch 'master' into calendar_sharing
2012-02-17 14:14:53 +01:00
86893ea78c
UI tweaks for name selector combobox.
2012-02-16 10:38:00 +01:00
fa7fabf024
Minor tweaks
2012-02-16 10:38:00 +01:00
e6b835bea8
Update breadcrumb css on close
2012-02-14 21:55:51 +00:00
aec6a3c32f
Fix editing shared files and file opening bug. Fixes oc-209 and oc-195
2012-02-14 21:49:51 +00:00
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
ae426ad115
Added some check for when addinf deleting contacts.
2012-02-14 10:36:22 +01:00
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
dc20900e10
Modify check for missing UID.
2012-02-14 01:56:38 +01:00
53503148f3
Use proper index file.
2012-02-14 01:47:18 +01:00
4446854f75
Don't try to load a profile picture for contacts the doesn't have any.
2012-02-14 01:11:21 +01:00
07c422d81d
Removed superfluous debug.
2012-02-14 01:02:01 +01:00
3adaacc0ce
Added OC_Contacts_VCard::moveToAddressBook
2012-02-14 01:00:41 +01:00
024405e4f1
Added function for later testing.
2012-02-14 01:00:41 +01:00
a37bd93222
External: Use OC_Util::checkLoggedIn
2012-02-14 00:13:04 +01:00
777804fac2
Gallery: remove unused cover.php
2012-02-14 00:12:22 +01:00
525306c1e2
Replace Expires and caching headers by OC_Response functions
2012-02-13 23:48:05 +01:00
29fc82c364
Send gallery album thumbnail with OC_Response::sendFile
2012-02-13 23:35:37 +01:00
594dcf13f2
Contacts+OC_Respone: Move enableCaching out of setEtagHeader and setLastModifiedHeader
2012-02-13 22:47:31 +01:00
169ddc5b0b
Gallery: Only get local file when generating photo thumbnail
2012-02-13 22:39:30 +01:00
e137020f67
Gallery: Use OC_Respone::enableCaching for (album)thumbnails
2012-02-13 22:38:34 +01:00
e084386770
Gallery: Move login check to beginning of galleryOp.php
2012-02-13 22:33:52 +01:00
e402896001
Gallery: Remove autoloaded includes from galleryOp.php
2012-02-13 22:33:48 +01:00
Thomas Tanghus
Florian Hülsmann
Tom Needham
Georg Ehrke
Scott Shambarger
Bartek Przybylski
Jan-Christoph Borchardt
Robin Appelman
Michael Gapczynski
Bart Visscher
rok
Jakob Sack
Michiel de Jong
Arthur Schiwon
Alessandro Cosentino
Frank Karlitschek
Marvin Thomas Rabe
Georg Ehrke
Robin Appelman
VicDeo
Florian Pritz