wbrawner/server
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions
6981 commits 157 branches 562 tags 714 MiB
Commit graph

3631 commits

Author SHA1 Message Date
Georg Ehrke
da4057ecfd fix label for versioning in admin settings 2012-08-04 18:51:09 +02:00
Jenkins for ownCloud
d7e77f6426 [tx-robot] updated from transifex 2012-08-04 02:04:21 +02:00
Thomas Tanghus
bef63527ce Reorganize ajax scripts. 2012-08-03 21:32:27 +02:00
Thomas Tanghus
3610975bc1 Some fixes for keyboard shortcuts. 2012-08-03 21:32:27 +02:00
Thomas Tanghus
e3de746bb6 FF complained about missing charset. 2012-08-03 21:32:27 +02:00
Thomas Tanghus
578e074c00 White space. 2012-08-03 21:32:27 +02:00
Thomas Tanghus
98057dba5b Revert "Removed text/plain header." 
This reverts commit fa6d26b53c.
 2012-08-03 21:32:27 +02:00
Michael Gapczynski
09bb3bfaf8 Preparing for proper collection implementation 2012-08-03 15:05:45 -04:00
Bart Visscher
b12ed88794 Calendar: remove double html encoding 2012-08-03 16:18:33 +02:00
Bart Visscher
599741bdd6 audit: update appinfo to OC4 2012-08-03 16:05:48 +02:00
Bart Visscher
e36e00dc00 Merge branch 'chunked_upload' 2012-08-03 15:58:17 +02:00
Jenkins for ownCloud
7dc799c167 [tx-robot] updated from transifex 2012-08-03 02:04:12 +02:00
Thomas Tanghus
7dda5527f1 Return properly formatted jsondata. 2012-08-02 19:03:45 +02:00
Thomas Tanghus
d07f4a5ea8 Correct namespace usage. 2012-08-02 19:03:06 +02:00
Thomas Tanghus
40d2bb70d7 Remove logging 2012-08-02 19:01:55 +02:00
Thomas Tanghus
8f3357c305 I was a bit too fast in removing methods yesterday... 2012-08-02 18:57:03 +02:00
Thomas Tanghus
a484ee817c If first addressbook was empty it was seen as if there where no contacts at all. 2012-08-02 18:50:20 +02:00
Thomas Tanghus
a1239a37aa Line length... 2012-08-02 05:02:36 +02:00
Thomas Tanghus
30c3a783d9 Remove onunload handler when delete is cancelled. 2012-08-02 05:01:54 +02:00
Thomas Tanghus
20f8971222 Use popup class style for ninja-mode help. 2012-08-02 04:18:44 +02:00
Thomas Tanghus
f84e92e6e3 More files to delete \o/ 2012-08-02 04:18:44 +02:00
Thomas Tanghus
937058cdec Updated JS namespace. 2012-08-02 04:18:44 +02:00
Jenkins for ownCloud
91e828c6ce [tx-robot] updated from transifex 2012-08-02 02:06:16 +02:00
Thomas Tanghus
f159f607de And then the missing files ;) 2012-08-02 00:02:07 +02:00
Thomas Tanghus
a8faae4f42 Addressbooks settings rewrite and cleanup. 2012-08-02 00:02:07 +02:00
Jörn Friedrich Dreyer
e13f381189 add limit support to OC_DB & OCP/DB 2012-08-01 14:59:08 +02:00
Jenkins for ownCloud
274d1ef87f [tx-robot] updated from transifex 2012-08-01 02:02:35 +02:00
Jenkins for ownCloud
36ccaf51ed [tx-robot] updated from transifex 2012-07-31 22:57:24 +02:00
Michael Gapczynski
94ce8f2168 Merge branch 'master' into share_api 
Conflicts:
	apps/contacts/lib/app.php
	apps/files_sharing/js/share.js
 2012-07-31 15:00:04 -04:00
jfd
3aff7a298c use CURRENT_TIMESTAMP in default column definitions (sqlite, mysql, postgres and oracle DO understand it), change clob columns to text (clob will give sorting and uniqueness problems and in general is not what we want) 2012-07-31 19:00:54 +02:00
jfd
727f4357fb remove superflous index (already indexed with primary key derived from <autoincrement> by MDB2), oracle will bark on this 2012-07-31 18:54:24 +02:00
jfd
ede464f058 escape all identifiers with backticks 2012-07-31 18:53:05 +02:00
Thomas Tanghus
5eed59bd54 Changed fix parameter to OC.appSettings(). 2012-07-31 14:18:32 +02:00
Thomas Tanghus
90a1b5a758 Unregister from personal settings. 2012-07-31 12:23:22 +02:00
Thomas Tanghus
19c55e2d44 Implemented app settings in popup. 2012-07-31 12:23:22 +02:00
Michael Gapczynski
dfae77dec1 Add notifications and undo support for replacing files when renaming 2012-07-30 12:22:11 -04:00
Arthur Schiwon
b465fc84ae LDAP: don't die on unexpected collisions, handle empty display-name attributes properly 2012-07-30 17:42:33 +02:00
Arthur Schiwon
b523366acd LDAP: don't die on unexpected collisions, handle empty display-name attributes properly 2012-07-30 17:30:11 +02:00
Michael Gapczynski
29dab0846e Remove another accidently added 3rdparty app 2012-07-30 10:37:54 -04:00
Michael Gapczynski
530e7f03cd Remove accidently added 3rd party apps 2012-07-30 10:34:12 -04:00
Michael Gapczynski
b9bd54bd98 Add additional error handling for emailing private links 2012-07-30 10:07:20 -04:00
Michael Gapczynski
dab708b625 Correction for 'Fix group detection for sharing in case username contains '@', fix for oc-1270' 2012-07-30 10:07:20 -04:00
Michael Gapczynski
519eb39422 Remove delete tipsy if file is deleted, fixes bug oc-958 2012-07-30 10:07:19 -04:00
Michael Gapczynski
3e183b2eea Set filter to empty if not set by Ampache client 
Conflicts:
	apps/media/lib_ampache.php
 2012-07-30 10:07:19 -04:00
Michael Gapczynski
d07b8448d1 Set the user id when authenticating user for Ampache, fixes bug oc-219 2012-07-30 10:07:19 -04:00
Michael Gapczynski
7d17c59a51 Fix group detection for sharing in case username contains '@', fix for oc-1270 2012-07-30 10:07:19 -04:00
Michael Gapczynski
f378415377 Only call mkdir() if the root folder does not exist for FTP external storage 2012-07-30 10:07:19 -04:00
Michael Gapczynski
f328f53ec1 Fix filesystem hash, no longer using basicOperation() 
Conflicts:
	lib/filesystemview.php
 2012-07-30 10:07:19 -04:00
