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
|
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 |
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 |
|
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
|
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 |
|
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 |