Björn Schießle
|
710e9c2d14
|
fix tests, after unused variables are removed
|
2013-05-27 15:34:57 +02:00 |
|
Björn Schießle
|
1a3f7891ea
|
remove unused varaibles
|
2013-05-27 15:31:26 +02:00 |
Björn Schießle
|
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 |
FlorinPeter
|
d878926256
|
Merge pull request #3496 from owncloud/file_encryption_tests
improved tests for files_encryption
|
2013-05-27 05:15:21 -07:00 |
|
Florin Peter
|
8cf827ee9d
|
Merge branch 'master' into file_encryption_tests
|
2013-05-27 12:54:33 +02:00 |
Jenkins for ownCloud
|
73e0b4c10a
|
[tx-robot] updated from transifex
|
2013-05-27 02:07:24 +02:00 |
|
Florin Peter
|
9dd277576a
|
added users for tests
reformat code to meet coding guidelines
|
2013-05-26 20:44:15 +02:00 |
|
Florin Peter
|
c7981abbc9
|
improved test
- fixed testPermanentDeleteFile sometimes failed
- speed optimization
- reformat code
|
2013-05-26 03:22:16 +02:00 |
|
Jenkins for ownCloud
|
0c621ff6a9
|
[tx-robot] updated from transifex
|
2013-05-26 02:03:54 +02:00 |
Michael Gapczynski
|
dbb6a10364
|
Merge pull request #3478 from davidak/master
small typo fix: added 2 whitespaces
|
2013-05-25 11:21:21 -07:00 |
|
Michael Gapczynski
|
0fdf3a7e63
|
Merge pull request #3388 from roha4000/master
Duplicate DB entries in filecache table when renaming folder in WebUI #2
|
2013-05-25 11:18:20 -07:00 |
|
Michael Gapczynski
|
c870aed1b6
|
Merge pull request #3493 from owncloud/bumpversion
Bump version for files_encryption changes
|
2013-05-25 10:20:42 -07:00 |
|
Michael Gapczynski
|
2893bb9543
|
Bump version for files_encryption changes
|
2013-05-25 11:42:28 -04:00 |
Frank Karlitschek
|
29c8cbf4d1
|
increase version and add warning
|
2013-05-25 12:08:18 +02:00 |
|
Jenkins for ownCloud
|
6a6c18dfab
|
[tx-robot] updated from transifex
|
2013-05-25 02:11:52 +02:00 |
|
Florin Peter
|
fba7200b05
|
improved trashbin test again
|
2013-05-24 23:12:16 +02:00 |
|
Florin Peter
|
b32823a96e
|
improved trashbin test
|
2013-05-24 23:12:07 +02:00 |
|
Thomas Mueller
|
1f9ac7850d
|
meanwhile phpunit is seq faulting with mysql as well
|
2013-05-24 21:50:34 +02:00 |
|
Thomas Müller
|
ae9adcaf8c
|
Merge pull request #3482 from owncloud/fix_helper
use the recoveryPassword var instead of accessing the POST array
|
2013-05-24 10:20:00 -07:00 |
|
Björn Schießle
|
f56802a437
|
no use the recoveryPassword var instead of accessing the POST array
|
2013-05-24 18:37:58 +02:00 |
|
Björn Schießle
|
5ce4149e75
|
fix first time encryption after app was enabled
|
2013-05-24 17:35:00 +02:00 |
|
Thomas Müller
|
39603b193b
|
Merge pull request #3479 from owncloud/testing-oracle-on-master
adding Oracle support to autotest.sh
|
2013-05-24 07:32:54 -07:00 |
|
Thomas Mueller
|
a753d14de9
|
adding Oracle support to autotest.sh
|
2013-05-24 15:19:13 +02:00 |
davidak
|
56006ea852
|
small typo fix: added 2 whitespaces
|
2013-05-24 14:31:06 +02:00 |
|
Thomas Müller
|
4911305887
|
Merge pull request #3416 from owncloud/files_encryption
New files encryption app
|
2013-05-24 02:21:19 -07:00 |
Alessandro Cosentino
|
3fbfe3c06a
|
small typo in the comments
|
2013-05-23 20:59:02 -04:00 |
|
Michael Gapczynski
|
a98d6c4be6
|
Merge pull request #3425 from owncloud/move-storages
Support for moving/copying folders between storages
|
2013-05-23 17:35:11 -07:00 |
|
Jenkins for ownCloud
|
b47729c5fc
|
[tx-robot] updated from transifex
|
2013-05-24 02:02:43 +02:00 |
|
Florin Peter
|
6c8de5ae6d
|
fixes after review from @DeepDiver1975
|
2013-05-23 23:56:31 +02:00 |
|
Florin Peter
|
adc930d9f9
|
added l10n support in apps/files_encryption/ajax/adminrecovery.php
|
2013-05-23 22:09:28 +02:00 |
|
Björn Schießle
|
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 |
|
Björn Schießle
|
a9ebf2aabe
|
fix public link share if a user is logged in
|
2013-05-23 20:30:07 +02:00 |
|
Michael Gapczynski
|
30330b4343
|
Merge branch 'master' into move-storages
Conflicts:
tests/lib/files/view.php
|
2013-05-23 10:25:12 -04:00 |
|
Michael Gapczynski
|
3b6d850e59
|
Switch to calling deleteAll via storage to avoid emitting delete hook
|
2013-05-23 10:23:16 -04:00 |
|
Björn Schießle
|
cb79169cf5
|
Merge branch 'master' into files_encryption
|
2013-05-23 11:11:57 +02:00 |
|
Jenkins for ownCloud
|
698862519d
|
[tx-robot] updated from transifex
|
2013-05-23 02:00:27 +02:00 |
|
Michael Gapczynski
|
1cfc9d269e
|
Merge pull request #3457 from owncloud/fix-share-links
Fix public links
|
2013-05-22 15:20:15 -07:00 |
|
Florin Peter
|
46c784ccdf
|
added trash bin tests
|
2013-05-22 23:51:35 +02:00 |
|
Florin Peter
|
842d0608f1
|
added static function registerHooks() for better unit tests handling
|
2013-05-22 23:50:45 +02:00 |
|
Michael Gapczynski
|
9b622bdeed
|
RUNTIME_NOSETUPFS no longer exists, using tearDownFS() in public links instead
|
2013-05-22 15:02:11 -04:00 |
|
Björn Schießle
|
b2aa97f166
|
revert changes to .gitmodules, they were applied by accident
|
2013-05-22 18:30:29 +02:00 |
|
Björn Schießle
|
1bd42762ae
|
revert submodule changes
|
2013-05-22 18:28:44 +02:00 |
|
Björn Schießle
|
80dea1a8c5
|
settings clean-up; There is no blacklist in the new encryption app
|
2013-05-22 18:05:12 +02:00 |
|
Björn Schießle
|
15a3ae6db1
|
improved error messages
|
2013-05-22 18:01:18 +02:00 |
|
Björn Schießle
|
ee53bd1aa3
|
Merge branch 'master' into files_encryption
Conflicts:
lib/files/cache/cache.php
|
2013-05-22 15:29:22 +02:00 |
|
Thomas Müller
|
26732ecaa6
|
Merge pull request #3337 from owncloud/oracle_fixes
Oracle fixes
|
2013-05-22 05:20:04 -07:00 |
Jörn Friedrich Dreyer
|
1f1abe595d
|
cleanup codestyle
|
2013-05-22 13:59:08 +02:00 |
|
Jörn Friedrich Dreyer
|
cbd5eb9a1a
|
use to_char only for oracle, whitespace
|
2013-05-22 13:59:07 +02:00 |
|
Jörn Friedrich Dreyer
|
eceb3c8ed5
|
add debug output
|
2013-05-22 13:59:07 +02:00 |
|
Jörn Friedrich Dreyer
|
1b68c0c0cd
|
allow install when only oracle is available
|
2013-05-22 13:56:57 +02:00 |