Thomas Tanghus
01f25119d5 Merge branch 'stable4' of git://gitorious.org/owncloud/owncloud into stable4 2012-07-30 12:28:40 +02:00
Thomas Tanghus
f91783e9ab Fix errors when no addressbook. 2012-07-30 12:28:10 +02:00
Thomas Tanghus
fa62ff62d2 Remove deprecated code. 2012-07-30 05:31:48 +02:00
Thomas Tanghus
d614c3b1d5 Code style. 2012-07-30 05:31:06 +02:00
Thomas Tanghus
118d9e17b6 Check if the are contacts marked as deleted and warn if so. 2012-07-30 04:57:14 +02:00
Thomas Tanghus
b25b73b5b4 Fixed potential error in logging. 2012-07-30 04:57:14 +02:00
Thomas Tanghus
fa6d26b53c Removed text/plain header. 2012-07-30 04:57:14 +02:00
Jenkins for ownCloud
3430dcd367 [tx-robot] updated from transifex 2012-07-30 02:05:41 +02:00
Michael Gapczynski
5262cde6a6 Add additional error handling for emailing private links 2012-07-29 18:02:09 -04:00
Michael Gapczynski
e18639551d Tweak appearance of undo delete notification 2012-07-29 18:02:08 -04:00
Jenkins for ownCloud
18f6552a08 [tx-robot] updated from transifex 2012-07-29 02:06:29 +02:00
Michael Gapczynski
7ff04be091 Correction for 'Fix group detection for sharing in case username contains '@', fix for oc-1270' 2012-07-28 11:06:36 -04:00
Michael Gapczynski
e02d8d7f7e Remove delete tipsy if file is deleted, fixes bug oc-958 2012-07-27 21:28:41 -04:00
Jenkins for ownCloud
fa4052d6f1 [tx-robot] updated from transifex 2012-07-28 02:05:38 +02:00
Michael Gapczynski
dd4765ad16 Set filter to empty if not set by Ampache client 2012-07-27 18:10:40 -04:00
Michael Gapczynski
6a4c46e2c2 Set the user id when authenticating user for Ampache, fixes bug oc-219 2012-07-27 18:05:18 -04:00
Michael Gapczynski
df9f5b902a Fix group detection for sharing in case username contains '@', fix for oc-1270 2012-07-27 15:34:51 -04:00
Bart Visscher
896d27de36 Chunked upload: Support reusing local chunks 2012-07-27 19:35:33 +02:00
Michael Gapczynski
48f33be848 Only call mkdir() if the root folder does not exist for FTP external storage 2012-07-27 12:32:03 -04:00
Georg Ehrke
bccd372565 Merge commit 'refs/merge-requests/76' of git://gitorious.org/owncloud/owncloud into merge-requests/76 2012-07-27 14:17:55 +02:00
Michael Gapczynski
cb21406e18 Implement CRUDS in share dropdown, and some clean-up 2012-07-26 21:56:22 -04:00
Jenkins for ownCloud
0a9c33e151 [tx-robot] updated from transifex 2012-07-27 02:04:26 +02:00
Georg Ehrke
d8aca0c78e apply fix suggested in oc-1132 - bugfix for oc-1132 2012-07-26 18:40:12 +02:00
Arthur Schiwon
6fbed6a588 LDAP: add Test Configuration functionality in the settings 2012-07-26 18:11:12 +02:00
Arthur Schiwon
6c92a85d49 LDAP: use OC_Cache to cache results from LDAP. Default is set to 10 min. Should improve performance especially when LDAP users use the sync client, because userExists checks with the LDAP server are reduced. 2012-07-26 16:11:32 +02:00
Arthur Schiwon
e0121ea75e LDAP: some cleanup 2012-07-26 16:11:32 +02:00
Arthur Schiwon
b893aa9567 code style 2012-07-26 16:11:32 +02:00
Georg Ehrke
8cff0d997f convert through caldav transmitted rgba calendarcolor to rgb 2012-07-26 14:48:00 +02:00
Georg Ehrke
f7155b4276 convert through caldav transmitted rgba calendarcolor to rgb 2012-07-26 14:46:03 +02:00
Jenkins for ownCloud
ba0ea21074 [tx-robot] updated from transifex 2012-07-26 08:04:12 +02:00
Jenkins for ownCloud
42c22bee36 [tx-robot] updated from transifex 2012-07-26 08:03:10 +02:00
Lukas Reschke
efbd7ca166 Updated packages 2012-07-26 01:16:22 +02:00
Lukas Reschke
95936024bc Updated packages 2012-07-26 01:12:58 +02:00
Michael Gapczynski
add8f09355 No longer need hash() in shared storage, already implemented by the common file storage 2012-07-25 17:13:48 -04:00
Michael Gapczynski
30b58f5677 Merge branch 'master' into share_api 
Conflicts:
	apps/calendar/js/loader.js
	apps/contacts/index.php
	apps/contacts/js/loader.js
	apps/files/js/files.js
	apps/files_sharing/sharedstorage.php
	lib/filesystemview.php
 2012-07-25 17:08:18 -04:00
