Björn Schießle
1f5ed65b12
Merge branch 'files_encryption' of github.com:owncloud/core into files_encryption
2013-05-15 16:13:29 +02:00
Björn Schießle
64d94c540a
enable admin to change the recovery password
2013-05-15 16:12:20 +02:00
Florin Peter
63a790b415
fix for broken tests
2013-05-15 14:33:08 +02:00
Florin Peter
1fbdc3ce8f
fix for previous workaround
2013-05-15 14:32:50 +02:00
Björn Schießle
5b160edebb
check if the user knows the correct recovery password before changing the recovery key settings
2013-05-15 14:02:13 +02:00
Björn Schießle
335f2ca321
Merge branch 'files_encryption' of github.com:owncloud/core into files_encryption
2013-05-15 11:42:41 +02:00
Björn Schießle
d8ae2fa80d
only let the user change the recovery admin settings if a key passwords was entered.
2013-05-15 11:42:22 +02:00
Florin Peter
137039d35a
workaround for blank page need an other solution
2013-05-15 10:52:23 +02:00
Florin Peter
3d7534da74
improved files_encryption tests
2013-05-15 10:21:56 +02:00
Florin Peter
01f1153b08
Merge branch 'files_encryption' of https://github.com/owncloud/core into files_encryption
...
Conflicts:
apps/files/l10n/ar.php
apps/files/l10n/bn_BD.php
apps/files/l10n/de.php
apps/files/l10n/de_DE.php
apps/files/l10n/el.php
apps/files/l10n/es.php
apps/files/l10n/fa.php
apps/files/l10n/fr.php
apps/files/l10n/gl.php
apps/files/l10n/id.php
apps/files/l10n/ko.php
apps/files/l10n/nl.php
apps/files/l10n/nn_NO.php
apps/files/l10n/pl.php
apps/files/l10n/pt_BR.php
apps/files/l10n/pt_PT.php
apps/files/l10n/ro.php
apps/files/l10n/ru.php
apps/files/l10n/sl.php
apps/files/l10n/uk.php
apps/files/l10n/vi.php
apps/files_encryption/l10n/ca.php
apps/files_sharing/lib/cache.php
apps/files_sharing/lib/sharedstorage.php
apps/user_ldap/l10n/tr.php
core/l10n/cs_CZ.php
core/l10n/de.php
core/l10n/de_DE.php
core/l10n/ru.php
core/l10n/sk_SK.php
core/l10n/tr.php
core/l10n/vi.php
core/l10n/zh_CN.php
l10n/af_ZA/files.po
l10n/ar/files.po
l10n/be/files.po
l10n/bg_BG/files.po
l10n/bn_BD/files.po
l10n/ca/files.po
l10n/ca/files_encryption.po
l10n/cs_CZ/core.po
l10n/cs_CZ/files.po
l10n/da/files.po
l10n/da/settings.po
l10n/de/core.po
l10n/de/files.po
l10n/de/files_encryption.po
l10n/de/files_external.po
l10n/de/files_sharing.po
l10n/de/files_trashbin.po
l10n/de/files_versions.po
l10n/de/lib.po
l10n/de/settings.po
l10n/de/user_ldap.po
l10n/de_DE/files.po
l10n/de_DE/files_encryption.po
l10n/de_DE/files_external.po
l10n/de_DE/files_sharing.po
l10n/de_DE/files_trashbin.po
l10n/de_DE/lib.po
l10n/de_DE/settings.po
l10n/de_DE/user_ldap.po
l10n/el/files.po
l10n/eo/files.po
l10n/es/files.po
l10n/es/lib.po
l10n/es/settings.po
l10n/es_AR/files.po
l10n/eu/files.po
l10n/fa/files.po
l10n/fi/files.po
l10n/fi_FI/files.po
l10n/fr/core.po
l10n/fr/files.po
l10n/gl/files.po
l10n/gl/settings.po
l10n/he/core.po
l10n/he/files.po
l10n/he/user_ldap.po
l10n/hi/files.po
l10n/hr/files.po
l10n/hu_HU/core.po
l10n/hu_HU/files.po
l10n/hu_HU/files_external.po
l10n/hu_HU/settings.po
l10n/hy/files.po
l10n/ia/core.po
l10n/ia/files.po
l10n/ia/files_trashbin.po
l10n/ia/settings.po
l10n/id/files.po
l10n/is/files.po
l10n/it/files.po
l10n/ja_JP/files.po
l10n/ja_JP/user_ldap.po
l10n/ka/files.po
l10n/ka_GE/files.po
l10n/kn/files.po
l10n/ko/files.po
l10n/ko/files_trashbin.po
l10n/ko/settings.po
l10n/ku_IQ/files.po
l10n/lb/files.po
l10n/lt_LT/core.po
l10n/lt_LT/files.po
l10n/lv/files.po
l10n/mk/files.po
l10n/ms_MY/files.po
l10n/my_MM/files.po
l10n/nb_NO/files.po
l10n/ne/files.po
l10n/nl/core.po
l10n/nl/files.po
l10n/nn_NO/files.po
l10n/oc/files.po
l10n/pl/files.po
l10n/pl_PL/files.po
l10n/pt_BR/files.po
l10n/pt_PT/core.po
l10n/pt_PT/files.po
l10n/pt_PT/files_external.po
l10n/pt_PT/settings.po
l10n/ro/files.po
l10n/ru/core.po
l10n/ru/files.po
l10n/si_LK/files.po
l10n/sk/files.po
l10n/sk_SK/core.po
l10n/sk_SK/files.po
l10n/sl/core.po
l10n/sl/files.po
l10n/sq/files.po
l10n/sr/files.po
l10n/sr@latin/files.po
l10n/sv/files.po
l10n/sw_KE/files.po
l10n/ta_LK/files.po
l10n/te/files.po
l10n/th_TH/files.po
l10n/tr/core.po
l10n/tr/files.po
l10n/tr/lib.po
l10n/tr/settings.po
l10n/tr/user_ldap.po
l10n/uk/files.po
l10n/ur_PK/files.po
l10n/vi/core.po
l10n/vi/files.po
l10n/vi/files_external.po
l10n/zh_CN.GB2312/files.po
l10n/zh_CN/core.po
l10n/zh_CN/files.po
l10n/zh_CN/settings.po
l10n/zh_HK/files.po
l10n/zh_TW/core.po
l10n/zh_TW/files.po
l10n/zh_TW/files_versions.po
l10n/zh_TW/settings.po
l10n/zh_TW/user_ldap.po
lib/base.php
lib/files/filesystem.php
lib/files/view.php
lib/public/share.php
settings/l10n/es.php
settings/l10n/pt_PT.php
settings/l10n/tr.php
settings/l10n/zh_CN.php
settings/personal.php
2013-05-15 10:18:25 +02:00
Florin Peter
226aec8d56
Merge branch 'master' into files_encryption
2013-05-15 03:22:06 +02:00
Florin Peter
7461e9c2b5
improved tests and added new tests for file rename and move
2013-05-15 02:38:08 +02:00
Florin Peter
499fe6ca8e
disabled FileProxy in Keymanager::getPrivateKey
2013-05-15 02:36:23 +02:00
Florin Peter
ddedf20106
prevent of infinite loop with FileProxy
2013-05-15 02:34:36 +02:00
Jenkins for ownCloud
6a788d1a54
[tx-robot] updated from transifex
2013-05-15 02:02:45 +02:00
Florin Peter
8776000754
fix for move file to an empty folder
2013-05-14 23:19:16 +02:00
Florin Peter
0a7aa6e8cd
fix for Allowed memory size of xx bytes exhausted while reading big files
2013-05-14 22:32:39 +02:00
Thomas Müller
fdef2a373a
Merge pull request #2821 from owncloud/fix-2159-rename-to-shared
...
fix allowed rename of folder in root directory to reserved name "Shared"
2013-05-14 13:13:16 -07:00
Florin Peter
84c56a5d56
fix for zero size files
2013-05-14 21:29:24 +02:00
Björn Schießle
96ff19a703
fix history template, print_unescaped() needs to include closing tags
2013-05-14 21:22:30 +02:00
Florin Peter
517105660d
fix for public link share
2013-05-14 20:11:07 +02:00
Raghu Nayyar
418503a4ad
Merge pull request #3338 from owncloud/button_color_fix
...
Keeping Font Colors Consistant on the headers.
2013-05-14 09:52:54 -07:00
Morris Jobke
784f117ec2
Merge pull request #3330 from owncloud/preselect_filename_on_rename
...
peselect filename without extension on rename
2013-05-14 06:16:30 -07:00
Morris Jobke
0d8fa2eb98
[files] add private declaration of $view
2013-05-14 12:49:23 +02:00
raghunayyar
18618c75aa
color change to crumb elements as well.
2013-05-14 11:07:12 +05:30
Florin Peter
81ae4cb5d0
added test for public shared file via link
2013-05-14 00:00:20 +02:00
Florin Peter
a4e9e2fc79
added post_deleteUser hook for cleanup public key
2013-05-13 22:49:27 +02:00
Florin Peter
b2d021b2a5
added post_createUser hook
2013-05-13 22:34:11 +02:00
Florin Peter
61ed347d26
added handling for public file access via files_sharing link
2013-05-13 21:24:59 +02:00
Florin Peter
d92f6b887d
removed var_dump
2013-05-13 21:22:59 +02:00
raghunayyar
6d95d130e4
Keeping Font Colors Consistant on the headers.
2013-05-13 23:12:05 +05:30
Björn Schießle
aa3eb6bb5b
don't handle public share keys in lib/public/share.php but in apps/files_encryption/lib/util.php instead
2013-05-13 17:40:57 +02:00
Björn Schießle
517efdf952
don't create a recovery user, only generate recovery key similar to the public link share key
2013-05-13 17:26:21 +02:00
Jörn Friedrich Dreyer
591b383f2d
peselect filename without extension on rename
2013-05-13 15:54:45 +02:00
Björn Schießle
2f4ba9d1e8
if file was shared to user than userIds is just the users Id
2013-05-13 15:45:30 +02:00
Björn Schießle
d1e2e47592
generate random key name for share key to avoid name conflicts
2013-05-13 15:15:35 +02:00
Björn Schießle
a6ef25ba08
use preShare hook only to check if all pub keys are available and the postShare hook to finaly update the shareKeys if the file was shared successfully
2013-05-13 14:28:45 +02:00
Arthur Schiwon
beaa10b823
Merge branch 'master' into ldap_configurable_username_n_uuid
2013-05-13 12:41:22 +02:00
Björn Schießle
0ef8590773
Merge branch 'master' into update_etags_on_restore
2013-05-13 10:48:06 +02:00
Jenkins for ownCloud
e8c154f341
[tx-robot] updated from transifex
2013-05-13 02:10:20 +02:00
Morris Jobke
e2bd32323d
[files] fix mock creation and remove hardcoded 'require' statement
2013-05-12 13:02:01 +02:00
Morris Jobke
b777c0fd75
[files] rename lib to "App"
2013-05-12 11:47:22 +02:00
Morris Jobke
b32c30b6d0
[files] ownCloud typo
2013-05-12 11:47:22 +02:00
Morris Jobke
7e23e97676
[files] rename test class and add rename test
2013-05-12 11:47:22 +02:00
Morris Jobke
d4ba9cf338
[files] remove realpath in test
2013-05-12 11:47:22 +02:00
Morris Jobke
bb5554de7f
[files] rename tests
2013-05-12 11:47:22 +02:00
Morris Jobke
b9f426b1d7
[files] remove normalizePath on rename and dependency injection
2013-05-12 11:47:22 +02:00
Morris Jobke
324c423548
[files] kill stripslashes
2013-05-12 11:47:22 +02:00
Morris Jobke
418e878ba8
[files] fix typos
2013-05-12 11:47:22 +02:00
Morris Jobke
1020d5c16c
[files] refactoring
2013-05-12 11:47:22 +02:00
Morris Jobke
33b31931bd
string comparision
2013-05-12 11:47:22 +02:00
Morris Jobke
b393c91a96
wrong root dir name
2013-05-12 11:47:22 +02:00
Morris Jobke
a878bd9923
fix allowed rename of folder in root directory to reserved name "Shared"
...
refs #2159
2013-05-12 11:47:22 +02:00
Jenkins for ownCloud
74f92d0c7f
[tx-robot] updated from transifex
2013-05-12 02:05:29 +02:00
Florin Peter
8e004cc3e1
added handling for sharing with link
...
NOTE: only encryption work atm
2013-05-11 01:03:43 +02:00
Florin Peter
33e0dfeecb
sharing with group should work now
2013-05-11 00:25:32 +02:00
Florin Peter
e88595638c
fix for webdav
2013-05-11 00:23:30 +02:00
Björn Schießle
cc433d47cb
touch() needs to be performed relative to user/files otherwise ownCloud doesn't execute the hooks which means that etags aren't updated properly
2013-05-10 12:05:11 +02:00
Bastien Ho
bb640df06e
duplicate verification
2013-05-10 11:16:18 +02:00
Bastien Ho
6082a09e62
Fix inexisting trashbin's sub-folders
2013-05-10 11:12:42 +02:00
Florin Peter
3eae26143f
added test for re-share folder
2013-05-10 01:00:24 +02:00
Florin Peter
15845bf0bf
fix for autotest.sh
2013-05-09 23:22:46 +02:00
Florin Peter
18a821b1e3
added helper
2013-05-09 23:22:22 +02:00
Florin Peter
de855ac31b
improved tests and include helper
2013-05-09 19:37:26 +02:00
Florin Peter
e25aa78caf
added helper class and moved hook registration to it
2013-05-09 19:36:18 +02:00
Sam Tuke
163fe64016
Fixes to code formatting and indentation
2013-05-09 18:24:07 +02:00
Sam Tuke
92e28839ff
Improvements to code formatting & indentation
2013-05-09 18:16:59 +02:00
Sam Tuke
3003dd46d1
Implemented initial recoveryAdmin functionality in crypto file proxy
2013-05-09 18:09:20 +02:00
Sam Tuke
101e037529
Fixed bugs with pre_share hook usage
...
Made sure new user being shared to is added to array of sharing users
2013-05-09 14:43:06 +02:00
Björn Schießle
bda8187f3b
rename a file if it gets restored so that it no longer exists as a version. Otherwise it can happen that the expire() function removes all other versions so that we end up with only one version which is exactly the same as the original file
2013-05-08 23:00:13 +02:00
Björn Schießle
b9134dcd6a
touch file relative to users file folder, otherwise the hooks will be ignored
2013-05-08 22:59:49 +02:00
Arthur Schiwon
d69579f773
LDAP: fix display of numerical display names
2013-05-08 17:54:38 +02:00
Arthur Schiwon
796ee8c4c0
LDAP: Implement clear mappings functionality
2013-05-08 17:47:07 +02:00
Sam Tuke
28866de44b
Added pre_share hook
...
Switched it for post_share hook in encryption hooks
Stop a file from being shared if the encryption procedure fails for any users
2013-05-08 16:22:08 +02:00
Arthur Schiwon
3f1717d3d5
LDAP: implement UUID and internal username override
2013-05-08 14:56:52 +02:00
Arthur Schiwon
c9b3da5bbc
LDAP: better variable name
2013-05-08 14:55:56 +02:00
Arthur Schiwon
bc23010670
LDAP: implement r+w for new settings
2013-05-08 14:05:08 +02:00
Arthur Schiwon
c18158906c
LDAP: add settings for UUID override
2013-05-08 13:57:21 +02:00
Florin Peter
fdc49e7acb
added test for share folder
2013-05-07 22:56:59 +02:00
Florin Peter
33fc830dd3
added test for re-share
2013-05-07 22:22:05 +02:00
Bart Visscher
175633d380
Merge pull request #3050 from owncloud/===_and_!==_in_user_ldap-app
...
Use === and !== in user_ldap app
2013-05-07 12:45:43 -07:00
Arthur Schiwon
498eae49b1
LDAP: prepare settings for internal username attribute and clearing user mappings
2013-05-07 19:31:51 +02:00
icewind1991
5b61c5d478
Merge pull request #3044 from owncloud/backgroundwatcher
...
Add a background job to watch for external filesystem changes
2013-05-07 10:00:00 -07:00
Arthur Schiwon
68ecee9771
LDAP: Coypright info
2013-05-07 18:23:49 +02:00
Sam Tuke
763c8f78ed
Made code formatting of new methods more consistent
2013-05-07 17:16:16 +02:00
Sam Tuke
4b53f72d0d
Added facility to manually encrypt all files from personal settings
...
Added success/fail feedback to personal settings functions
Improved look/layout of personal settings page
Fixed misplaced plain text in ajax scripts
2013-05-07 16:17:38 +02:00
Florin Peter
b535964006
test for share is now able to run with autotest.sh
2013-05-07 13:43:34 +02:00
Florin Peter
8b54553872
fix for wrong file infos
2013-05-07 13:42:49 +02:00
Florin Peter
a9649713d3
fix empty path
2013-05-07 13:42:08 +02:00
Morris Jobke
deb0885e46
Merge pull request #3246 from owncloud/newfile-mimetype
...
Files: set the proper mimetype when creating a new text file
2013-05-07 01:53:43 -07:00
Florin Peter
8fcef41143
added test for share
2013-05-07 09:49:14 +02:00
Florin Peter
fe6d12ddec
fix file info put on stream
2013-05-06 21:15:25 +02:00
Robin Appelman
3de40f7cfb
Files: set the proper mimetype when creating a new text file
2013-05-06 17:55:22 +02:00
Lukas Reschke
db1e6b5f3b
Use $dir instead of $fullpath
2013-05-06 14:28:01 +03:00
Lukas Reschke
b13b19c58b
Use the internal ownCloud view
2013-05-06 13:43:23 +03:00
Arthur Schiwon
d659d8e193
LDAP: do not reset UUID attribute setting when guid is detected
2013-05-06 10:17:52 +02:00
Florin Peter
5610429a02
handling for re-share and re-unshare should work now
2013-05-05 23:41:42 +02:00
Sam Tuke
c8946ea608
Added support for user-specified password for adminRecovery account in admin settings page
...
Made encryptAll() (file migration for unencrypted + legacy encrypted files) run only on first login for each user (status stored in DB)
Made recoveryAdmin user member of 'admin' user group automatically
Set recoveryadmin settings to only display on user settings if enabled by an admin
Updated encryption db xml schema
2013-05-04 16:14:38 +02:00
Florin Peter
9605d14a17
fixed re-share problems
2013-05-04 03:37:22 +02:00
Jenkins for ownCloud
a876240b32
[tx-robot] updated from transifex
2013-05-04 02:00:54 +02:00
Björn Schießle
d649f77898
make sure to find the correct path for shared files
2013-05-03 17:14:43 +02:00
Björn Schießle
050258f003
remove encryption keys if a file gets deleted permanently
2013-05-03 16:33:18 +02:00
Björn Schießle
8a1223181b
disable proxys before copying files to the trash bin
2013-05-03 15:18:05 +02:00
Arthur Schiwon
1e2b872160
LDAP: cachekey in set method needs to match with that one from get
2013-05-03 15:13:37 +02:00
Bart Visscher
e0f6d159d6
Merge pull request #3229 from owncloud/fix_3210
...
LDAP: remove restriction from group names to be in line with core behavi...
2013-05-03 06:04:24 -07:00
Bart Visscher
a541b80592
Merge pull request #3222 from owncloud/fix-3218
...
Fix retrieving of mount points for shared storage, fix #3218
2013-05-03 06:02:33 -07:00
Arthur Schiwon
22a8e7ad55
LDAP: remove restriction from group names to be in line with core behaviour again
2013-05-03 14:11:06 +02:00
Björn Schießle
a2516e549b
get original path in case of shared files when restoring file from trash bin
2013-05-03 14:03:42 +02:00
Björn Schießle
996a557475
get original path in case of shared files
2013-05-03 13:00:04 +02:00
Jenkins for ownCloud
4f6565d8e7
[tx-robot] updated from transifex
2013-05-03 02:05:10 +02:00
Morris Jobke
a204a46d50
Merge pull request #3212 from owncloud/stop-links
...
Don't display shared links if disabled
2013-05-02 15:29:00 -07:00
Michael Gapczynski
7039421efc
Fix retrieving of mount points for shared storage, fix #3218
2013-05-02 17:47:11 -04:00
Frank Karlitschek
8a5e88b21c
Merge pull request #3211 from owncloud/fix-2816
...
Fix #2816 renaming shared files
2013-05-02 00:54:09 -07:00
Michael Gapczynski
274bf3c6bd
Don't display shared links if disabled
2013-05-01 20:39:02 -04:00
Michael Gapczynski
04b7a9902d
Fix #2816 renaming shared files
2013-05-01 20:29:07 -04:00
Jenkins for ownCloud
ee53e7b3d2
[tx-robot] updated from transifex
2013-05-02 02:19:04 +02:00
Michael Gapczynski
657ff34c6c
Merge pull request #3147 from owncloud/storage-mkdir-root
...
Dont task external storages with creating their own root
2013-05-01 16:35:44 -07:00
Sam Tuke
ba29147e34
Fixed recoveryadmin settings in user and admin settings pages (js, templates, ajax)
...
Renamed recovery methods in Util{} for clarity
Added note about bug causing slow page load and redundant keypair generation
recoveryAdmin functionality not yet complete
2013-05-01 19:21:01 +02:00
Frank Karlitschek
db49b0aff8
Merge pull request #3202 from owncloud/swift_id
...
Set storage id for openstack swift backend
2013-05-01 05:28:37 -07:00
Florin Peter
d3db4ee103
fixed re-share problems
2013-05-01 11:04:40 +02:00
Florin Peter
3579ba1e41
Merge branch 'master' into files_encryption
...
Conflicts:
apps/user_ldap/l10n/nn_NO.php
core/l10n/es.php
core/l10n/et_EE.php
core/l10n/ja_JP.php
core/l10n/nn_NO.php
l10n/ca/core.po
l10n/ca/files_external.po
l10n/ca/settings.po
l10n/cy_GB/core.po
l10n/cy_GB/files.po
l10n/cy_GB/files_encryption.po
l10n/cy_GB/files_external.po
l10n/cy_GB/files_sharing.po
l10n/cy_GB/files_trashbin.po
l10n/cy_GB/lib.po
l10n/cy_GB/settings.po
l10n/de_DE/core.po
l10n/es/core.po
l10n/et_EE/core.po
l10n/et_EE/files.po
l10n/et_EE/settings.po
l10n/et_EE/user_ldap.po
l10n/gl/core.po
l10n/it/core.po
l10n/ja_JP/core.po
l10n/ja_JP/settings.po
l10n/nn_NO/core.po
l10n/nn_NO/user_ldap.po
l10n/pt_BR/core.po
l10n/templates/core.pot
l10n/templates/files.pot
l10n/templates/files_encryption.pot
l10n/templates/files_external.pot
l10n/templates/files_sharing.pot
l10n/templates/files_trashbin.pot
l10n/templates/files_versions.pot
l10n/templates/lib.pot
l10n/templates/settings.pot
l10n/templates/user_ldap.pot
l10n/templates/user_webdavauth.pot
l10n/zh_TW/files_sharing.po
settings/l10n/et_EE.php
2013-05-01 09:31:26 +02:00
Jenkins for ownCloud
6163a85668
[tx-robot] updated from transifex
2013-05-01 02:02:59 +02:00
Florin Peter
06a5cf70f7
fix duplicate login behavior if user not setup
2013-05-01 02:01:16 +02:00
Florin Peter
9f8f052f0d
merged files_trashbin
2013-05-01 01:52:06 +02:00
Florin Peter
04b0843bb4
fixed some tests
2013-05-01 01:43:56 +02:00
Florin Peter
3c100af132
revert changes to fbbc76f281 because master is very unstable right now
2013-05-01 01:38:06 +02:00
Robin Appelman
4c980b1a14
Set storage id for openstack swift backend
2013-05-01 00:24:34 +02:00
Florin Peter
5deba29bdf
fixed public-keys mount point error
2013-05-01 00:09:55 +02:00
Florin Peter
b08179d406
fixed tests after merge against master
2013-04-30 23:58:53 +02:00
Florin Peter
b2da07fe95
Merge branch 'master' into files_encryption to get the latest files_trashbin app
...
Conflicts:
apps/files/l10n/bn_BD.php
apps/files/l10n/da.php
apps/files/l10n/de.php
apps/files/l10n/de_DE.php
apps/files/l10n/fa.php
apps/files/l10n/fi_FI.php
apps/files/l10n/hr.php
apps/files/l10n/ms_MY.php
apps/files/l10n/ro.php
apps/files/l10n/si_LK.php
apps/files/l10n/sl.php
apps/files/l10n/ta_LK.php
apps/files_external/l10n/de_DE.php
apps/files_external/l10n/et_EE.php
apps/user_ldap/l10n/tr.php
core/l10n/bg_BG.php
l10n/af_ZA/files.po
l10n/af_ZA/files_external.po
l10n/ar/core.po
l10n/ar/files.po
l10n/ar/files_external.po
l10n/be/files.po
l10n/be/files_external.po
l10n/bg_BG/core.po
l10n/bg_BG/files.po
l10n/bg_BG/files_external.po
l10n/bg_BG/files_trashbin.po
l10n/bg_BG/files_versions.po
l10n/bg_BG/settings.po
l10n/bn_BD/core.po
l10n/bn_BD/files.po
l10n/bn_BD/files_external.po
l10n/ca/core.po
l10n/ca/files.po
l10n/ca/files_external.po
l10n/cs_CZ/core.po
l10n/cs_CZ/files.po
l10n/cs_CZ/files_external.po
l10n/cs_CZ/lib.po
l10n/cy_GB/core.po
l10n/cy_GB/files.po
l10n/cy_GB/files_external.po
l10n/cy_GB/settings.po
l10n/da/core.po
l10n/da/files.po
l10n/da/files_external.po
l10n/de/core.po
l10n/de/files.po
l10n/de/files_external.po
l10n/de_DE/core.po
l10n/de_DE/files.po
l10n/de_DE/files_external.po
l10n/el/core.po
l10n/el/files.po
l10n/el/files_external.po
l10n/eo/core.po
l10n/eo/files.po
l10n/eo/files_external.po
l10n/es/core.po
l10n/es/files.po
l10n/es/files_external.po
l10n/es_AR/core.po
l10n/es_AR/files.po
l10n/es_AR/files_external.po
l10n/et_EE/core.po
l10n/et_EE/files.po
l10n/et_EE/files_external.po
l10n/eu/core.po
l10n/eu/files.po
l10n/eu/files_external.po
l10n/fa/core.po
l10n/fa/files.po
l10n/fa/files_external.po
l10n/fi/files.po
l10n/fi_FI/core.po
l10n/fi_FI/files.po
l10n/fi_FI/files_external.po
l10n/fr/core.po
l10n/fr/files.po
l10n/fr/files_external.po
l10n/gl/core.po
l10n/gl/files.po
l10n/gl/files_external.po
l10n/he/core.po
l10n/he/files.po
l10n/he/files_external.po
l10n/hi/files.po
l10n/hi/files_external.po
l10n/hr/core.po
l10n/hr/files.po
l10n/hr/files_external.po
l10n/hu_HU/core.po
l10n/hu_HU/files.po
l10n/hu_HU/files_external.po
l10n/hy/files.po
l10n/hy/files_external.po
l10n/ia/core.po
l10n/ia/files.po
l10n/ia/files_external.po
l10n/id/core.po
l10n/id/files.po
l10n/id/files_external.po
l10n/is/core.po
l10n/is/files.po
l10n/is/files_external.po
l10n/it/core.po
l10n/it/files.po
l10n/it/files_external.po
l10n/ja_JP/core.po
l10n/ja_JP/files.po
l10n/ja_JP/files_external.po
l10n/ka/files.po
l10n/ka/files_external.po
l10n/ka_GE/core.po
l10n/ka_GE/files.po
l10n/ka_GE/files_external.po
l10n/kn/files.po
l10n/kn/files_external.po
l10n/ko/core.po
l10n/ko/files.po
l10n/ko/files_external.po
l10n/ku_IQ/files.po
l10n/ku_IQ/files_external.po
l10n/lb/core.po
l10n/lb/files.po
l10n/lb/files_external.po
l10n/lt_LT/core.po
l10n/lt_LT/files.po
l10n/lt_LT/files_external.po
l10n/lv/core.po
l10n/lv/files.po
l10n/lv/files_external.po
l10n/mk/core.po
l10n/mk/files.po
l10n/mk/files_external.po
l10n/ms_MY/core.po
l10n/ms_MY/files.po
l10n/ms_MY/files_external.po
l10n/my_MM/files.po
l10n/my_MM/files_external.po
l10n/nb_NO/core.po
l10n/nb_NO/files.po
l10n/nb_NO/files_external.po
l10n/ne/files.po
l10n/ne/files_external.po
l10n/nl/core.po
l10n/nl/files.po
l10n/nl/files_external.po
l10n/nn_NO/files.po
l10n/nn_NO/files_external.po
l10n/oc/core.po
l10n/oc/files.po
l10n/oc/files_external.po
l10n/pl/core.po
l10n/pl/files.po
l10n/pl/files_external.po
l10n/pl_PL/files.po
l10n/pt_BR/core.po
l10n/pt_BR/files.po
l10n/pt_BR/files_external.po
l10n/pt_PT/core.po
l10n/pt_PT/files.po
l10n/pt_PT/files_external.po
l10n/ro/core.po
l10n/ro/files.po
l10n/ro/files_external.po
l10n/ru/core.po
l10n/ru/files.po
l10n/ru/files_external.po
l10n/ru_RU/core.po
l10n/ru_RU/files.po
l10n/si_LK/core.po
l10n/si_LK/files.po
l10n/si_LK/files_external.po
l10n/sk/files.po
l10n/sk/files_external.po
l10n/sk_SK/core.po
l10n/sk_SK/files.po
l10n/sk_SK/files_external.po
l10n/sl/core.po
l10n/sl/files.po
l10n/sl/files_external.po
l10n/sq/core.po
l10n/sq/files.po
l10n/sq/files_external.po
l10n/sr/core.po
l10n/sr/files.po
l10n/sr/files_external.po
l10n/sr@latin/files.po
l10n/sr@latin/files_external.po
l10n/sv/core.po
l10n/sv/files.po
l10n/sv/files_external.po
l10n/sw_KE/files.po
l10n/sw_KE/files_external.po
l10n/ta_LK/core.po
l10n/ta_LK/files.po
l10n/ta_LK/files_external.po
l10n/te/files.po
l10n/te/files_external.po
l10n/templates/core.pot
l10n/templates/files.pot
l10n/templates/files_encryption.pot
l10n/templates/files_external.pot
l10n/templates/files_sharing.pot
l10n/templates/files_trashbin.pot
l10n/templates/files_versions.pot
l10n/templates/lib.pot
l10n/templates/settings.pot
l10n/templates/user_ldap.pot
l10n/templates/user_webdavauth.pot
l10n/th_TH/core.po
l10n/th_TH/files.po
l10n/th_TH/files_external.po
l10n/tr/core.po
l10n/tr/files.po
l10n/tr/files_external.po
l10n/tr/user_ldap.po
l10n/uk/core.po
l10n/uk/files.po
l10n/uk/files_external.po
l10n/ur_PK/files.po
l10n/ur_PK/files_external.po
l10n/vi/core.po
l10n/vi/files.po
l10n/vi/files_external.po
l10n/zh_CN.GB2312/core.po
l10n/zh_CN.GB2312/files.po
l10n/zh_CN.GB2312/files_external.po
l10n/zh_CN/core.po
l10n/zh_CN/files.po
l10n/zh_CN/files_external.po
l10n/zh_HK/core.po
l10n/zh_HK/files.po
l10n/zh_HK/files_external.po
l10n/zh_TW/core.po
l10n/zh_TW/files.po
l10n/zh_TW/files_external.po
lib/base.php
lib/files/mount/mount.php
2013-04-30 20:53:56 +02:00
Florin Peter
fbbc76f281
fix for sharing files
2013-04-30 20:44:42 +02:00
FlorinPeter
4ab3614248
Merge pull request #3156 from owncloud/trashbin_for_encryption_keys_against_master
...
Trashbin for encryption keys now against master
2013-04-30 11:39:21 -07:00
Jenkins for ownCloud
5764bf088e
[tx-robot] updated from transifex
2013-04-30 01:59:18 +02:00
Florin Peter
b1c4464eda
improved key length tests
2013-04-30 01:54:19 +02:00
Florin Peter
27ce7845b4
fixed tests, now tests should work via autotest.sh
...
files_encryption app is now enabled in enable_all.php
2013-04-30 01:35:46 +02:00
Florin Peter
882a747b47
rename folder to tests
2013-04-30 00:34:05 +02:00
Florin Peter
d22795d68b
fixed test for crypt and keymanager
...
disabled encryption file proxy in test/lib/cache/file.php
2013-04-29 23:41:49 +02:00
Florin Peter
c52fe12537
fixed missing parameter
2013-04-29 23:37:08 +02:00
Morris Jobke
cc9933be1c
Merge pull request #3160 from owncloud/remove-onclick
...
Remove onclick
2013-04-29 03:58:44 -07:00
Florin Peter
4ecd62e58d
improvements for test testSymmetricStreamEncryptShortFileContent
...
this runs currently into an infinite loop
2013-04-29 09:12:43 +02:00
Jenkins for ownCloud
2b36ad292d
[tx-robot] updated from transifex
2013-04-29 02:00:26 +02:00
Florin Peter
4a63faf64b
speed improvement
2013-04-29 01:43:59 +02:00
Lukas Reschke
3a6e39b990
It's a class
2013-04-28 23:28:41 +02:00
Lukas Reschke
003e6adb3f
Remove uneeded onclick handler
2013-04-28 23:26:07 +02:00
Lukas Reschke
6cf6103ed2
Move onclick handler
2013-04-28 23:25:58 +02:00
Florin Peter
7a3ecd0429
delete and restore of versions and share-keys now works
...
fix restore of the same file name
2013-04-28 20:48:30 +02:00
Florin Peter
5e11948598
added handling for share-keys
...
this works only with latest files_encryption branch up from 813641e6e8
2013-04-28 20:48:30 +02:00
Florin Peter
26e5ef193d
restore fixed
2013-04-28 20:48:30 +02:00
Florin Peter
228c501515
fixed some problems and broken code
2013-04-28 20:48:30 +02:00
Björn Schießle
680ba4bea1
restore encryption keys from trash bin (development snapshot)
2013-04-28 20:48:29 +02:00
Björn Schießle
cb65b7ca9d
move encryption keys to trash bin
2013-04-28 20:45:51 +02:00
Jenkins for ownCloud
901e0c598d
[tx-robot] updated from transifex
2013-04-28 02:01:38 +02:00
Florin Peter
f9760f6521
improved file size
2013-04-27 23:34:25 +02:00
Florin Peter
7f1f0464a8
added self healing if file get remove from file cache
2013-04-27 23:02:42 +02:00
Florin Peter
770aebfb9e
check if file exists before fixing file size
2013-04-27 20:22:38 +02:00
Florin Peter
ba080e0d2e
removed preRename and moved postRename to hooks.php
...
added postWrite and postTouch to fix file size and sharing keys
2013-04-27 20:21:46 +02:00
Florin Peter
05523b76c0
fix reusing keys
...
fix webdav part files
2013-04-27 20:18:57 +02:00
Florin Peter
d40ffc5aac
added filesystem post rename hook
2013-04-27 20:18:05 +02:00
Jenkins for ownCloud
7b2c64236c
[tx-robot] updated from transifex
2013-04-27 02:24:29 +02:00
Florin Peter
813641e6e8
improved file size
...
created new method fixFileSize in Util so it can be used with files_trashbin
2013-04-27 00:05:20 +02:00
Robin Appelman
c05195a46d
Dont task external storages with creating their own root
2013-04-26 17:40:31 +02:00
icewind1991
5474fea1f6
Merge pull request #3136 from owncloud/mount-cleanup
...
Separation of mount management
2013-04-26 06:55:21 -07:00
Jenkins for ownCloud
7ea2f785f4
[tx-robot] updated from transifex
2013-04-26 01:58:21 +02:00
Robin Appelman
809b5f81f6
Further seperation of mount management logic
2013-04-26 00:01:36 +02:00
Florin Peter
d017bbb065
fix share for renamed or moved files
2013-04-25 23:24:07 +02:00
Florin Peter
8ee7959092
implement postRename
...
@samtuke no need anymore for fixPartialFilePath this is now handled by rename
share-keys are now handled properly
webdav .part files are handled properly
2013-04-25 22:49:47 +02:00
Florin Peter
328dea93c7
webdav fix for file chunking
...
upload with big files should now work
@samtuke and @schiesbn we need a solution for the cache files created by webdav
2013-04-25 20:23:54 +02:00
Florin Peter
11d0eef8cc
fixed webdav errors, now webdav up - and downloads are full working
2013-04-25 15:21:11 +02:00
Florin Peter
fac288a4ad
added unencrypted file size to file cache
...
improved file size calculation and speeds
2013-04-25 15:20:06 +02:00
Florin Peter
170d09203f
fixed file_proxy handling
2013-04-25 14:56:11 +02:00
Jenkins for ownCloud
a0df5903b0
[tx-robot] updated from transifex
2013-04-25 01:55:56 +02:00
Lukas Reschke
1ee224d8cb
Merge pull request #3108 from owncloud/fileactions-order
...
Files: fix the order fileactions are computed for a file
2013-04-24 10:55:38 -07:00
Jenkins for ownCloud
62b9c88bb9
[tx-robot] updated from transifex
2013-04-24 18:31:36 +02:00
Jenkins for ownCloud
88fd3b088d
[tx-robot] updated from transifex
2013-04-24 17:46:20 +02:00
Morris Jobke
637dd685db
fix wrong shared icon description
...
fix #2928
translation of string "Shared" has to be marked as located in "files" for the translation extractor
2013-04-24 16:13:17 +02:00
Robin Appelman
ab7fcebeb3
Files: fix the order fileactions are computed for a file
2013-04-24 15:26:36 +02:00
Jenkins for ownCloud
a7b4469b2e
[tx-robot] updated from transifex
2013-04-24 02:01:20 +02:00
Florin Peter
f8819f54c2
Merge branch 'files_encryption' of https://github.com/owncloud/core into files_encryption
2013-04-23 19:09:01 +02:00
Florin Peter
baa6fd639f
improved file size handling
2013-04-23 19:08:52 +02:00
Frank Karlitschek
99cb37a6d1
Merge pull request #3092 from guruz/external_storage_check_for_curl
...
External Storage: Check for curl in PHP
2013-04-23 09:48:04 -07:00
Bart Visscher
c357f7b8cd
Merge pull request #3082 from owncloud/ldap_confcache_opt
...
LDAP: reset user/group-config association only after exists-check, may p...
2013-04-23 09:44:38 -07:00
Sam Tuke
b7d8da87d0
Development snapshot
...
working on stream handling (large files) in Util->encryptAll()
2013-04-23 18:41:01 +02:00
Sam Tuke
c6bfc7315b
Stream writing improved: working with dolphin + kate, gedit & nautilus give errors, suspect those issues are clientside
...
.part file paths fixed in stream{}
2013-04-23 17:36:35 +02:00
Sam Tuke
4aa80d02be
Merge branch 'master' into files_encryption
2013-04-23 14:13:40 +02:00
Sam Tuke
a1d241783e
Updated buglist
2013-04-23 14:12:28 +02:00
Markus Goetz
6141b24d96
External Storage: Check for curl in PHP
...
If no curl is found, disable the storage that needs it.
2013-04-23 12:36:30 +02:00
Jenkins for ownCloud
05ab9d2de7
[tx-robot] updated from transifex
2013-04-23 02:00:31 +02:00
Arthur Schiwon
b066c0ff44
LDAP: reset user/group-config association only after exists-check, may performance in some cases
2013-04-23 01:00:27 +02:00
Robin Appelman
1507d1ef26
Files: Fix XSS when creating dropshadow
2013-04-22 21:55:54 +02:00
Florin Peter
8ab9433fdf
fix wrong file path in proxy
2013-04-22 18:54:23 +02:00
Florin Peter
2827004634
Merge branch 'files_encryption' of https://github.com/owncloud/core into files_encryption
2013-04-22 18:51:11 +02:00
Florin Peter
37c7205941
fix wrong file path in util
2013-04-22 18:50:59 +02:00
Björn Schießle
a4364a93d0
delete all share keys if a file gets deleted
2013-04-22 15:29:58 +02:00
Björn Schießle
b5cb5dab51
fix encryption to owncloud user for public link shares
2013-04-22 14:30:10 +02:00
Björn Schießle
b57478fa27
fix comment, remove unused variable
2013-04-22 14:14:28 +02:00
Björn Schießle
bcb2e87846
check if the item source was shared to me to decide if it is a re-share or not. Re-sharing of encrypted files should work now, we might still need to test some corner cases
2013-04-22 14:13:59 +02:00
Björn Schießle
1705938848
removed some leftover code; use already existing var for path to users file folder
2013-04-22 12:32:38 +02:00
Florin Peter
eade87dc79
Merge branch 'files_encryption' of https://github.com/owncloud/core into files_encryption
2013-04-22 12:32:35 +02:00
Florin Peter
f6ac34afea
improved handling for getSharingUsersArray
2013-04-22 12:25:55 +02:00
Björn Schießle
8a46e809f0
remove util::getPaths(), this function was broken and is replaced my util::getAllFiles(). When unsharing a folder only remove the share key for sub files if the user really no longer have access to the file. Can happen that a sub-file/-folder is shared to a group the user is a member of or explicitly once more to the same user
2013-04-22 12:22:07 +02:00
Björn Schießle
8790ceba25
Merge branch 'files_encryption' of github.com:owncloud/core into files_encryption
2013-04-22 11:59:26 +02:00
Björn Schießle
a2ba3c8a43
fix sharing of folders. First we need to collect all files. Than we need to find all users with access to the file because this can vary from file to file and than we can encrypt it for all recipients
2013-04-22 11:58:39 +02:00
Florin Peter
6b47da10be
improved rename and file size support
...
fix missing user_id on write
2013-04-22 04:40:49 +02:00
Jenkins for ownCloud
f6808617b3
[tx-robot] updated from transifex
2013-04-22 02:00:20 +02:00
Robin Appelman
7948341a86
Rework background job system
2013-04-20 23:27:46 +02:00
kondou
d6b13ccd12
Use !== and === in user_ldap app – Part 2
2013-04-20 22:46:37 +02:00
kondou
b8fe7025da
Use !== and === in user_ldap app – Part 1
2013-04-20 22:46:37 +02:00
Robin Appelman
15dae6198f
Cache: add a backgroundjob to check for external changes to the filesystem
2013-04-20 16:38:03 +02:00
FlorinPeter
9a0b73070c
Merge pull request #2992 from FlorinPeter/files_encryption
...
fix for trashbin
2013-04-20 05:35:29 -07:00
Jenkins for ownCloud
03c7a52bc5
[tx-robot] updated from transifex
2013-04-20 02:02:09 +02:00
Bart Visscher
802a5a331b
Fix displaying spinner on delete
2013-04-19 13:46:11 +02:00
Bart Visscher
a21885953f
No need to strip slashes, json_decode handles that for us
2013-04-19 13:45:40 +02:00
Björn Schießle
12785b93f1
make sure that all share keys get deleted if a file/folder gets unshared from a user/group
2013-04-19 13:17:08 +02:00
Florin Peter
0e1970438b
fixed incorrect filesize, download via web is now possible
...
fixed broken file-info
2013-04-18 22:34:22 +02:00
Björn Schießle
2bd338c49f
getUsersSharingFile() no longer needed, use getSharingUsersArray() instead; fix filterShareReadyUsers() to return the correct results
2013-04-18 20:02:27 +02:00
Björn Schießle
5a7a64df08
Session needs filesystem view as parameter; use getSharingUsersArray(), this function also adds the owner to the list
2013-04-18 20:00:45 +02:00
Björn Schießle
935d039860
necessary changes in util.php after the changes in \OCP\Share::getUsersSharingFile() ( fe58e4b1a6)
2013-04-18 17:53:59 +02:00
Björn Schießle
39c717b24c
some fixes to the keymanager class to identify the file owner and the owner path correctly.
2013-04-18 17:52:27 +02:00
Björn Schießle
1df36e0c88
rename $shareFilePath to $path to avoid confusions, it is not about paths to share files but about general path to files stored in ownCloud
2013-04-18 16:39:00 +02:00
Björn Schießle
40905c8941
fix file sharing, sharing files works now; moved the identification of file owner and the owner path in the keymanager functions so that other functions doesn't have to deal with it
2013-04-18 16:34:23 +02:00
Björn Schießle
7892fddcb9
remove ToDo, every time the file key gets encrypted new share keys are generated and a new encrypted filekey. We always need to use the latest share-keys and encrypted keyfiles
2013-04-18 15:44:57 +02:00
Björn Schießle
bd3024242f
always save key file, the key doesn't change but the encrypted keyfile change always the same way like the share-keys change
2013-04-18 15:42:28 +02:00
Björn Schießle
a646a1169f
return filename relative to users file dir and not relative to data dir
2013-04-18 13:41:21 +02:00
Jenkins for ownCloud
cbd8b792d9
[tx-robot] updated from transifex
2013-04-18 02:09:28 +02:00
Florin Peter
2434739d69
fix for trashbin
2013-04-18 02:03:03 +02:00
Sam Tuke
6dd8c79461
Development snapshot
...
Working on stream{} write
2013-04-17 17:20:37 +02:00
Björn Schießle
ddde1b65db
adapt free space calculation to the way it is done for the trash bin
2013-04-17 10:43:12 +02:00
Björn Schießle
a3999036f7
improved free space calculation if no quota is set, discussed in #2936
2013-04-17 10:42:59 +02:00
Jenkins for ownCloud
37868818ff
[tx-robot] updated from transifex
2013-04-17 02:29:17 +02:00
Sam Tuke
f89a3604aa
Working on stream{} writing
...
Development snapshot
2013-04-16 18:29:22 +02:00
Sam Tuke
770dcbf663
Fixed stream{} reading of encrypted files (stream_read())
2013-04-16 14:53:54 +02:00
Sam Tuke
b4dd6ae36c
Merge pull request #2885 from FlorinPeter/files_encryption
...
fix performance issues
2013-04-16 04:25:59 -07:00
Sam Tuke
f378a7f572
Fixed proxy class handing of read / write files
...
Various work on other classes
2013-04-16 13:22:16 +02:00
Jörn Friedrich Dreyer
606b672a3d
always connect file cache updater hooks first
2013-04-16 13:07:55 +02:00
Björn Schießle
01d203c773
add explenation of the expire function to the apps description
2013-04-16 12:31:33 +02:00
Björn Schießle
032c54273c
write a info message to the log if a file gets removed from the trash bin automatically
2013-04-16 12:31:22 +02:00
Jenkins for ownCloud
d0b3e8aceb
[tx-robot] updated from transifex
2013-04-16 02:17:30 +02:00
Jenkins for ownCloud
e13e4c412f
[tx-robot] updated from transifex
2013-04-15 02:12:43 +02:00
Jenkins for ownCloud
7d68cd4040
[tx-robot] updated from transifex
2013-04-14 02:20:35 +02:00
Jenkins for ownCloud
19afc216cf
[tx-robot] updated from transifex
2013-04-13 02:15:54 +02:00
Björn Schießle
854b920787
fix some more paths
2013-04-12 15:18:19 +02:00
Björn Schießle
02d1f86a53
fix some confusion about paths relative to the files dir and to the data dir
2013-04-12 14:30:02 +02:00
Björn Schießle
f87229ddaf
fix stream wrapper to make initial encryption work
2013-04-12 14:13:38 +02:00
Jenkins for ownCloud
33ee2e2f10
[tx-robot] updated from transifex
2013-04-12 02:11:02 +02:00
Florin Peter
8f0bbdc5cb
fix performance issues
2013-04-11 22:55:48 +02:00
Björn Schießle
1b3b766244
cleanup the trash bin tables in the database after a user was deleted
2013-04-11 14:40:06 +02:00
Björn Schießle
544a46c690
remove used space for versions from db is a user was deleted
2013-04-11 14:39:56 +02:00
Jenkins for ownCloud
b02db643d0
[tx-robot] updated from transifex
2013-04-11 02:10:41 +02:00
Björn Schießle
c3a284569b
make sure that public-keys dir exists
2013-04-10 16:46:02 +02:00
Björn Schießle
4303d6318e
Session expect OC_FilesystemView()
2013-04-10 15:31:19 +02:00
Björn Schießle
fff979a590
add $view as parameter for getFileKey() call
2013-04-10 15:14:44 +02:00
Björn Schießle
98de385b8a
add $view as parameter for session constructor
2013-04-10 15:08:28 +02:00
Björn Schießle
48dabd2c14
size of the trash bin could be incorrect, remove it for all users to enforce a recalculation during next usage.
2013-04-10 10:09:37 +02:00
Björn Schießle
16b0855992
only add filesize to trashbin size if the file was moved to the trash bin successfully
2013-04-10 10:09:22 +02:00
Jenkins for ownCloud
c06bc81c79
[tx-robot] updated from transifex
2013-04-10 02:09:39 +02:00
Sam Tuke
109fe198c3
Added info about filesystem method access conventions
2013-04-09 19:19:27 +02:00
Sam Tuke
400cf5beb3
Fixed naming bug of public owncloud key dir, which caused new keypair to be generated on each pageload
2013-04-09 19:11:38 +02:00
Jenkins for ownCloud
5ef389610f
[tx-robot] updated from transifex
2013-04-09 02:14:02 +02:00
Jenkins for ownCloud
ccde0212b1
[tx-robot] updated from transifex
2013-04-08 02:18:28 +02:00
Bart Visscher
6d6dfffea7
Merge pull request #2279 from owncloud/refactor_upload_js
...
Refactor upload js
2013-04-06 15:44:08 -07:00
Bart Visscher
248e097f3c
Merge pull request #1974 from owncloud/use-rawurlencode
...
OC6- Just use rawurlencode in files list template
2013-04-06 11:55:44 -07:00
Bart Visscher
797b529da7
Merge pull request #2759 from owncloud/fix-2718
...
Set file perms to 0640 of mount.json - fixes #2718
2013-04-06 09:52:22 -07:00
Bart Visscher
46a552fd56
Merge pull request #2738 from Kondou-ger/fix_alert_issues
...
Fixed things in alert-messages
2013-04-06 08:24:43 -07:00
kondou
de2e546617
Translate 'Error' in core
2013-04-06 16:52:55 +02:00
Lukas Reschke
6552996734
Set file perms to 0640 of mount.json - fixes #2718
2013-04-06 13:21:21 +03:00
Jenkins for ownCloud
6798b6dc34
[tx-robot] updated from transifex
2013-04-06 00:05:32 +02:00
root
74b02db337
Fixed things in alert-messages
...
Two parameters for OC.dialogs.alert, otherwise one will be "undefined".
Also fixed missing translation.
2013-04-05 01:56:32 +02:00
Jenkins for ownCloud
c745bfa821
[tx-robot] updated from transifex
2013-04-05 00:22:48 +02:00
Bart Visscher
e824c6cffa
Merge pull request #2611 from owncloud/filename-width
...
Adds a fixed width to the filename to prevent horizontal scroll.
2013-04-04 05:32:38 -07:00
Jenkins for ownCloud
cbece8b12f
[tx-robot] updated from transifex
2013-04-04 00:06:51 +02:00
Bernhard Posselt
40627a05a8
Merge pull request #2694 from owncloud/fix_2690
...
Typo, fixes #2690
2013-04-03 10:23:34 -07:00
Arthur Schiwon
d44b649d2a
Typo, fixes #2690
2013-04-03 17:52:34 +02:00
Jenkins for ownCloud
10e37e1553
[tx-robot] updated from transifex
2013-04-03 00:04:02 +02:00
Jenkins for ownCloud
29d33ff7c2
[tx-robot] updated from transifex
2013-04-02 00:04:27 +02:00
Jan-Christoph Borchardt
f8e48955b9
Merge pull request #2576 from owncloud/fixing-2125-master
...
fixes #2125 - the warning is now displayed with a disabled button
2013-03-31 09:53:07 -07:00
Jenkins for ownCloud
cfd8b911b6
[tx-robot] updated from transifex
2013-03-31 00:03:46 +01:00
Jenkins for ownCloud
5e74ec26a8
[tx-robot] updated from transifex
2013-03-30 00:06:29 +01:00
Sam Tuke
14451bdaf0
Development snapshot;
...
Fixed errors from Hooks::login();
Work on enable/disable recoveryAdmin for lost passwords in settings page (template, ajax, js);
Work on fixing sharing files to users (still broken);
2013-03-29 21:11:29 +01:00
raghunayyar
5dd1f7d764
Using max-width instead of width for filename.
2013-03-30 00:13:47 +05:30
raghunayyar
024b60decc
Adds a fixed width to the filename to prevent horizontal scroll.
2013-03-29 16:26:03 +05:30
Jörn Friedrich Dreyer
7ecbaef16c
use css browser switch instead of deprecated jquery browser detection
2013-03-28 19:13:37 +01:00
Jörn Friedrich Dreyer
dac875eb9c
'#upload' is actually '#uploadprogresswrapper', fix css and js to show cancel button correctly
2013-03-28 18:50:49 +01:00
Sam Tuke
ff6f52d5ec
Merge branch 'master' into files_encryption
...
Conflicts:
apps/files_encryption/hooks/hooks.php
apps/files_encryption/lib/crypt.php
apps/files_encryption/lib/keymanager.php
2013-03-28 18:39:12 +01:00
Sam Tuke
9ecfd07f23
Added ajax scripts for setting pwd recovery preferences
2013-03-28 18:29:18 +01:00
Jörn Friedrich Dreyer
e31d74037a
use local variable to walk DOM only once
2013-03-28 18:20:03 +01:00
Jörn Friedrich Dreyer
868d7b956d
use === to compare empty string ''
2013-03-28 18:20:03 +01:00
Jörn Friedrich Dreyer
831b7ca803
don't update progress bar in ie < 10
2013-03-28 18:20:03 +01:00
Jörn Friedrich Dreyer
c1a944a655
return created table row, use as context in fileupload events
2013-03-28 18:17:18 +01:00
Jörn Friedrich Dreyer
4dd4167f80
refactor files.js, make proper use of fileupload events
2013-03-28 18:17:18 +01:00
Jörn Friedrich Dreyer
0968eb0a65
return original filename to fileupload
2013-03-28 18:03:52 +01:00
Jörn Friedrich Dreyer
df31ee5a90
Merge pull request #2575 from owncloud/fixing-1461-master
...
Fix upload progressbar in IE8 and IE9
2013-03-28 10:01:39 -07:00
Arthur Schiwon
599778b153
Files External: show display names instead of internal user names in Settings UI
2013-03-27 19:07:33 +01:00
Jenkins for ownCloud
0c666cb764
[tx-robot] updated from transifex
2013-03-27 00:11:05 +01:00
Thomas Mueller
586a47b186
fixes #1463 - file size is now displayed correctly in IE8
2013-03-26 21:28:01 +01:00
Björn Schießle
e717f7150e
check for dir in deleteFileKey() and delShareKey(), to always handle all share keys and file keys on delete
2013-03-26 16:52:58 +01:00
Thomas Mueller
cf50e67e1b
prevent to fire delete ajax a second time.
...
Before the click on a single file delete icon fired two different handlers - one of them is for multiple deletion only
2013-03-26 16:27:56 +01:00
Björn Schießle
73157133e8
reuse function provided in util.php
2013-03-26 16:22:26 +01:00
Björn Schießle
6beeb2466f
also delete share keys if a different user than the owner deletes a shared file
2013-03-26 16:17:26 +01:00
Thomas Mueller
3817922c93
fixes #2125 - the warning is now displayed with a disabled button
2013-03-26 15:44:35 +01:00
Björn Schießle
b1d620300e
delete share keys if file gets deleted
2013-03-26 14:22:18 +01:00
Thomas Mueller
e0e5cb73bf
fixes #1461
2013-03-26 14:14:30 +01:00
Björn Schießle
5f233ee814
get the correct paths and owner to access shared files
2013-03-26 12:40:31 +01:00
Björn Schießle
a65d741a3f
move getUidAndFilename() tu util.php
2013-03-26 12:39:55 +01:00
Björn Schießle
890f0142a2
get shared keys from new location
2013-03-26 12:24:04 +01:00
Björn Schießle
5995b6996b
always call stripUserFilesPath(), we need to keep the Shared/ to find the correct owner of the file later
2013-03-26 12:23:28 +01:00
Björn Schießle
f10be4ea17
new file structure for share keys; sub-folder need to be generated each by one (we don't have a recursive mkdir)
2013-03-26 11:58:54 +01:00
Björn Schießle
d121180d46
Merge pull request #2270 from owncloud/fix_json_encoded_pubic_download
...
let public link download handle json encoded file lists [master]
2013-03-26 01:56:47 -07:00
Björn Schießle
c2a49b5c1f
the old path no longer exists after rename, update the parent folder instead
2013-03-25 14:21:06 +01:00
Arthur Schiwon
8b3dd87846
LDAP: fix wrong return value
2013-03-25 12:33:10 +01:00
Björn Schießle
abd48496d2
fix indention
2013-03-25 12:33:03 +01:00
Björn Schießle
102120f105
skip update if the recipient is the same user as the owner, otherwise we run in a infinite loop for group shares
2013-03-25 12:32:56 +01:00
Björn Schießle
5924d1d95c
add backticks around table names
2013-03-25 12:29:13 +01:00
Jenkins for ownCloud
4f6e13e673
[tx-robot] updated from transifex
2013-03-23 00:06:16 +01:00
Jenkins for ownCloud
3b1c7de459
[tx-robot] updated from transifex
2013-03-21 00:04:36 +01:00
Sam Tuke
fd4e59b748
Added method for setting user keyfile recovery preference
...
Fixed method for checking if keyfile recovery is enabled for a user
Added unit test for above 2 methods
Made proxy{} always use sharing
Made proxy{} work regardless of sharing API enabled or not
Implemented proxy-based sharing to admin if user keyfile recovery is enabled
2013-03-20 19:26:59 +01:00
Björn Schießle
b91bcf5f60
Merge pull request #2324 from owncloud/html_video_tag
...
use html video tag to preview videos for public shares
2013-03-20 02:27:53 -07:00
Jenkins for ownCloud
63e3f978ab
[tx-robot] updated from transifex
2013-03-20 00:02:44 +01:00
Sam Tuke
c89fd49870
Improved folder creation code
...
Created stub method for checking user pwd recovery preference from db
Added pwd recovery column to db
Added comments
2013-03-19 19:53:15 +01:00
Arthur Schiwon
aa3973d365
LDAP: user exists check on getHome, otherwise check will be performed with wrong configs on a multi LDAP server setup.
2013-03-19 14:40:36 +01:00
Arthur Schiwon
0f4e02b6fc
LDAP: avoid irritating log output
2013-03-19 14:40:30 +01:00
Arthur Schiwon
50d0f48ee4
LDAP: check whether user exists for before trying to determine displayname
2013-03-19 14:40:23 +01:00
Arthur Schiwon
18fccf6612
LDAP: check first whether group exists in this backend before doing other operations
2013-03-19 14:40:15 +01:00
Arthur Schiwon
504f5f229f
LDAP: remove unnecessary func call, was a leftover from earlier refactor
2013-03-19 14:40:05 +01:00
Arthur Schiwon
f38932fb80
LDAP: specify appid when selecting from appconfig
2013-03-19 14:39:56 +01:00
Jenkins for ownCloud
63ca84e7bc
[tx-robot] updated from transifex
2013-03-19 00:05:52 +01:00
Bernhard Posselt
5b1f857907
Merge pull request #2363 from owncloud/uploadsize
...
Improve behaviour when max upload size is unknown
2013-03-18 08:18:27 -07:00
Björn Schießle
4a1a23ce1b
add some error logs to the trash bin app
2013-03-18 12:08:34 +01:00
Jenkins for ownCloud
2a48aa322d
[tx-robot] updated from transifex
2013-03-18 00:06:55 +01:00
Jenkins for ownCloud
1427af4a22
[tx-robot] updated from transifex
2013-03-16 22:18:26 +01:00
sherbrecher
ec45a8433d
Merge remote-tracking branch 'upstream/master'
...
Conflicts:
apps/files_external/templates/settings.php
2013-03-15 17:50:02 +01:00
Robin Appelman
319e3f162c
Don't block uploads if the max upload size is unknown
2013-03-15 16:40:36 +01:00
Robin Appelman
32b8fd8fb7
Improve handeling of unlimited max upload size
2013-03-15 16:31:35 +01:00
sherbrecher
d2b3a9fb3b
Update settings.php
...
fixed overlap of input controls (root cert import)
see issue: https://github.com/owncloud/apps/issues/767
2013-03-15 15:09:55 +01:00
Björn Schießle
418fb98c40
remove backticks around table names
2013-03-15 12:10:21 +01:00
Björn Schießle
e37e884d7a
add backtick for db queries to prevent postgresql errors
2013-03-15 12:10:07 +01:00
Björn Schießle
23fe98a562
Merge pull request #2336 from eMerzh/fix_trashpg
...
Add backtick for trash app to prevent pg errors
2013-03-15 03:17:54 -07:00
Frank Karlitschek
92a8676350
Merge pull request #2317 from owncloud/create_version_on_upload
...
create new version if the same file is uploaded again over the web interface
2013-03-15 01:18:20 -07:00
Jenkins for ownCloud
0c123ebf9d
[tx-robot] updated from transifex
2013-03-15 00:06:36 +01:00
Brice Maron
1631aa2434
Add backtick for trash app to prevent pg errors
2013-03-15 00:03:37 +01:00
Björn Schießle
285d328ef1
use html video tag to preview videos for public shares
2013-03-14 20:10:21 +01:00
Björn Schießle
f78594c0ae
fix var name
2013-03-14 17:09:48 +01:00
Björn Schießle
93b2ada6f6
fix var name
2013-03-14 17:08:16 +01:00
Björn Schießle
0cf50d63bf
create new version if the same file is uploaded again over the web interface
2013-03-14 16:47:59 +01:00
Jenkins for ownCloud
9a0cb2ccaa
[tx-robot] updated from transifex
2013-03-14 00:06:29 +01:00
Bernhard Posselt
7d748a6b06
Merge pull request #2277 from owncloud/fix_sharing_hooks
...
listen to the pre delete hook in the sharing app [master]
2013-03-13 10:15:57 -07:00
Björn Schießle
c3ba49f384
Merge pull request #2265 from owncloud/no_share_option_for_shared_folder
...
don't add share action to the Shared folder
2013-03-13 08:23:35 -07:00
Björn Schießle
30831b6b55
we need to listen to the pre delete hook, otherwise the file is already gone
2013-03-13 15:39:39 +01:00
Björn Schießle
e5f40ddaae
only prevent shared action for the Shared folder in the root dir
2013-03-13 11:33:20 +01:00
Björn Schießle
f971ce0b66
let public link download handle json encoded file lists
2013-03-13 11:15:17 +01:00
Jenkins for ownCloud
f3a2daaa9d
[tx-robot] updated from transifex
2013-03-13 00:06:21 +01:00
Frank Karlitschek
43d15066f9
Merge pull request #2234 from owncloud/fix_ldap_edirectory
...
LDAP: compatibility with Novell eDirectory UUID
2013-03-12 10:21:49 -07:00
Björn Schießle
b2da2f769a
don't add share action to the Shared folder
2013-03-12 17:28:36 +01:00
Jenkins for ownCloud
569c7ab138
[tx-robot] updated from transifex
2013-03-12 00:14:05 +01:00
Arthur Schiwon
1e07801c95
LDAP: compatibility with Novell eDirectory UUID
2013-03-11 13:30:06 +01:00
Bernhard Posselt
049a4df259
Merge pull request #1786 from owncloud/shared-folder-etags
...
Include etags for the root of the shared folder
2013-03-11 02:38:50 -07:00
Arthur Schiwon
07f88424c8
LDAP: fancy version for release, no code change
2013-03-10 18:34:56 +01:00
Lukas Reschke
3c06020e3e
Merge pull request #2217 from owncloud/mountconfig-location
...
Store the global mount configuration file in the datadir
2013-03-10 00:25:10 -08:00
Robin Appelman
be4806d031
Store the global mount configuration file in the datadir
2013-03-10 02:25:03 +01:00
Tom Needham
dfbf57207d
Merge pull request #1584 from owncloud/ocs_multiple_methods
...
Allow registering of multiple methods on each api route. Add /cloud/capabilities route.
2013-03-09 16:59:13 -08:00
Jenkins for ownCloud
6bdb84ab28
[tx-robot] updated from transifex
2013-03-10 00:06:53 +01:00
Sam Tuke
c1f1fbda08
Fixed stream wrapper bugs
...
Switched encryptAll() to use stream-based instead of file-at-a-time encryption
Development snapshot
2013-03-09 19:18:34 +01:00
Tom Needham
e58dbd46fc
Merge in master
2013-03-09 00:04:33 +00:00
Jenkins for ownCloud
0629ff4dd9
[tx-robot] updated from transifex
2013-03-09 00:06:34 +01:00
Michael Gapczynski
e743386acf
Fix correctFolders and retrieve the correct storage cache
2013-03-08 14:27:30 -05:00
Lukas Reschke
546fb72b25
Merge pull request #2165 from owncloud/fix_2155
...
Offer download of whole shared dir only if it does not exceed zip input ...
2013-03-08 10:31:48 -08:00
Björn Schießle
02e2f7384e
not only files can be reshared but also folders
2013-03-08 17:32:04 +01:00
Michael Gapczynski
20828488bc
Fix share hook for updater
2013-03-08 10:59:22 -05:00
Björn Schießle
2d00d13a5d
use pre_unshare hook, otherwise the share is already removed. Which means that we have no chance to determine which folder has to be updated
2013-03-08 15:13:00 +01:00
Bernhard Posselt
0525bbd73c
Merge pull request #2189 from owncloud/versioning_sync_client
...
fix versioning for the sync client - distinguish between touch and write operation
2013-03-08 03:05:28 -08:00
Björn Schießle
8d26400cb5
remove some debug output; move code to the right function
2013-03-08 11:27:25 +01:00
Björn Schießle
45869afa5a
remove debug output
2013-03-08 10:51:28 +01:00
Jenkins for ownCloud
308c85090e
[tx-robot] updated from transifex
2013-03-08 00:26:35 +01:00
Michael Gapczynski
4826564344
Merge branch 'master' into shared-folder-etags
...
Conflicts:
apps/files_sharing/lib/sharedstorage.php
2013-03-07 17:14:34 -05:00
Bernhard Posselt
d6bb627a62
Merge pull request #2173 from owncloud/fix-shared-storage
...
Fix fetching source path of shared files
2013-03-07 09:37:36 -08:00
Michael Gapczynski
a5cab28bea
Fix fetching source path of shared files
2013-03-07 11:12:59 -05:00
Frank Karlitschek
19073e0711
Merge pull request #2167 from owncloud/input-type-fix
...
Input type fix
2013-03-07 07:28:22 -08:00
Michael Gapczynski
4cb5cb9693
itemSource parameter should be fileSource
2013-03-07 10:00:03 -05:00
Björn Schießle
48bb53030c
distinguish between touch and write
2013-03-07 15:51:44 +01:00
Arthur Schiwon
2ae1ad23b0
Offer download of whole shared dir only if it does not exceed zip input limit
2013-03-07 15:48:10 +01:00
Jan-Christoph Borchardt
70f0e0a8da
Merge pull request #2162 from owncloud/trash_bin_home
...
let the home icon link to the files view in the trash bin
2013-03-07 06:26:15 -08:00
Björn Schießle
ba9f5f5885
add dirlisting var to file list
2013-03-07 14:54:59 +01:00
Björn Schießle
3970d1f875
remove debug output
2013-03-07 14:18:27 +01:00
Björn Schießle
4a4f705adc
json encode list of files
2013-03-07 14:15:02 +01:00
Björn Schießle
dda4c6bf4b
no dir parameter needed
2013-03-07 13:51:18 +01:00
Björn Schießle
7188303651
let the home icon link to the files view in the trash bin
2013-03-07 13:48:02 +01:00
Jenkins for ownCloud
97222b1de5
[tx-robot] updated from transifex
2013-03-07 00:16:59 +01:00
Michael Gapczynski
812e306e6e
Update Shared folders ETags of users with reshares
2013-03-06 17:33:27 -05:00
Jan-Christoph Borchardt
ab7dc76ff1
add type=text to ZIP size field, fix second part of #2097
2013-03-06 12:39:36 +01:00
Bernhard Posselt
d9a0d1d23b
Merge pull request #2119 from owncloud/fix_ldap_settings
...
LDAP: fix settings output thus make settings work again
2013-03-06 02:32:31 -08:00
Björn Schießle
82990b82a6
Merge pull request #2118 from owncloud/fix_1689
...
properly implement displayNamesInGroup in Core and LDAP, fixes #1689
2013-03-06 00:38:06 -08:00
Arthur Schiwon
bce0c3c372
LDAP: move more settings stuff to template file
2013-03-06 08:26:33 +01:00
Michael Gapczynski
771e01af35
Move hook connectors from shared storage to app.php, add post_unshare hook
2013-03-05 21:57:32 -05:00
Michael Gapczynski
4dcbaa1d7b
Merge branch 'master' into shared-folder-etags
...
Conflicts:
apps/files_sharing/appinfo/app.php
2013-03-05 21:54:32 -05:00
Jenkins for ownCloud
c1a32b5073
[tx-robot] updated from transifex
2013-03-06 00:08:33 +01:00
Arthur Schiwon
1e5f8b0e20
LDAP: fix settings output thus make settings work again
2013-03-05 23:43:22 +01:00
Arthur Schiwon
b5dc8b9ca3
whitespace
2013-03-05 21:25:59 +01:00
Arthur Schiwon
72c293e834
LDAP: implementation of displayNamesInGroup
2013-03-05 21:23:58 +01:00
Arthur Schiwon
055fadd10d
LDAP: escape some more chars for proper search filter, fixes #1673
2013-03-05 14:33:20 +01:00
Arthur Schiwon
b08894ba77
LDAP: error codes can be negative, too
2013-03-05 13:47:03 +01:00
Tom Needham
370f202251
Rebase to current master
2013-03-05 00:25:56 +00:00
