5fafd55108
make sure that only one process can enter the migration mode
2013-06-11 12:03:50 +02:00
74b1f7d448
Merge pull request #3646 from owncloud/introduce_phpunit_timeouts
...
add timeouts 3/30/90 to phpunit tests
2013-06-11 01:52:10 -07:00
4f0f537b42
[tx-robot] updated from transifex
2013-06-11 02:02:44 +02:00
c70a0f791d
allow 30 sec for testDeleteFile
2013-06-10 14:45:39 +02:00
1da112750e
Merge pull request #3647 from owncloud/missing_backticks
...
add missing backticks all over the place
2013-06-10 05:15:07 -07:00
13017ce9e1
Merge branch 'master' into files_encryption_check_private_key
...
Conflicts:
settings/ajax/changepassword.php
2013-06-10 12:12:07 +02:00
db06b906e5
Merge pull request #3610 from owncloud/encryption_recovery_for_ldap
...
recover encryption keys if ownCloud can't change the log-in password
2013-06-10 02:03:56 -07:00
b6f8d2b859
raise failed tests from first commit to size @medium
2013-06-10 10:17:47 +02:00
124f34422c
add missing backticks all over the place
2013-06-10 09:53:29 +02:00
73fb722a9e
add timeouts 3/30/90 to phpunit tests
2013-06-10 09:31:22 +02:00
3c79d89492
[tx-robot] updated from transifex
2013-06-08 02:13:41 +02:00
67c085417c
[tx-robot] updated from transifex
2013-06-07 02:17:50 +02:00
058c15a9f4
Read configuratons for external filesystem test from a private place.
...
This will help not to accidentially push private data and enable testing on our ci server.
2013-06-07 00:04:46 +02:00
2772b1dd95
update to latest master
2013-06-06 23:28:08 +02:00
3170e3511b
- implement touch() to at least create a file which doesn't exist
...
- implement a work around for folder mtimes - irods doesn't provide updated mtimes
2013-06-06 23:23:53 +02:00
d7a9852f7b
use pre_setPassword hook to update the encryption keys if the back-end doesn't support password change; improved output to let the admin know what happened
2013-06-06 13:32:02 +02:00
81b6cab94f
[tx-robot] updated from transifex
2013-06-06 02:21:31 +02:00
7fc5151d95
add a hint that the admin can recover your files; Don't let the user change the recovery settings if no private key is set
2013-06-05 18:53:02 +02:00
036732c249
allow to press enter to update the password
2013-06-05 14:51:51 +02:00
be324fad1c
tell the user what he can do to regain access to his files
2013-06-05 14:19:26 +02:00
57bda411d1
only show personal settings if the recovery feature is enabled or if no private key is set
2013-06-05 13:51:28 +02:00
666a5c1cc7
[tx-robot] updated from transifex
2013-06-05 02:01:42 +02:00
8793acfb4e
substr storage id to prevent problems with storing the change id in appconfig
2013-06-04 18:07:14 -04:00
055c901091
improved error msg and removed duplicate string
2013-06-04 22:31:36 +02:00
7bbd85b6e5
improved label for the password recovery feature
2013-06-04 21:19:42 +02:00
4ee7a428ae
link directly to the encryption settings
2013-06-04 10:49:58 +02:00
4976f2e0d3
LDAP: append port when URL is passed in LDAP Host configuration, fixes #2600
2013-06-04 10:32:54 +02:00
14ac4fab05
better handling for http post
2013-06-04 00:41:47 +02:00
ef97481a0d
changed redirect handling
2013-06-03 23:41:57 +02:00
b46e7323ec
fixed typo
2013-06-03 19:10:55 +02:00
dc8bcf0688
reformat code
2013-06-03 18:42:13 +02:00
1e601cd6f1
use generated private key fro m setUp()
2013-06-03 17:43:06 +02:00
35c91ff901
added test for decryptPrivateKey()
2013-06-03 17:34:43 +02:00
8c991d97aa
Merge pull request #3561 from owncloud/user
...
Refactor of user management
2013-06-03 08:13:40 -07:00
b5820af3cc
let user update private key password in case it was changed from outside, e.g. external auth back-ends
2013-06-03 15:27:31 +02:00
b02f4dc62c
$session->setPrivateKey expects only one parameter
2013-06-03 15:26:58 +02:00
42f66af5a3
control files are no longer needed, remove them from the tests
2013-06-03 14:21:30 +02:00
471d2b732c
introduce decryptPrivateKey() method which also checks if the result is a valid private key to avoid additional checks on various places
2013-06-03 14:19:31 +02:00
2a81813e44
Merge pull request #3051 from owncloud/backgroundjob
...
Reworked background job system.
2013-06-02 14:29:59 -07:00
9392d2d58e
Merge pull request #3567 from owncloud/fixing-3466
...
In cases where smb4php returns false of an empty array stat/( has to ret...
2013-06-02 14:04:55 -07:00
e1b5598f00
Files: use public api to register backgroundjob
2013-06-02 21:21:39 +02:00
251527c6e6
merge master into backgroundjob
2013-06-02 20:12:44 +02:00
cf71a54f5d
[tx-robot] updated from transifex
2013-06-02 02:07:21 +02:00
3013c02767
[tx-robot] updated from transifex
2013-06-01 02:03:53 +02:00
1d7d5d2894
In cases where smb4php returns false of an empty array stat/( has to return false.
...
Fixes #3466 because the test method of external filesystems uses stat() to detect if the given parameters are okay.
Changes to 3rdparty are necessary as well:
https://github.com/owncloud/3rdparty/pull/33
2013-06-01 00:06:23 +02:00
46e5e9bd73
cleanup unused method legacyKeyRecryptKeyfile
2013-05-31 22:49:32 +02:00
1656cc2e7c
Merge pull request #3565 from owncloud/fix_ldap_sqlite_n_js
...
Fix ldap sqlite n js
2013-05-31 12:17:46 -07:00
d85a10ebc5
fix broken tests
2013-05-31 20:55:05 +02:00
8761242f52
Merge branch 'master' into files_encryption_upgrade_fix
...
Conflicts:
apps/files_encryption/appinfo/app.php
2013-05-31 20:34:43 +02:00
eafb241068
Merge pull request #3562 from owncloud/fix_ldap_offline_host_handling
...
Fix ldap offline host handling
2013-05-31 11:10:33 -07:00
2ff9677cd1
LDAP: sqlite compatibility for emptyiing tables
2013-05-31 20:07:13 +02:00
c49ee4d3e3
LDAP: fix setting value of checkbox after loading configuration
2013-05-31 20:06:40 +02:00
a134ffcf2c
code optimized and cleaned up unused vars
2013-05-31 16:52:33 +02:00
e9d1ea712c
allow the user to login but do not allow upload and show error message on the web
2013-05-31 15:57:18 +02:00
2e3bfdb12c
check if the decrypted private key is valid on login and on read/write files
2013-05-31 13:58:58 +02:00
1bfe975938
Merge branch 'master' into files_encryption_upgrade_fix
...
Conflicts:
apps/files_encryption/lib/util.php
2013-05-31 12:58:12 +02:00
1c4c89418b
also fix login errors while filesystem is not loaded in app.php
2013-05-31 12:56:08 +02:00
88d74c33af
Merge branch 'master' into files_encryption_fs_loaded_fix
2013-05-31 12:49:46 +02:00
d636e168a6
Merge pull request #3527 from owncloud/file_encryption_external_storage_fixes
...
File encryption external storage fixes
2013-05-31 03:21:46 -07:00
4a0e69f941
fix login errors while filesystem is not loaded
2013-05-31 11:55:40 +02:00
8be23efa73
Implement hasUpdated() to watch for changes on Google Drive side
2013-05-30 21:45:16 -04:00
a730a72dcb
[tx-robot] updated from transifex
2013-05-31 02:04:40 +02:00
96ef926161
normalize path to prevent following split to fail
2013-05-31 01:57:32 +02:00
ccdfb59426
fix legacy key in until test
2013-05-31 01:55:48 +02:00
8e324aad38
fix re-encrypt legacy files
2013-05-31 01:36:49 +02:00
986e9dd362
use legacyDecrypt to decrypt key file like the previous files_encryption
2013-05-31 01:35:48 +02:00
4f9cbadfa4
fix for autoloader while user logged in and system is in maintenance
2013-05-31 01:34:31 +02:00
eaa4f92275
added our own file extension .part will not work here if we use file_get_contents so we used our own extension '.etmp'
2013-05-30 22:07:36 +02:00
b3834b49c3
prevent files_versions from calling file proxy which calls files_encryption and do unnecessary load and file operations
2013-05-30 22:05:52 +02:00
bd0d189f6f
Merge branch 'master' into googledrive
2013-05-30 11:20:22 -04:00
bd7771867b
LDAP: fix generation of alternate internal name on conflicts. Use also smaller number for better user experience on e.g. *DAV links
2013-05-30 16:55:21 +02:00
aa1c5a5d63
Merge pull request #3529 from owncloud/folder-permissions
...
Cache: provide a function to get the permissions of all files in a folder with one query
2013-05-30 05:54:29 -07:00
8e1d9261aa
[tx-robot] updated from transifex
2013-05-30 02:34:14 +02:00
6d94b393bf
fix share and un-share for single file
2013-05-30 01:38:11 +02:00
8c17f26226
fixed problems with file_get_contents and file_put_contents this problem was related to text editor with big text files
2013-05-30 01:13:22 +02:00
313631edf6
Merge branch 'master' into file_encryption_external_storage_fixes
...
Conflicts:
apps/files_encryption/hooks/hooks.php
2013-05-30 00:45:29 +02:00
5a47054505
Implement getDirectoryPermissions() in Shared Permissions, fixes #2846
2013-05-29 18:22:54 -04:00
d59ae569ba
reformat code
2013-05-29 23:13:45 +02:00
838fd1a20a
changed " to '
2013-05-29 23:11:30 +02:00
ee7c4c4c93
changed l10n to full sentences
2013-05-29 20:27:12 +02:00
df41a60c50
fixed typo
2013-05-29 20:11:53 +02:00
1202ab9995
Merge branch 'master' into file_encryption_external_storage_fixes
2013-05-29 19:19:40 +02:00
d265264542
fix for share folder on external storage
2013-05-29 19:11:39 +02:00
b44192f366
check list of users with access to the file from the bottom to the top. This way we avoid calling getFileInfo() on every dir, which creates a lot of overhead, especially for external storages
2013-05-29 13:10:26 +02:00
5dd865a57f
changes l10n after review
2013-05-29 12:47:50 +02:00
efd629462e
changes after review
2013-05-29 12:23:33 +02:00
c398fc59ad
Merge branch 'master' into remove_unused_vars
...
Conflicts:
apps/files_encryption/hooks/hooks.php
apps/files_encryption/lib/proxy.php
apps/files_encryption/lib/session.php
apps/files_encryption/lib/stream.php
2013-05-29 09:21:00 +02:00
7c0c6bd779
[tx-robot] updated from transifex
2013-05-29 02:10:54 +02:00
71a532fc4d
fixed if fopen returns false typically on external storage
2013-05-28 20:50:14 +02:00
4b4b447e2a
fixed missing convert to new session handler
2013-05-28 17:06:37 +02:00
6ae7bde788
fixed encryption session namespace to avoid problems
2013-05-28 17:04:35 +02:00
cc0cf93136
merge master into sessionclass
2013-05-28 14:55:42 +02:00
09b54ccb2b
Merge branch 'master' into remove_unused_vars
...
Conflicts:
apps/files_encryption/lib/session.php
apps/files_encryption/lib/util.php
2013-05-28 11:00:49 +02:00
3a76c22372
$_POST["adminEnableRecovery"] is a string
2013-05-28 10:51:12 +02:00
0041711fe3
fix for undefined index
2013-05-28 09:36:14 +02:00
6f9e425939
fix for losing private key while being logged in and accessing a public link
2013-05-28 09:27:04 +02:00
3420d853ab
[tx-robot] updated from transifex
2013-05-28 02:07:51 +02:00
9c99048429
fix syntax error
2013-05-28 01:31:26 +02:00
44f9af5a7f
Use the new session wrapper
2013-05-28 01:04:09 +02:00
e1e1c58969
changed to public log api
2013-05-27 20:51:52 +02:00
7224fc98b2
replace == with === and replace != with !==
2013-05-27 20:44:38 +02:00
6075aff687
changed basic auth to test user
2013-05-27 20:32:59 +02:00
2c3c60c1af
Merge branch 'master' into remove_unused_vars
...
Conflicts:
apps/files_encryption/hooks/hooks.php
apps/files_encryption/lib/crypt.php
apps/files_encryption/lib/proxy.php
2013-05-27 18:09:35 +02:00
c81e34ef89
replace == with ===
2013-05-27 18:03:29 +02:00
16925672e8
Merge branch 'master' into googledrive
2013-05-27 11:35:57 -04:00
4c05259ccf
legacyBlockDecryprt() needs to be public
2013-05-27 17:35:38 +02:00
df22a7c495
make legacyDecrypt() private als always call legacyBlockDecrypt() from other classes
2013-05-27 17:35:28 +02:00
8b35578833
fix migration from old to new encryption
2013-05-27 17:35:06 +02:00
5d32e214b7
reformat code
2013-05-27 17:26:58 +02:00
690bf9b8c4
Merge branch 'master' into remove_unused_vars
...
Conflicts:
apps/files_encryption/lib/util.php
2013-05-27 17:26:35 +02:00
f8d1c32112
Merge pull request #3506 from owncloud/fix_3320
...
fix https://github.com/owncloud/core/issues/3320
2013-05-27 08:04:55 -07:00
841b420bc4
add event.preventDefault to undelete function
2013-05-27 16:37:43 +02:00
710e9c2d14
fix tests, after unused variables are removed
2013-05-27 15:34:57 +02:00
1a3f7891ea
remove unused varaibles
2013-05-27 15:31:26 +02:00
d408cd7f37
fix https://github.com/owncloud/core/issues/3320
2013-05-27 15:24:37 +02:00
80433fc4c4
Merge branch 'master' into file_encryption_util_is_error
...
Conflicts:
apps/files_encryption/lib/util.php
2013-05-27 14:41:53 +02:00
5e243b48bb
Merge pull request #3481 from owncloud/firsttime_enc
...
fix first time encryption after app was enabled
2013-05-27 05:17:31 -07:00
8cf827ee9d
Merge branch 'master' into file_encryption_tests
2013-05-27 12:54:33 +02:00
89f0c8f39d
added check by numRows()
...
changed to public api where it was possible
reformat code to comply with the coding guidelines
2013-05-27 12:41:55 +02:00
73e0b4c10a
[tx-robot] updated from transifex
2013-05-27 02:07:24 +02:00
9dd277576a
added users for tests
...
reformat code to meet coding guidelines
2013-05-26 20:44:15 +02:00
c7981abbc9
improved test
...
- fixed testPermanentDeleteFile sometimes failed
- speed optimization
- reformat code
2013-05-26 03:22:16 +02:00
0c621ff6a9
[tx-robot] updated from transifex
2013-05-26 02:03:54 +02:00
788c5940f0
fixed error rising from fetchRow
2013-05-25 23:20:55 +02:00
9a6cd89a69
added OC_DB::isError and logging
2013-05-25 21:33:05 +02:00
dbb6a10364
Merge pull request #3478 from davidak/master
...
small typo fix: added 2 whitespaces
2013-05-25 11:21:21 -07:00
29c8cbf4d1
increase version and add warning
2013-05-25 12:08:18 +02:00
86d72b9a61
LDAP: fix possible recursion
2013-05-25 11:03:58 +02:00
bfa715768a
LDAP: fix handling when LDAP Host is offline
2013-05-25 11:02:51 +02:00
6a6c18dfab
[tx-robot] updated from transifex
2013-05-25 02:11:52 +02:00
fba7200b05
improved trashbin test again
2013-05-24 23:12:16 +02:00
b32823a96e
improved trashbin test
2013-05-24 23:12:07 +02:00
f56802a437
no use the recoveryPassword var instead of accessing the POST array
2013-05-24 18:37:58 +02:00
5ce4149e75
fix first time encryption after app was enabled
2013-05-24 17:35:00 +02:00
56006ea852
small typo fix: added 2 whitespaces
2013-05-24 14:31:06 +02:00
4911305887
Merge pull request #3416 from owncloud/files_encryption
...
New files encryption app
2013-05-24 02:21:19 -07:00
a98d6c4be6
Merge pull request #3425 from owncloud/move-storages
...
Support for moving/copying folders between storages
2013-05-23 17:35:11 -07:00
b47729c5fc
[tx-robot] updated from transifex
2013-05-24 02:02:43 +02:00
6c8de5ae6d
fixes after review from @DeepDiver1975
2013-05-23 23:56:31 +02:00
adc930d9f9
added l10n support in apps/files_encryption/ajax/adminrecovery.php
2013-05-23 22:09:28 +02:00
7b07168c46
code clean up; nicer solution to solve the public link share problem if a user is logged in
2013-05-23 21:18:31 +02:00
a9ebf2aabe
fix public link share if a user is logged in
2013-05-23 20:30:07 +02:00
acba7d7b13
Update settings.php
2013-05-23 17:27:22 +02:00
b23ce9ed40
Remove http:// from label and add placeholder
2013-05-23 17:24:48 +02:00
169eb10030
Enable https authentication
...
Allow authentication using https:// as well as http://
2013-05-23 17:22:05 +02:00
e866e564c2
Enable https authentication
2013-05-23 16:57:22 +02:00
30330b4343
Merge branch 'master' into move-storages
...
Conflicts:
tests/lib/files/view.php
2013-05-23 10:25:12 -04:00
cb79169cf5
Merge branch 'master' into files_encryption
2013-05-23 11:11:57 +02:00
698862519d
[tx-robot] updated from transifex
2013-05-23 02:00:27 +02:00
46c784ccdf
added trash bin tests
2013-05-22 23:51:35 +02:00
842d0608f1
added static function registerHooks() for better unit tests handling
2013-05-22 23:50:45 +02:00
9b622bdeed
RUNTIME_NOSETUPFS no longer exists, using tearDownFS() in public links instead
2013-05-22 15:02:11 -04:00
80dea1a8c5
settings clean-up; There is no blacklist in the new encryption app
2013-05-22 18:05:12 +02:00
15a3ae6db1
improved error messages
2013-05-22 18:01:18 +02:00
ee53bd1aa3
Merge branch 'master' into files_encryption
...
Conflicts:
lib/files/cache/cache.php
2013-05-22 15:29:22 +02:00
9fd2be0757
Merge pull request #3406 from owncloud/oc_dialogs_oc_template
...
Use js templates in OC.dialogs etc.
2013-05-22 03:00:04 -07:00
d590064fdf
[tx-robot] updated from transifex
2013-05-22 02:19:52 +02:00
c6722581f9
fix pgsql error
2013-05-22 02:02:42 +02:00
afbfa742d7
improved tests
2013-05-22 01:11:55 +02:00
9ca9a22c6a
fixed finding encrypted files in subfolders and removed unused code
2013-05-22 00:54:47 +02:00
095fc790ac
added webdav test
2013-05-21 21:09:39 +02:00
1deeec93b7
fixed postFileSize
2013-05-21 21:09:25 +02:00
5cd14425f9
Merge branch 'master' into files_encryption
...
Conflicts:
apps/files_trashbin/l10n/nn_NO.php
2013-05-21 15:30:19 +02:00
9d324db054
fix path to 3rdparty apps
2013-05-21 12:33:32 +02:00
4c27c7e199
fix path, needs to be relative to data/
2013-05-21 12:22:03 +02:00
64591cf754
move 3rdparty dependencies to app
2013-05-21 10:30:24 +02:00
c9e862ccba
fix broken tests
2013-05-21 07:19:23 +02:00
afdad5c74d
[tx-robot] updated from transifex
2013-05-21 02:04:52 +02:00
4bf840e2ca
cleanup unused code optimize tests
2013-05-21 00:00:55 +02:00
f2b1158add
improved tests
2013-05-20 23:44:10 +02:00
1c8e5d6873
added test for failed sharing
2013-05-20 21:46:28 +02:00
1fa2f19ee4
removed dead code for delShareKey
2013-05-20 21:24:39 +02:00
8e0540d0e4
key creation should never override a private or public key
2013-05-20 21:22:03 +02:00
171b9a4702
added legacy encryption test
2013-05-20 21:19:28 +02:00
ec475cbcfa
Add data-dir attribute to home breadcrumb
2013-05-20 10:21:13 -04:00
31037241e1
Merge branch 'master' into files_encryption
2013-05-20 02:25:56 +02:00
6609de28d8
[tx-robot] updated from transifex
2013-05-20 02:10:11 +02:00
3b850a2524
reformat code added and changed phpdoc
2013-05-20 01:24:36 +02:00
dc39ef378e
changed recovery_enabled and migration_status columns to integer and fix tests
2013-05-20 00:38:23 +02:00
5d572c3449
update phpdoc
2013-05-19 22:31:00 +02:00
bdd2127f19
cleanup tests
2013-05-19 22:28:48 +02:00
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
694f42dfd5
[tx-robot] updated from transifex
2013-05-19 02:01:55 +02:00
2a038baee0
updated authors info
2013-05-18 22:33:31 +02:00
227b122947
fixed again key-manager tests
2013-05-18 22:25:47 +02:00
681252669a
changed migrationStatus to migration_status for pgsql
2013-05-18 22:10:00 +02:00
e0e89602a2
fixed key-manager tests
2013-05-18 22:00:35 +02:00
80f9c5bb6d
removed mockery from tests and changed class names
2013-05-18 21:37:00 +02:00
6980f59b2f
fixed typos
2013-05-18 21:12:53 +02:00
c41305d467
Fix require_once for 3rdparty in google ajax frontend
2013-05-18 14:51:25 -04:00
9428d813ba
[tx-robot] updated from transifex
2013-05-18 02:03:28 +02:00
41165afa59
improved tests
2013-05-17 22:45:09 +02:00
3aa48616a6
remove unused code
2013-05-17 22:44:45 +02:00
b6572cedac
added folder move test
2013-05-17 22:16:56 +02:00
cea9208cec
fix broken legacy tests
2013-05-17 21:59:53 +02:00
b4bf6a8d3a
Include 3rdparty Google Drive SDK 0.6.2
2013-05-17 14:33:37 -04:00
4bb9c4a42e
Fix constant in last commit
2013-05-17 14:03:25 -04:00
e7d1fe82aa
fix path to class
2013-05-17 18:01:32 +02:00
5368c8dafa
Prepare for #2013 fix
2013-05-17 11:42:14 -04:00
eaa61b8539
fix migration to new encryption
2013-05-17 17:29:32 +02:00
002445e23d
some typo fixed
2013-05-17 14:49:54 +02:00
93771f735b
gremove unused code
2013-05-17 14:13:05 +02:00
bf04a21973
set migration status after successful upgrade
2013-05-17 13:16:52 +02:00
0b40c1d08a
Merge branch 'files_encryption' of github.com:owncloud/core into files_encryption
2013-05-17 11:20:17 +02:00
ca6a77d39b
upgrade from old encryption to the new one needs to generate share keys too
2013-05-17 11:15:36 +02:00
152e275c8a
Various cleanups in OC.dialogs
2013-05-17 04:54:08 +02:00
ee398ccbc2
Setting Redirect URI is not required here
2013-05-16 20:35:07 -04:00
d8c660c6d5
Switch to using Google Drive SDK, closes #2047
2013-05-16 20:09:32 -04:00
6a6079176b
[tx-robot] updated from transifex
2013-05-17 02:07:36 +02:00
2b0bf4dc87
added tests for recovery
2013-05-17 01:07:50 +02:00
a4c0eb1756
improved tests
2013-05-17 01:07:26 +02:00
42b4963dd0
moved enable and disable recovery to Helper class for unit tests
2013-05-17 00:58:41 +02:00
3793e4d2d6
fix for recover files in subfolder
2013-05-16 22:57:55 +02:00
d40d6aa358
fix typo in addRecoveryKeys
2013-05-16 22:39:09 +02:00
9d1e60325c
allow admin to recover users files in case of password lost
2013-05-16 14:53:04 +02:00
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
966c2231e3
[tx-robot] updated from transifex
2013-05-16 02:01:37 +02:00
67a80e1870
improved tests for touch
2013-05-16 00:44:40 +02:00
0fca2f8f31
added tests for put content, get content, touch and fopen
2013-05-16 00:36:40 +02:00
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
c0c4fe5fd3
fix if file is not yet created
2013-05-16 00:31:17 +02:00
8f963b95e5
added test for share with group
2013-05-16 00:30:01 +02:00
31d8258d6c
Merge branch 'master' into ext-fs-irods-master
2013-05-15 23:56:42 +02:00
b75a0abb6b
added test for rename folder
2013-05-15 22:42:22 +02:00
ec2e193a44
removed unused code
2013-05-15 21:01:03 +02:00
5fcb5f3aba
added test for password change
2013-05-15 21:00:35 +02:00
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
1a31dc036a
added missing file to enable the admin to change the recovery key password
2013-05-15 16:14:54 +02:00
1f5ed65b12
Merge branch 'files_encryption' of github.com:owncloud/core into files_encryption
2013-05-15 16:13:29 +02:00
64d94c540a
enable admin to change the recovery password
2013-05-15 16:12:20 +02:00
63a790b415
fix for broken tests
2013-05-15 14:33:08 +02:00
1fbdc3ce8f
fix for previous workaround
2013-05-15 14:32:50 +02:00
5b160edebb
check if the user knows the correct recovery password before changing the recovery key settings
2013-05-15 14:02:13 +02:00
335f2ca321
Merge branch 'files_encryption' of github.com:owncloud/core into files_encryption
2013-05-15 11:42:41 +02:00
d8ae2fa80d
only let the user change the recovery admin settings if a key passwords was entered.
2013-05-15 11:42:22 +02:00
137039d35a
workaround for blank page need an other solution
2013-05-15 10:52:23 +02:00
3d7534da74
improved files_encryption tests
2013-05-15 10:21:56 +02:00
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
226aec8d56
Merge branch 'master' into files_encryption
2013-05-15 03:22:06 +02:00
7461e9c2b5
improved tests and added new tests for file rename and move
2013-05-15 02:38:08 +02:00
499fe6ca8e
disabled FileProxy in Keymanager::getPrivateKey
2013-05-15 02:36:23 +02:00
ddedf20106
prevent of infinite loop with FileProxy
2013-05-15 02:34:36 +02:00
6a788d1a54
[tx-robot] updated from transifex
2013-05-15 02:02:45 +02:00
8776000754
fix for move file to an empty folder
2013-05-14 23:19:16 +02:00
0a7aa6e8cd
fix for Allowed memory size of xx bytes exhausted while reading big files
2013-05-14 22:32:39 +02:00
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
84c56a5d56
fix for zero size files
2013-05-14 21:29:24 +02:00
96ff19a703
fix history template, print_unescaped() needs to include closing tags
2013-05-14 21:22:30 +02:00
517105660d
fix for public link share
2013-05-14 20:11:07 +02:00
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
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
0d8fa2eb98
[files] add private declaration of $view
2013-05-14 12:49:23 +02:00
18618c75aa
color change to crumb elements as well.
2013-05-14 11:07:12 +05:30
81ae4cb5d0
added test for public shared file via link
2013-05-14 00:00:20 +02:00
a4e9e2fc79
added post_deleteUser hook for cleanup public key
2013-05-13 22:49:27 +02:00
b2d021b2a5
added post_createUser hook
2013-05-13 22:34:11 +02:00
61ed347d26
added handling for public file access via files_sharing link
2013-05-13 21:24:59 +02:00
d92f6b887d
removed var_dump
2013-05-13 21:22:59 +02:00
6d95d130e4
Keeping Font Colors Consistant on the headers.
2013-05-13 23:12:05 +05:30
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
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
591b383f2d
peselect filename without extension on rename
2013-05-13 15:54:45 +02:00
2f4ba9d1e8
if file was shared to user than userIds is just the users Id
2013-05-13 15:45:30 +02:00
d1e2e47592
generate random key name for share key to avoid name conflicts
2013-05-13 15:15:35 +02:00
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
beaa10b823
Merge branch 'master' into ldap_configurable_username_n_uuid
2013-05-13 12:41:22 +02:00
0ef8590773
Merge branch 'master' into update_etags_on_restore
2013-05-13 10:48:06 +02:00
e8c154f341
[tx-robot] updated from transifex
2013-05-13 02:10:20 +02:00
e2bd32323d
[files] fix mock creation and remove hardcoded 'require' statement
2013-05-12 13:02:01 +02:00
b777c0fd75
[files] rename lib to "App"
2013-05-12 11:47:22 +02:00
b32c30b6d0
[files] ownCloud typo
2013-05-12 11:47:22 +02:00
7e23e97676
[files] rename test class and add rename test
2013-05-12 11:47:22 +02:00
d4ba9cf338
[files] remove realpath in test
2013-05-12 11:47:22 +02:00
bb5554de7f
[files] rename tests
2013-05-12 11:47:22 +02:00
b9f426b1d7
[files] remove normalizePath on rename and dependency injection
2013-05-12 11:47:22 +02:00
324c423548
[files] kill stripslashes
2013-05-12 11:47:22 +02:00
418e878ba8
[files] fix typos
2013-05-12 11:47:22 +02:00
1020d5c16c
[files] refactoring
2013-05-12 11:47:22 +02:00
33b31931bd
string comparision
2013-05-12 11:47:22 +02:00
b393c91a96
wrong root dir name
2013-05-12 11:47:22 +02:00
a878bd9923
fix allowed rename of folder in root directory to reserved name "Shared"
...
refs #2159
2013-05-12 11:47:22 +02:00
74f92d0c7f
[tx-robot] updated from transifex
2013-05-12 02:05:29 +02:00
8e004cc3e1
added handling for sharing with link
...
NOTE: only encryption work atm
2013-05-11 01:03:43 +02:00
33e0dfeecb
sharing with group should work now
2013-05-11 00:25:32 +02:00
e88595638c
fix for webdav
2013-05-11 00:23:30 +02:00
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
bb640df06e
duplicate verification
2013-05-10 11:16:18 +02:00
6082a09e62
Fix inexisting trashbin's sub-folders
2013-05-10 11:12:42 +02:00
3eae26143f
added test for re-share folder
2013-05-10 01:00:24 +02:00
15845bf0bf
fix for autotest.sh
2013-05-09 23:22:46 +02:00
18a821b1e3
added helper
2013-05-09 23:22:22 +02:00
de855ac31b
improved tests and include helper
2013-05-09 19:37:26 +02:00
e25aa78caf
added helper class and moved hook registration to it
2013-05-09 19:36:18 +02:00
163fe64016
Fixes to code formatting and indentation
2013-05-09 18:24:07 +02:00
92e28839ff
Improvements to code formatting & indentation
2013-05-09 18:16:59 +02:00
3003dd46d1
Implemented initial recoveryAdmin functionality in crypto file proxy
2013-05-09 18:09:20 +02:00
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
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
b9134dcd6a
touch file relative to users file folder, otherwise the hooks will be ignored
2013-05-08 22:59:49 +02:00
d69579f773
LDAP: fix display of numerical display names
2013-05-08 17:54:38 +02:00
796ee8c4c0
LDAP: Implement clear mappings functionality
2013-05-08 17:47:07 +02:00
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
3f1717d3d5
LDAP: implement UUID and internal username override
2013-05-08 14:56:52 +02:00
c9b3da5bbc
LDAP: better variable name
2013-05-08 14:55:56 +02:00
bc23010670
LDAP: implement r+w for new settings
2013-05-08 14:05:08 +02:00
c18158906c
LDAP: add settings for UUID override
2013-05-08 13:57:21 +02:00
fdc49e7acb
added test for share folder
2013-05-07 22:56:59 +02:00
33fc830dd3
added test for re-share
2013-05-07 22:22:05 +02:00
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
498eae49b1
LDAP: prepare settings for internal username attribute and clearing user mappings
2013-05-07 19:31:51 +02:00
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
68ecee9771
LDAP: Coypright info
2013-05-07 18:23:49 +02:00
763c8f78ed
Made code formatting of new methods more consistent
2013-05-07 17:16:16 +02:00
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
b535964006
test for share is now able to run with autotest.sh
2013-05-07 13:43:34 +02:00
8b54553872
fix for wrong file infos
2013-05-07 13:42:49 +02:00
a9649713d3
fix empty path
2013-05-07 13:42:08 +02:00
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
8fcef41143
added test for share
2013-05-07 09:49:14 +02:00
fe6d12ddec
fix file info put on stream
2013-05-06 21:15:25 +02:00
3de40f7cfb
Files: set the proper mimetype when creating a new text file
2013-05-06 17:55:22 +02:00
db1e6b5f3b
Use $dir instead of $fullpath
2013-05-06 14:28:01 +03:00
b13b19c58b
Use the internal ownCloud view
2013-05-06 13:43:23 +03:00
d659d8e193
LDAP: do not reset UUID attribute setting when guid is detected
2013-05-06 10:17:52 +02:00
5610429a02
handling for re-share and re-unshare should work now
2013-05-05 23:41:42 +02:00
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
9605d14a17
fixed re-share problems
2013-05-04 03:37:22 +02:00
a876240b32
[tx-robot] updated from transifex
2013-05-04 02:00:54 +02:00
d649f77898
make sure to find the correct path for shared files
2013-05-03 17:14:43 +02:00
050258f003
remove encryption keys if a file gets deleted permanently
2013-05-03 16:33:18 +02:00
8a1223181b
disable proxys before copying files to the trash bin
2013-05-03 15:18:05 +02:00
1e2b872160
LDAP: cachekey in set method needs to match with that one from get
2013-05-03 15:13:37 +02:00
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
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
22a8e7ad55
LDAP: remove restriction from group names to be in line with core behaviour again
2013-05-03 14:11:06 +02:00
a2516e549b
get original path in case of shared files when restoring file from trash bin
2013-05-03 14:03:42 +02:00
996a557475
get original path in case of shared files
2013-05-03 13:00:04 +02:00
4f6565d8e7
[tx-robot] updated from transifex
2013-05-03 02:05:10 +02:00
a204a46d50
Merge pull request #3212 from owncloud/stop-links
...
Don't display shared links if disabled
2013-05-02 15:29:00 -07:00
7039421efc
Fix retrieving of mount points for shared storage, fix #3218
2013-05-02 17:47:11 -04:00
8a5e88b21c
Merge pull request #3211 from owncloud/fix-2816
...
Fix #2816 renaming shared files
2013-05-02 00:54:09 -07:00
274bf3c6bd
Don't display shared links if disabled
2013-05-01 20:39:02 -04:00
04b7a9902d
Fix #2816 renaming shared files
2013-05-01 20:29:07 -04:00
ee53e7b3d2
[tx-robot] updated from transifex
2013-05-02 02:19:04 +02:00
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
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
db49b0aff8
Merge pull request #3202 from owncloud/swift_id
...
Set storage id for openstack swift backend
2013-05-01 05:28:37 -07:00
d3db4ee103
fixed re-share problems
2013-05-01 11:04:40 +02:00
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
6163a85668
[tx-robot] updated from transifex
2013-05-01 02:02:59 +02:00
Björn Schießle
Thomas Müller
Jörn Friedrich Dreyer
Morris Jobke
Björn Schießle
Michael Gapczynski
Florin Peter
Arthur Schiwon
icewind1991
Frank Karlitschek
Robin Appelman
Georg Ehrke
davidak
opensaucesystems
Thomas Tanghus
Raghu Nayyar
Bastien Ho
Sam Tuke
Bart Visscher
Lukas Reschke