Michael Gapczynski
f25ccaff59 Fix filesystem hash, no longer using basicOperation() 2012-07-25 16:55:01 -04:00
Michael Gapczynski
4d17ed2f71 Make file actions permissions aware 2012-07-25 16:33:08 -04:00
Jenkins for ownCloud
37bccf54f2 [tx-robot] updated from transifex 2012-07-25 22:15:24 +02:00
Arthur Schiwon
b94631de0c LDAP: check if php-ldap is installed. If not, give an error output. FIX: blank Users page when the module is not installed. 2012-07-25 18:40:48 +02:00
Arthur Schiwon
3c9919e475 LDAP: check if php-ldap is installed. If not, give an error output. FIX: blank Users page when the module is not installed. 2012-07-25 18:21:16 +02:00
Bart Visscher
d17eb2983f OpenID: fix include path 2012-07-25 17:45:59 +02:00
Georg Ehrke
9b0870bb91 add some calendar sharing hooks in stable4 - bugfix for oc-1325 2012-07-25 17:02:24 +02:00
Arthur Schiwon
71b862e571 LDAP: replace deprecated constant 2012-07-25 15:11:58 +02:00
Arthur Schiwon
4a2295b75b code style 2012-07-25 15:10:56 +02:00
Arthur Schiwon
6285cc2604 LDAP: remove debug output 2012-07-25 13:19:07 +02:00
Arthur Schiwon
ab1d9507a9 code style 2012-07-25 13:18:31 +02:00
Arthur Schiwon
edfd789a87 LDAP: remove obsolete require_once 2012-07-25 13:16:31 +02:00
Arthur Schiwon
8664729843 code style 2012-07-25 13:14:32 +02:00
Arthur Schiwon
15f7d838fa code style 2012-07-25 13:13:01 +02:00
Arthur Schiwon
569e52b87c remove unnecessary debug output 2012-07-25 13:11:42 +02:00
Arthur Schiwon
c8404a7bfa code style 2012-07-25 13:10:59 +02:00
Arthur Schiwon
92f447ca50 code style 2012-07-25 13:09:51 +02:00
Arthur Schiwon
a6c5309e16 LDAP: adjust test after refactoring 2012-07-25 12:56:09 +02:00
Arthur Schiwon
b10f7aafb7 LDAP: silence warning, but handle the error 2012-07-25 12:56:09 +02:00
Arthur Schiwon
25ad1d5c3e LDAP: split up LIB_LDAP into Access for LDAP interaction functions and Connection for configuration and resource management. Adjust user_ldap, group_ldap and the app accordingly. 2012-07-25 12:56:09 +02:00
Arthur Schiwon
d0aebf05bf LDAP: group backend now implements the interface, does not inherit backend class 2012-07-25 12:56:08 +02:00
Arthur Schiwon
42492338fc LDAP: put app under the OCA\user_ldap\ namespace 2012-07-25 12:56:08 +02:00
Arthur Schiwon
5888cb48b6 Support for OCA namespace 2012-07-25 12:56:08 +02:00
Arthur Schiwon
afdc5bf264 LDAP: switch user backend from extending class OC_User_Backend to implementing OC_User_Interface for improved flexibility 2012-07-25 12:56:08 +02:00
Arthur Schiwon
0bdebe0e4a LDAP: pass user backend as instance, not classname 2012-07-25 12:56:08 +02:00
Michael Gapczynski
6f58eca534 Change read only check to isCreatable 2012-07-24 21:35:03 -04:00
Michael Gapczynski
fc72d4b10f Add root directory checks for CRUDS permissions in shared storage 2012-07-24 21:16:47 -04:00
Michael Gapczynski
f7b89f0475 Add CRUDS permissions calls to filesystem, deprecate is_readable() and is_writable() 2012-07-24 20:10:28 -04:00
Michael Gapczynski
c60c6024a7 Remove toTmpFile() from shared storage, no longer needed 2012-07-24 14:50:43 -04:00
Michael Gapczynski
eac297e8c4 Improve file source caching for shared folders 2012-07-24 14:41:19 -04:00
Michael Gapczynski
e8675586af Fix permission check for rmdir(), implement unlink(), rename(), and copy() 2012-07-24 14:22:07 -04:00
Michael Gapczynski
e6678bd454 Permission check should be made on parent folder when creating a new folder 2012-07-23 22:39:29 -04:00
Michael Gapczynski
b58e72cdb2 Alert user of errors when creating new files or folders 2012-07-23 22:35:34 -04:00
Michael Gapczynski
7b01e3285e Include a few CRUDS permissions checks in shared storage, plus a little clean-up in shared storage 2012-07-23 22:05:53 -04:00
Robin Appelman
7967685771 move some openid files to 3rdparty 2012-07-24 00:02:01 +02:00
Bjoern Schiessle
73734c98e0 - remove namespace from file property name (webdav) 
- update script to fix broken properties in the database
 2012-07-23 11:00:37 +02:00
Bjoern Schiessle
bd63fddbf4 fix broken properties in the database 2012-07-23 10:34:01 +02:00
Bjoern Schiessle
708c771296 update routine to fix broken file properties in db 2012-07-23 10:25:26 +02:00
Thomas Tanghus
25e1c13ef7 Remove unused ajax file. 2012-07-23 01:17:38 +02:00
Thomas Tanghus
67b6ff22bc Cache DOM lookups, general cleanup. 2012-07-23 01:17:38 +02:00
Thomas Tanghus
b60e5942a5 Cleaner event handling. 2012-07-23 01:17:38 +02:00
Thomas Tanghus
fb9ef90c45 No need to set checksum on PHOTO. 2012-07-23 01:17:38 +02:00
Thomas Tanghus
0439a18324 Cleaner variable handling. 2012-07-23 01:17:38 +02:00
Thomas Tanghus
b00de0258b Make sure notifier cleans up. 2012-07-23 01:17:38 +02:00
Thomas Tanghus
644b6e60d5 Revert "No need to set checksum for PHOTO." 
This reverts commit 3937d19fa2ef3da2719d0425ce02707d0345960c.
 2012-07-23 01:17:38 +02:00
