Florin Peter
|
afbfa742d7
|
improved tests
|
2013-05-22 01:11:55 +02:00 |
|
Florin Peter
|
9ca9a22c6a
|
fixed finding encrypted files in subfolders and removed unused code
|
2013-05-22 00:54:47 +02:00 |
|
Florin Peter
|
095fc790ac
|
added webdav test
|
2013-05-21 21:09:39 +02:00 |
|
Florin Peter
|
1deeec93b7
|
fixed postFileSize
|
2013-05-21 21:09:25 +02:00 |
Björn Schießle
|
5cd14425f9
|
Merge branch 'master' into files_encryption
Conflicts:
apps/files_trashbin/l10n/nn_NO.php
|
2013-05-21 15:30:19 +02:00 |
|
Björn Schießle
|
9d324db054
|
fix path to 3rdparty apps
|
2013-05-21 12:33:32 +02:00 |
|
Björn Schießle
|
4c27c7e199
|
fix path, needs to be relative to data/
|
2013-05-21 12:22:03 +02:00 |
|
Björn Schießle
|
64591cf754
|
move 3rdparty dependencies to app
|
2013-05-21 10:30:24 +02:00 |
|
Florin Peter
|
c9e862ccba
|
fix broken tests
|
2013-05-21 07:19:23 +02:00 |
Jenkins for ownCloud
|
afdad5c74d
|
[tx-robot] updated from transifex
|
2013-05-21 02:04:52 +02:00 |
|
Florin Peter
|
4bf840e2ca
|
cleanup unused code optimize tests
|
2013-05-21 00:00:55 +02:00 |
|
Florin Peter
|
f2b1158add
|
improved tests
|
2013-05-20 23:44:10 +02:00 |
|
Florin Peter
|
1c8e5d6873
|
added test for failed sharing
|
2013-05-20 21:46:28 +02:00 |
|
Florin Peter
|
1fa2f19ee4
|
removed dead code for delShareKey
|
2013-05-20 21:24:39 +02:00 |
|
Florin Peter
|
8e0540d0e4
|
key creation should never override a private or public key
|
2013-05-20 21:22:03 +02:00 |
|
Florin Peter
|
171b9a4702
|
added legacy encryption test
|
2013-05-20 21:19:28 +02:00 |
Michael Gapczynski
|
ec475cbcfa
|
Add data-dir attribute to home breadcrumb
|
2013-05-20 10:21:13 -04:00 |
|
Florin Peter
|
31037241e1
|
Merge branch 'master' into files_encryption
|
2013-05-20 02:25:56 +02:00 |
|
Jenkins for ownCloud
|
6609de28d8
|
[tx-robot] updated from transifex
|
2013-05-20 02:10:11 +02:00 |
|
Florin Peter
|
3b850a2524
|
reformat code added and changed phpdoc
|
2013-05-20 01:24:36 +02:00 |
|
Florin Peter
|
dc39ef378e
|
changed recovery_enabled and migration_status columns to integer and fix tests
|
2013-05-20 00:38:23 +02:00 |
|
Florin Peter
|
5d572c3449
|
update phpdoc
|
2013-05-19 22:31:00 +02:00 |
|
Florin Peter
|
bdd2127f19
|
cleanup tests
|
2013-05-19 22:28:48 +02:00 |
|
Florin Peter
|
ddda2a1f79
|
changed database column 'recovery' to 'recovery_enabled' because recovery is a pgsql keyword
more info about pgsql keywords http://www.postgresql.org/docs/9.1/static/sql-keywords-appendix.html
|
2013-05-19 07:04:31 +02:00 |
|
Jenkins for ownCloud
|
694f42dfd5
|
[tx-robot] updated from transifex
|
2013-05-19 02:01:55 +02:00 |
|
Florin Peter
|
2a038baee0
|
updated authors info
|
2013-05-18 22:33:31 +02:00 |
|
Florin Peter
|
227b122947
|
fixed again key-manager tests
|
2013-05-18 22:25:47 +02:00 |
|
Florin Peter
|
681252669a
|
changed migrationStatus to migration_status for pgsql
|
2013-05-18 22:10:00 +02:00 |
|
Florin Peter
|
e0e89602a2
|
fixed key-manager tests
|
2013-05-18 22:00:35 +02:00 |
|
Florin Peter
|
80f9c5bb6d
|
removed mockery from tests and changed class names
|
2013-05-18 21:37:00 +02:00 |
|
Florin Peter
|
6980f59b2f
|
fixed typos
|
2013-05-18 21:12:53 +02:00 |
|
Jenkins for ownCloud
|
9428d813ba
|
[tx-robot] updated from transifex
|
2013-05-18 02:03:28 +02:00 |
|
Florin Peter
|
41165afa59
|
improved tests
|
2013-05-17 22:45:09 +02:00 |
|
Florin Peter
|
3aa48616a6
|
remove unused code
|
2013-05-17 22:44:45 +02:00 |
|
Florin Peter
|
b6572cedac
|
added folder move test
|
2013-05-17 22:16:56 +02:00 |
|
Florin Peter
|
cea9208cec
|
fix broken legacy tests
|
2013-05-17 21:59:53 +02:00 |
|
Björn Schießle
|
e7d1fe82aa
|
fix path to class
|
2013-05-17 18:01:32 +02:00 |
|
Björn Schießle
|
eaa61b8539
|
fix migration to new encryption
|
2013-05-17 17:29:32 +02:00 |
|
Björn Schießle
|
002445e23d
|
some typo fixed
|
2013-05-17 14:49:54 +02:00 |
|
Björn Schießle
|
93771f735b
|
gremove unused code
|
2013-05-17 14:13:05 +02:00 |
|
Björn Schießle
|
bf04a21973
|
set migration status after successful upgrade
|
2013-05-17 13:16:52 +02:00 |
|
Björn Schießle
|
0b40c1d08a
|
Merge branch 'files_encryption' of github.com:owncloud/core into files_encryption
|
2013-05-17 11:20:17 +02:00 |
|
Björn Schießle
|
ca6a77d39b
|
upgrade from old encryption to the new one needs to generate share keys too
|
2013-05-17 11:15:36 +02:00 |
Thomas Tanghus
|
152e275c8a
|
Various cleanups in OC.dialogs
|
2013-05-17 04:54:08 +02:00 |
|
Jenkins for ownCloud
|
6a6079176b
|
[tx-robot] updated from transifex
|
2013-05-17 02:07:36 +02:00 |
|
Florin Peter
|
2b0bf4dc87
|
added tests for recovery
|
2013-05-17 01:07:50 +02:00 |
|
Florin Peter
|
a4c0eb1756
|
improved tests
|
2013-05-17 01:07:26 +02:00 |
|
Florin Peter
|
42b4963dd0
|
moved enable and disable recovery to Helper class for unit tests
|
2013-05-17 00:58:41 +02:00 |
|
Florin Peter
|
3793e4d2d6
|
fix for recover files in subfolder
|
2013-05-16 22:57:55 +02:00 |
|
Florin Peter
|
d40d6aa358
|
fix typo in addRecoveryKeys
|
2013-05-16 22:39:09 +02:00 |
|
Björn Schießle
|
9d1e60325c
|
allow admin to recover users files in case of password lost
|
2013-05-16 14:53:04 +02:00 |
blizzz
|
2d51eefcb8
|
Merge pull request #3302 from owncloud/ldap_configurable_username_n_uuid
Ldap configurable username n uuid
|
2013-05-16 05:40:31 -07:00 |
|
Jenkins for ownCloud
|
966c2231e3
|
[tx-robot] updated from transifex
|
2013-05-16 02:01:37 +02:00 |
|
Florin Peter
|
67a80e1870
|
improved tests for touch
|
2013-05-16 00:44:40 +02:00 |
|
Florin Peter
|
0fca2f8f31
|
added tests for put content, get content, touch and fopen
|
2013-05-16 00:36:40 +02:00 |
|
Florin Peter
|
c651950a17
|
fix for re-share and removed check if file exists because we are sometime into a pre_put_contents hook
|
2013-05-16 00:34:45 +02:00 |
|
Florin Peter
|
c0c4fe5fd3
|
fix if file is not yet created
|
2013-05-16 00:31:17 +02:00 |
|
Florin Peter
|
8f963b95e5
|
added test for share with group
|
2013-05-16 00:30:01 +02:00 |
|
Florin Peter
|
b75a0abb6b
|
added test for rename folder
|
2013-05-15 22:42:22 +02:00 |
|
Florin Peter
|
ec2e193a44
|
removed unused code
|
2013-05-15 21:01:03 +02:00 |
|
Florin Peter
|
5fcb5f3aba
|
added test for password change
|
2013-05-15 21:00:35 +02:00 |
|
Björn Schießle
|
57c0a7ed69
|
add recovery key to all files if the user enabled the feature and removes them again on disable
|
2013-05-15 17:56:45 +02:00 |
|
Björn Schießle
|
1a31dc036a
|
added missing file to enable the admin to change the recovery key password
|
2013-05-15 16:14:54 +02:00 |
|
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 |