Thomas Tanghus
dc05fd7b92 No need to set checksum for PHOTO. 2012-07-23 01:17:38 +02:00
Thomas Tanghus
294e65fa38 Use insertContact 2012-07-23 01:17:38 +02:00
Thomas Tanghus
641bd7a456 Whitespace 2012-07-23 01:17:38 +02:00
Robin Appelman
b1010160b3 CSRF protection for eventsource 2012-07-22 16:37:49 +02:00
Robin Appelman
a49c07cf88 progressbar for New->From Url 2012-07-22 03:56:51 +02:00
Robin Appelman
59ab8b14c7 cache fileid's in oc_cache 2012-07-22 03:24:34 +02:00
Thomas Tanghus
ab8ce89df3 Added help for keyboard shortcuts. 2012-07-22 00:15:28 +02:00
Thomas Tanghus
38d38c1797 First stab at Ninja mode ;-) 2012-07-21 22:00:27 +02:00
Thomas Tanghus
359dc8736a Improved scrollTo method. Still not quite there... 2012-07-21 22:00:27 +02:00
Thomas Tanghus
eb57544518 Added next/previous methods to contacts list. 2012-07-21 22:00:27 +02:00
Thomas Tanghus
7d520bc7a9 Remove wrong comment. 2012-07-21 22:00:27 +02:00
Georg Ehrke
81b917b2f6 increase width of user migrates form in personal settings, so you can read the whole label in all languages 2012-07-21 19:50:45 +02:00
Georg Ehrke
f9d3388854 Merge branch 'master' into calendar_import 2012-07-21 17:37:10 +02:00
Georg Ehrke
57207ddb82 some style fixes for calendar 2012-07-21 17:09:10 +02:00
Thomas Tanghus
e07cd26571 Implemented undelete for contacts. 2012-07-21 16:02:12 +02:00
Thomas Tanghus
51bafd32d6 Made contactlist optional in insertContact(). 2012-07-21 14:26:57 +02:00
Thomas Tanghus
00de757169 White space. 2012-07-21 14:26:26 +02:00
Thomas Tanghus
11aa571751 Added option to notify method. 2012-07-21 14:24:26 +02:00
Thomas Tanghus
687c87bc5b DRYed inserting into contacts list. 2012-07-21 13:13:41 +02:00
Bart Visscher
ad12e13f14 Tasks: Remove unused code 2012-07-21 00:52:49 +02:00
Bart Visscher
060b8865a4 DRY for getting calendar timezone setting 2012-07-21 00:45:30 +02:00
Bart Visscher
1c30a97833 Style fixes 2012-07-21 00:45:30 +02:00
Thomas Tanghus
06b5e05c86 Damn, that Jenkins dude is tough ;) 2012-07-21 00:43:01 +02:00
Robin Appelman
8a19e134df fix ununsed variables 2012-07-21 00:20:27 +02:00
Robin Appelman
48ec78299e cleanup some obsolete foldersize code from the shared storage backend 2012-07-21 00:20:27 +02:00
Thomas Tanghus
42fbc111a2 Hide progressbar on error. 2012-07-20 22:25:09 +02:00
Thomas Tanghus
3103a4cb3f Corrected retry count for uploaded imports. 2012-07-20 21:54:24 +02:00
Lukas Reschke
38271ded75 Added CSRF checks 2012-07-20 20:12:36 +02:00
Robin Appelman
c9be9ab251 remove unused variables 2012-07-20 18:56:18 +02:00
Robin Appelman
7152b8b4ee remove unused and depricated getFolderSize 2012-07-20 18:32:40 +02:00
Thomas Tanghus
ecf8e77dab Remove unused file. 2012-07-20 17:11:13 +02:00
Thomas Tanghus
7fff386679 Code style. 2012-07-20 17:11:13 +02:00
Robin Appelman
3c2967074f remove unused variable from dropbox filestorage backend 2012-07-20 16:48:28 +02:00
Robin Appelman
1224d7ec01 minor fixes for the google filestorage backend 2012-07-20 16:47:26 +02:00
Robin Appelman
23c71b15a0 remove unused variables from webdav file backend 2012-07-20 16:35:51 +02:00
Lukas Reschke
c04aa8d6a9 Add CSRF checks 2012-07-20 15:45:17 +02:00
Thomas Tanghus
b3d7043f9c Change uri fields from 100 to 200 chars. 2012-07-20 15:15:18 +02:00
Thomas Mueller
8c06452434 fixing syntax error 2012-07-20 09:14:32 +02:00
Thomas Mueller
5fe0027568 fixing syntax error 2012-07-20 08:20:45 +02:00
Thomas Tanghus
b8eea32478 Coding style. 2012-07-20 00:18:23 +02:00
Thomas Tanghus
1cbddcf211 Code style 2012-07-20 00:18:23 +02:00
Thomas Tanghus
616f2f336e Trigger loading of more contacts a bit earlier. 2012-07-20 00:18:23 +02:00
Thomas Tanghus
5c0c9bbdc1 Cleaning up a bit. 2012-07-20 00:18:23 +02:00
Thomas Tanghus
fc46322d4c Tweak dragging. 2012-07-20 00:18:23 +02:00
Thomas Tanghus
87da179e6c Eye candy for the draggables. 2012-07-20 00:18:23 +02:00
Robin Appelman
ad14d67c8d ftp user backend 2012-07-19 23:03:02 +02:00
Robin Appelman
b357a968c0 smb user backend 2012-07-19 22:42:26 +02:00
Robin Appelman
57fb37151a imap user backend 2012-07-19 22:42:18 +02:00
Arthur Schiwon
0bd7d14b7a Sharing: offer an option to allow sharing with everyone, i.e. do not check group memberships 2012-07-17 14:09:01 +02:00
Thomas Tanghus
ec4891b7d3 Fixed require path. 2012-07-17 12:07:14 +02:00
Thomas Tanghus
2c9aa029a7 Added missing CSRF checks. 2012-07-17 12:04:34 +02:00
Thomas Tanghus
748fcabba4 Added CSRF checks to files_versions. Expect some error messages - and report them ;) 2012-07-17 11:57:38 +02:00
Thomas Tanghus
8444fc5787 Added CSRF checks to Tasks. Expect some error messages - and report them ;) 2012-07-17 11:52:11 +02:00
Thomas Tanghus
06ff6c6d7d Added CSRF checks to Calendar. Expect some error messages - and report them ;) 2012-07-17 11:46:01 +02:00
Thomas Tanghus
9326f4f535 Added hooks for postCreateUser to add default address book and calendar. Fixes oc-1265. 2012-07-17 10:45:15 +02:00
Thomas Tanghus
f4a8c233cf Added hook for postCreateUser. Probably fix for oc-1265. 
Conflicts:

	apps/calendar/appinfo/app.php
 2012-07-17 10:35:46 +02:00
Thomas Tanghus
1f4d6896df Wrong version comparison in update.php. 2012-07-17 03:59:41 +02:00
Thomas Tanghus
258df5eea2 Added hook for postCreateUser. Probably fix for oc-1265. 2012-07-17 03:04:04 +02:00
Thomas Tanghus
4b8a34df21 Wrong argument count in postCreateUser hook for contacts. 2012-07-17 01:37:28 +02:00
Thomas Tanghus
4de66880ed If a contact wasn't loaded in the list you coulcn't access it from search result. Fixes oc-1264. 2012-07-17 01:35:35 +02:00
Thomas Tanghus
f128b96ac0 Format birthday as BDAY;VALUE=DATE:YYYY-MM-DD. Fixes oc-1276. 2012-07-16 23:44:18 +02:00
Thomas Tanghus
eb2a15d58f Format birthday as BDAY;VALUE=DATE:YYYY-MM-DD. Fixes oc-1276. 2012-07-16 23:36:11 +02:00
Thomas Tanghus
47d50fc424 Merge branch 'stable4' of git://gitorious.org/owncloud/owncloud into stable4 2012-07-16 21:22:07 +02:00
Thomas Tanghus
d64300251b Corrected javascript definition. 2012-07-16 21:21:37 +02:00
Georg Ehrke
47566b0c42 stop using of OC_L10N::tA 2012-07-16 20:26:14 +02:00
Robin Appelman
19f2ce6997 improve webfinger for situations where owncloud is not installed in the server root 2012-07-16 19:58:05 +02:00
Robin Appelman
7ab35af6dd use the remote.php infrastructure for remoteStorage 2012-07-16 19:58:05 +02:00
Georg Ehrke
d4e2cb6e62 fix encoding fail in calendar app - bugfix for oc-1194 2012-07-16 19:53:19 +02:00
Thomas Tanghus
296f79d1a4 latin1 => utf8 2012-07-16 01:46:16 +02:00
Thomas Tanghus
7a7ac58094 Remove obsolete code. 2012-07-16 01:46:16 +02:00
Thomas Tanghus
2035bc7905 Fix sorting - again :-P 2012-07-16 01:46:16 +02:00
Thomas Tanghus
0fb1a76113 Bold active address book. 2012-07-16 01:46:16 +02:00
Thomas Tanghus
25f50e8273 Set the address book of the active contact active. 2012-07-16 01:46:16 +02:00
Thomas Tanghus
8fba6b9bc7 UI part of addressbook merging. 2012-07-16 01:46:16 +02:00
Thomas Tanghus
502f420678 Wrap image uploading in anonymous function. 2012-07-16 01:46:16 +02:00
Thomas Tanghus
001a47afb0 Remove obsolete FIXMEs. 2012-07-16 01:46:16 +02:00
Thomas Tanghus
225726c8d9 latin1 => utf8. I thought I did this a month ago? 2012-07-16 01:41:45 +02:00
Thomas Tanghus
dd95149238 Also unlink unsuccessful imports. 2012-07-15 17:34:30 +02:00
Georg Ehrke
d49b789348 Merge branch 'master' into calendar_import 2012-07-15 16:56:38 +02:00
Thomas Tanghus
160e701fbf Make list droppable too instead of just the header. 2012-07-15 12:28:29 +02:00
Thomas Tanghus
db034f05ca Improve temp file handling. 2012-07-15 12:28:29 +02:00
Thomas Tanghus
8b49e304e0 Hide file form field behind image so it will maybe work with IE... 2012-07-15 12:28:29 +02:00
Thomas Tanghus
48521fcfaa Made notifications more flexible. 2012-07-15 12:28:29 +02:00
Thomas Tanghus
d71da67bee Typo. 2012-07-15 12:28:29 +02:00
Thomas Tanghus
7af608881b Added notification. 2012-07-15 12:28:29 +02:00
Thomas Tanghus
4e684b9e9d Fixed sorting of addressbooks. 2012-07-15 12:28:29 +02:00
Thomas Tanghus
287285880c Removed obsolete TODO. 2012-07-15 12:28:28 +02:00
Thomas Tanghus
eba4f08015 Refactored contacts import. 2012-07-15 04:17:30 +02:00
Thomas Tanghus
87912a8c65 Fix loading previous or next contact after deleting one. 2012-07-15 04:17:30 +02:00
Thomas Tanghus
140263003a Give default address book a more intuitive name and replace spaces with underscores in uri. 2012-07-14 14:11:43 +02:00
Thomas Tanghus
d45d73eecf Try to avoid occasional error messages. 2012-07-14 14:11:43 +02:00
Robin Appelman
7d1f644011 use new way to register remote/public.php entries in user_webfinger 2012-07-13 23:24:22 +02:00
Robin Appelman
b45d3ced79 fix remote and public.php 2012-07-13 22:44:35 +02:00
Bjoern Schiessle
50eef9a71c update script to fix fscache 2012-07-13 15:17:36 +02:00
Michael Gapczynski
f496a9dea6 Rename $contacts to $has_contacts, it missed this commit: 7cb74a0 2012-07-11 20:29:59 -04:00
Michael Gapczynski
ac395dced1 Rename $contacts to $has_contacts, it missed this commit: 7cb74a0 2012-07-11 20:28:29 -04:00
Michael Gapczynski
4bf13adff2 Merge branch 'master' into share_api 
Conflicts:
	apps/contacts/lib/addressbook.php
	apps/files_sharing/js/share.js
	apps/files_sharing/sharedstorage.php
 2012-07-11 20:25:59 -04:00
Michael Gapczynski
7b2ec41477 Revert santizing toaddress, because PHPMailer now throws exceptions 
Conflicts:
	apps/files_sharing/ajax/email.php
 2012-07-11 19:38:57 -04:00
Michael Gapczynski
ebcf5bce3c Sanitize toaddress for emailing private links 
Conflicts:
	apps/files_sharing/ajax/email.php
 2012-07-11 19:38:56 -04:00
Michael Gapczynski
91a15bae76 Revert santizing toaddress, because PHPMailer now throws exceptions 2012-07-11 16:02:43 -04:00
Michael Gapczynski
7077678f7f Sanitize toaddress for emailing private links 2012-07-11 15:26:22 -04:00
Lukas Reschke
d203fa2c50 Sanitizing file names 2012-07-11 19:15:11 +02:00
Lukas Reschke
c3fea30811 Sanitizing file names 2012-07-11 19:14:04 +02:00
Michael Gapczynski
e896c0a9e3 Fix addressbook sharing, formatItems() changed in past commits 2012-07-11 11:33:48 -04:00
Bjoern Schiessle
07efd39d8a prevent script execution during slideshow 2012-07-11 15:44:39 +02:00
Bjoern Schiessle
e248412ca9 use getStorage() to get versions location 
update routine implemented
version number of files_versions increased

Conflicts:

	apps/files_versions/lib/hooks.php
 2012-07-11 11:06:29 +02:00
Georg Ehrke
5575493900 Merge branch 'master' into calendar_import 2012-07-11 10:47:30 +02:00
Jörn Friedrich Dreyer
ca8028bd73 small fixes in merge request 104, use OCP\Files::getStorage 2012-07-11 02:33:11 +02:00
Michael Gapczynski
0b14b4e3e8 Call exit() to prevent further code execution if directory does not exist 2012-07-11 02:33:11 +02:00
BlackEagle
ef1924dbbb gallery :: display big picture according to exif 
- fixes oc-314
- caching of the 'big' images in subfolder view
  next to the tumbnails
- now choosen to use max 1200px for viewing
  this helps speeding up the viewing process

Signed-off-by: BlackEagle <ike.devolder@gmail.com>
 2012-07-11 02:33:10 +02:00
Michael Gapczynski
3134a962d9 Call exit() to prevent further code execution if directory does not exist 2012-07-10 18:59:42 -04:00
Michael Gapczynski
7c908a0016 Sharing files working using share API 2012-07-10 18:56:22 -04:00
Bjoern Schiessle
bf09bcc854 add OCP\Files to access files 2012-07-10 19:22:06 +02:00
Jörn Friedrich Dreyer
9be6432aac shrink css height for gallery_div from 152 to 150 to shrink grey background thumbnail height 2012-07-10 16:58:37 +02:00
Jörn Friedrich Dreyer
acb9612332 fix thumbnail size calculation, use const for THUMBNAIL_HEIGHT 2012-07-10 16:58:37 +02:00
Johannes Willnecker
02c9b03b8e Missing dir added. 2012-07-10 16:58:37 +02:00
Johannes Willnecker
3e53bf4a86 Fix for oc-972, oc-1144 and oc-1191 2012-07-10 16:58:37 +02:00
Sam Tuke
91da4b05b7 fixed typos 2012-07-10 15:51:57 +01:00
Robin Appelman
7f57591ef1 suppress error when using is_dir on non directory in smb backend 2012-07-10 14:20:30 +02:00
Robin Appelman
aeed130b3a improve caching smb results a bit 2012-07-10 14:20:19 +02:00
Robin Appelman
8a902d8f65 improve filecache support for smb 2012-07-10 14:20:11 +02:00
Robin Appelman
a1fefea66f split share and root config for smb backend, also sanitize config a bit more 2012-07-10 14:19:51 +02:00
Robin Appelman
8fcce55e76 share code between smb and ftp filestorage backends 2012-07-10 14:19:40 +02:00
Robin Appelman
539e4a1813 smb filestorage backend 2012-07-10 14:19:31 +02:00
Thomas Tanghus
9d2cbc88f0 Revert reversion of f5c329af98 :-P 2012-07-10 01:24:40 +02:00
Thomas Tanghus
34ac2ea1ba Don't escape assigned values. 2012-07-10 01:24:40 +02:00
Thomas Tanghus
861c379255 Make sure the proper DOM is loaded and the right address book gets expanded. 2012-07-10 01:24:40 +02:00
Thomas Tanghus
0744e5a172 Look for the right field :-P 2012-07-10 01:24:40 +02:00
Thomas Tanghus
7cb74a0bf3 Reduce variables assigned. 2012-07-10 01:24:40 +02:00
Thomas Tanghus
50462903d6 Revert "Delay fetching of carddata and set ETag and size instead." 
This reverts commit f5c329af98.
 2012-07-10 01:24:40 +02:00
Thomas Mueller
b97eb3a48f fixing oc-1198 2012-07-09 23:50:26 +02:00
Bjoern Schiessle
43f00a2dc8 create uploads directory for ssl certificates if it didn't exists 2012-07-09 18:11:29 +02:00
Jörn Friedrich Dreyer
e59a1806cf remove superfluous ?> at the end of .php files (left out apps/*/templates) 2012-07-09 16:51:16 +02:00
jfd
b67199bb45 add css id attribute, minor fixes 2012-07-09 16:04:46 +02:00
Jörn Friedrich Dreyer
6f408c3651 add supersized slideshow 2012-07-09 15:13:23 +02:00
Bjoern Schiessle
77f07c672e remove hard coded path 2012-07-09 12:49:04 +02:00
Bjoern Schiessle
6bf1473f0e replace urlencoded slash 2012-07-09 11:58:16 +02:00
Bjoern Schiessle
32b476d6ec remove comments around code block 2012-07-09 10:19:19 +02:00
Bjoern Schiessle
7d41d3aba8 webdav ssl cleanup 2012-07-09 09:40:33 +02:00
Thomas Tanghus
f5c329af98 Delay fetching of carddata and set ETag and size instead. 2012-07-09 01:48:42 +02:00
Thomas Tanghus
47aaca49a1 Rescan categories in small batches to reduce memory usage. 2012-07-09 00:16:14 +02:00
Thomas Tanghus
d1cf787197 Move code to OC_Contacts_App::scanCategories(). 2012-07-09 00:15:37 +02:00
Thomas Tanghus
6d123e90f3 Remove deleted address book from list. 2012-07-08 23:38:03 +02:00
Thomas Tanghus
0b6cd8d203 Simplify VCF generation. 2012-07-08 23:36:52 +02:00
Thomas Tanghus
197086a952 Make it possible to import files using CR as eol. 2012-07-08 18:34:00 +02:00
Thomas Tanghus
dc8193fccb Make it possible to import files using CR as eol. 2012-07-08 18:28:55 +02:00
Thomas Tanghus
334257d2b6 Implemented VCFExportPlugin. 2012-07-08 17:52:57 +02:00
Thomas Tanghus
3424785db0 Implemented Sabre iCalendar Export Plugin. 2012-07-08 16:58:17 +02:00
Thomas Tanghus
747b7fbbfe Set the loading class on the property being changed, not on its container. Now on all the places relevant ;-) 2012-07-08 16:17:10 +02:00
Thomas Tanghus
f5c620006e Set the loading class on the property being changed, not on its container. Now on all the places relevant ;-) 2012-07-08 16:15:52 +02:00
Thomas Tanghus
97106f198f Set the loading class on the property being changed, not on its container. 2012-07-08 16:11:45 +02:00
Thomas Tanghus
d730d3edd4 Set the loading class on the property being changed, not on its container. 2012-07-08 16:10:12 +02:00
Thomas Tanghus
25b95a9ec7 Improve checking for active addressbooks and creating default addressbook. 2012-07-08 15:41:38 +02:00
Thomas Tanghus
554cb2d3ab Add missing requesttoken. 2012-07-08 14:48:49 +02:00
Thomas Tanghus
47f96e2d5e Missing semi-colon. 2012-07-08 14:42:33 +02:00
Thomas Tanghus
746eef0d5c Format error response correctly. 2012-07-08 14:31:40 +02:00
Thomas Tanghus
e6a60198e4 Return error messages in correct format. 2012-07-08 14:11:48 +02:00
Thomas Tanghus
2b22f0db0a Add missing requesttoken. 2012-07-08 13:28:12 +02:00
Lukas Reschke
ea70ca3ce3 CSRF checks 2012-07-07 16:12:21 +02:00
Lukas Reschke
2c318f45f4 CSRF checks 2012-07-07 16:08:27 +02:00
Lukas Reschke
04a0755fd3 CSRF checks 2012-07-07 16:03:21 +02:00
Lukas Reschke
b7c510a61a CSRF checks 2012-07-07 16:02:33 +02:00
Lukas Reschke
0abcf0a421 CSRF checks 2012-07-07 15:58:11 +02:00
Lukas Reschke
c63db28eaf CSRF check 2012-07-07 15:54:52 +02:00
Frank Karlitschek
b967530795 increase the time limit again to a sensible granularity of 1 min. 
Please talk to me before changing this.
 2012-07-06 18:42:41 +02:00
Bjoern Schiessle
ca26bcc581 close file after write process 2012-07-06 17:09:20 +02:00
Bjoern Schiessle
e91b4bc2ac allow user to upload his own root certificate for secure webdav mount 2012-07-06 15:58:38 +02:00
Thomas Tanghus
75d01b065d Make export batch size configurable. 2012-07-06 13:49:04 +02:00
Thomas Tanghus
cafbd02337 Fix endless loop when no addressbooks. 2012-07-06 13:24:56 +02:00
Thomas Tanghus
a1872412bf Correct hack ;) 2012-07-06 12:59:07 +02:00
Thomas Tanghus
ab1b4f1f03 Fugly fixed include. 2012-07-06 12:59:07 +02:00
Bjoern Schiessle
963faf6458 CURLOPT_SSL_VERIFYPEER=false shouldn't be in master 2012-07-06 12:35:29 +02:00
Bjoern Schiessle
8353517969 use OC_Connector_Sabre_Client 2012-07-06 12:24:03 +02:00
Georg Ehrke
f875240b47 comment out some code 2012-07-06 11:23:20 +02:00
Georg Ehrke
9a10efd80f Merge branch 'master' into calendar_import 2012-07-06 11:01:12 +02:00
Thomas Tanghus
a5a1d929ca No need for being protected. 2012-07-06 03:22:42 +02:00
Thomas Tanghus
59b38e668d Missing requesttoken 2012-07-06 03:22:42 +02:00
Bart Visscher
5e0b80dc8d Contacts: Fix copy&paste error 2012-07-05 17:12:52 +02:00
Bjoern Schiessle
51774cca6b use OC_Filesystem for rollback 2012-07-05 14:20:40 +02:00
Bjoern Schiessle
378fa2bc86 check if caview really exists 2012-07-05 12:17:33 +02:00
Bjoern Schiessle
55cde0e5aa moved remove and rename hook to libs/hooks.php 2012-07-05 11:35:08 +02:00
Bjoern Schiessle
aa3b575ceb disabled user upload of root certificates until sabredav client can handle them 2012-07-05 11:31:30 +02:00
Georg Ehrke
aa95cf2c98 Merge branch 'master' into calendar_import 2012-07-05 11:30:37 +02:00
Bjoern Schiessle
f86ecb3bf7 send ca cert path to sabredav client 2012-07-05 11:28:32 +02:00
Thomas Tanghus
9d00f4d2fb Correct db default value. 2012-07-05 00:40:11 +02:00
Thomas Tanghus
dac2c14ae9 Add missing CSRF check. 2012-07-05 00:37:08 +02:00
Thomas Tanghus
b11b6afbb9 Hopefully fix for drag'n'drop import in oc-813. 2012-07-05 00:25:38 +02:00
Thomas Tanghus
5d79444852 Missing update script. 2012-07-04 22:58:31 +02:00
Thomas Tanghus
706a13544b Remove ugly activation hack. 2012-07-04 22:13:36 +02:00
Georg Ehrke
7ec2d6ce85 Merge branch 'master' into calendar_import 2012-07-04 21:15:32 +02:00
Georg Ehrke
a4c2893128 some more work on calendar import - new import is (nearly) done 2012-07-04 21:14:40 +02:00
Bjoern Schiessle
e258da5c3c certificate should be only visible for users 2012-07-04 17:22:04 +02:00
Bjoern Schiessle
5d61b85a1d allow users to upload ssl root certificates for the webdav client 2012-07-04 17:18:36 +02:00
Thomas Tanghus
b2eac08ad3 Query contacts in batches of 20. Possible fix for oc-1126. 2012-07-04 16:54:00 +02:00
Thomas Tanghus
5fb9b3e965 Disable expires header on thumbnail and photo. 2012-07-04 15:32:41 +02:00
Thomas Tanghus
6d3afb3857 Moved action buttons down to the add field menu. Fixes oc-1155. 2012-07-04 13:57:07 +02:00
Thomas Tanghus
f72a11f852 Moved action buttons down to the add field menu. Fixes oc-1155. 2012-07-04 13:49:39 +02:00
Georg Ehrke
657eef354a Merge branch 'master' into calendar_import 2012-07-04 13:03:30 +02:00
Georg Ehrke
393eefa5d2 replace some direct links with OC.imagePath 2012-07-03 23:44:47 +02:00
Georg Ehrke
f98bd1ad66 Merge branch 'master' into calendar_import 2012-07-03 22:35:46 +02:00
Georg Ehrke
c036700c54 some more work on calendar import 2012-07-03 22:33:24 +02:00
Michael Gapczynski
5e8ef33190 Clean up in the dropdown for unsharing 2012-07-03 14:00:09 -04:00
Sam Tuke
b1c9785eb3 Merge branch 'master' of gitorious.org:owncloud/owncloud 
Conflicts:
	apps/files_versions/lib/versions.php
 2012-07-03 18:17:32 +01:00
Sam Tuke
a775deaf22 Moved hooks and versions.php into new lib directory 
Part-ported filesystem operations to OC_FilesystemView
Refactored Storage class to depend on an OC_FsV object and have fewer static classes
 2012-07-03 17:42:51 +01:00
Bjoern Schiessle
aec6eea235 use filesystem abstraction layer to copy file versions 2012-07-03 18:25:49 +02:00
Michael Gapczynski
1e36e1f2cb Use formatted shared addressbook in all cases, addressbooks out of order now 2012-07-03 11:36:57 -04:00
Michael Gapczynski
4185bd6292 Load shared addressbooks inside OC_Contacts_Addressbook instead of the index, add public functions getItemShared(With)BySource() for contacts app 2012-07-03 11:11:01 -04:00
Georg Ehrke
b6cff93254 fix spelling fail in code 2012-07-03 16:47:46 +02:00
Georg Ehrke
0b3ed2b048 Merge branch 'master' into calendar_import 2012-07-03 16:39:09 +02:00
Georg Ehrke
ca2b1f7863 fix encoding fail in calendar app - bugfix for oc-1194 2012-07-03 13:55:48 +02:00
Georg Ehrke
cfcfdd674e Merge branch 'master' into calendar_import 2012-07-03 13:43:52 +02:00
Georg Ehrke
29a9559fa9 some work on calendar import dialog 2012-07-03 13:43:18 +02:00
Michael Gapczynski
77b582e4e6 Change getItems() return to a 3-dimensional array to handle multiple shares of the same item 2012-07-02 15:29:34 -04:00
Tom Needham
88cbbc86b8 Text editor: Always use UTF-8 to keep Ace happy. 2012-07-02 19:06:40 +00:00
Arthur Schiwon
0a6f7b33c3 LDAP: make it UTF-8 save 2012-07-02 20:31:19 +02:00
Bjoern Schiessle
ab036d4764 webdav client crashes for secure connections if he doesn't have the right root certificate for ssl verification. For the moment I print at least a useful error message to the OC log and the Apache log 2012-07-02 17:52:51 +02:00
Arthur Schiwon
515adceace LDAP: reset resource on failed bind 
check for resource
 2012-07-02 14:03:29 +02:00
Georg Ehrke
e89a0949c4 remove some whitespace 2012-07-01 23:32:21 +02:00
Georg Ehrke
803f2c2517 some work on calendar import 2012-07-01 21:36:09 +02:00
Michael Gapczynski
eca2e073f8 Don't reload the page after sending private link to email address 2012-07-01 11:54:32 -04:00
Michael Gapczynski
bf93dd4661 Don't reload the page after sending private link to email address 2012-07-01 11:53:29 -04:00
Michael Gapczynski
0b9b1757fe Add share action to addressbooks! 2012-06-30 21:06:49 -04:00
Michael Gapczynski
47f46890c8 Fix generateTarget() for contacts backend 2012-06-30 21:03:36 -04:00
Georg Ehrke
6a060ecd23 use light grey instead of white 2012-07-01 01:02:54 +02:00
Tom Needham
c7a4075aaa Updates contacts migration provider 2012-06-30 22:56:47 +00:00
Georg Ehrke
be11f71d27 fix doc for OC_Calendar_Calendar::generateTextColor() 2012-07-01 00:31:05 +02:00
Georg Ehrke
601237a0c3 add algorithm to generate the calendar's text color 2012-07-01 00:09:33 +02:00
Michael Gapczynski
2418d9a1a9 Change registerBackend calls class argument to strings 2012-06-30 17:33:30 -04:00
Georg Ehrke
ce331bd1d3 improvements for dropoimport 2012-06-30 23:18:41 +02:00
Georg Ehrke
a705b19cd5 little fix for import 2012-06-30 22:45:12 +02:00
Georg Ehrke
f15941a967 improve dropimport 2012-06-30 22:26:29 +02:00
Georg Ehrke
4890bbb30d Merge branch 'master' into calendar_import 2012-06-30 22:08:36 +02:00
Georg Ehrke
376431fa0d import works now for dropimport 2012-06-30 22:08:30 +02:00
Georg Ehrke
fa5b31ac9c fix documentation style 2012-06-30 17:09:20 +02:00
Georg Ehrke
8e0addebc3 fix some doc 2012-06-30 15:39:20 +02:00
Georg Ehrke
34b2486d53 some improvements for calendar export 2012-06-30 15:23:21 +02:00
Georg Ehrke
390f5cc89f some work on (drop)import) 2012-06-30 15:17:29 +02:00
Tom Needham
51173163ce Contacts: align the bottom control buttons 2012-06-30 11:22:09 +00:00
Tom Needham
704a1c655e Contacts: fix add contact icon path 2012-06-30 11:07:54 +00:00
Georg Ehrke
433d15d309 Merge branch 'master' into calendar_import 2012-06-30 12:50:26 +02:00
Georg Ehrke
6e6f90a8a2 fix merge conflicts 2012-06-30 12:44:51 +02:00
Georg Ehrke
34d4eb8edd some more work on calendar import class 2012-06-30 12:42:36 +02:00
Michael Gapczynski
edc6a648d1 Fix placeholder value for optional fields in external storage UI 2012-06-29 19:35:57 -04:00
Robin Appelman
252453cd34 fix encryption test cases when not logged in 2012-06-30 01:05:18 +02:00
Thomas Tanghus
a4614f83ff Don't add duplicate contacts in the list when en-/disable an address book. 2012-06-29 23:18:47 +02:00
Georg Ehrke
246894243a Merge branch 'master' into calendar_import 2012-06-29 21:46:09 +02:00
Michael Gapczynski
719c7f7f6e Fix WebDAV external storage opendir() and stat() for directories, bug fix for oc-1160 2012-06-29 13:01:00 -04:00
Bart Visscher
3ed7738d5e Increment user_openid version to load new app type 2012-06-29 18:38:04 +02:00
Bart Visscher
f61793aa14 Coding style fixes 2012-06-29 18:38:04 +02:00
Bart Visscher
2b4ecbaba0 Whitespace fixes 2012-06-29 18:38:04 +02:00
Georg Ehrke
652a874fa6 fix displaying of events 2012-06-29 18:13:52 +02:00
Georg Ehrke
3bcf176a53 add some hooks to fix calendar sharing 2012-06-29 17:27:29 +02:00
Michael Gapczynski
7e9455c382 Allow multiple Google Drive and Dropbox external storages to be configured 2012-06-29 11:22:54 -04:00
Michael Gapczynski
2d49a491fb Clear the mount point value for the new mount point row 2012-06-29 11:10:51 -04:00
Michael Gapczynski
f311c2a2ff Hide the delete button on new mount point row 2012-06-29 11:10:51 -04:00
Georg Ehrke
bda0026374 fix birthday calendar 2012-06-29 15:43:18 +02:00
Bjoern Schiessle
b95996c02c - when creating a new text file or directory which name already exist use the same pattern as for file uploads in such a case (add a (N) to the name) 
- don't allow renaming if a file/directory with the name already exists
 2012-06-29 15:23:04 +02:00
Georg Ehrke
08e707d258 some work on OC_Calendar_Import 2012-06-29 14:32:07 +02:00
Bjoern Schiessle
60ec46f706 - remove leading http[s] to let createBaseUri() generate secure/unsecure base URI 
- if secure is set to true add 's' to http
 2012-06-29 12:01:23 +02:00
Robin Appelman
75af5778a4 pass progresskey the correct way during calender import 2012-06-29 00:49:37 +02:00
Michael Gapczynski
31bba86e87 Fix external storage UI for Admin page 2012-06-28 17:55:22 -04:00
Bart Visscher
02e4e0e08f Gallery: Get all the image information for a directory at once 2012-06-28 22:11:04 +02:00
Georg Ehrke
91d92aed02 fix for previous commit 2012-06-28 19:13:43 +02:00
Georg Ehrke
4b3af1f73b use OC_Calendar_Export for publicly shared calendars 2012-06-28 19:12:50 +02:00
Georg Ehrke
930bbeabd4 Calendar Export: replace spaces with dashes in the name of the calendar / event 2012-06-28 19:04:14 +02:00
Georg Ehrke
9dd7ca2667 some changes and more doc for OC_Calendar_Export class 2012-06-28 18:54:13 +02:00
Georg Ehrke
9a4709e68d fix calendar export for Apple iCal - i hate bloody line ends 2012-06-28 16:41:00 +02:00
Georg Ehrke
c4f5639cb4 Merge branch 'master' into calendar_export 2012-06-28 15:24:30 +02:00
Bjoern Schiessle
bdd1baeb85 use public API 2012-06-28 14:18:57 +02:00
Bjoern Schiessle
e5792cc064 adjust the name and/or location of the stored versions if the actual file gets moved or renamed 2012-06-28 14:06:20 +02:00
Bjoern Schiessle
f22f49671b move hook to erase versions from deleted files to the right place 2012-06-28 12:42:47 +02:00
Bjoern Schiessle
52f99a7570 delete file versions if the user deletes a file 2012-06-28 11:48:57 +02:00