Sam Tuke
d95fc4e1e3
Adding sharing support: added new method in Keymanager setShareKey()
...
Added notes in proxy{} and stream{} pointing to share support
2013-01-14 19:07:28 +00:00
Sam Tuke
1641ed8ac7
Merge branch 'master' into files_encryption
2013-01-14 16:54:25 +00:00
Sam Tuke
e9f3c5feea
Added creation of dir for shared file env encryption keys
...
Added comment to use multiKeyEncrypt
2013-01-14 15:39:04 +00:00
Sam Tuke
3fbf362ba2
Removed debugging comments
2013-01-14 12:36:46 +00:00
Björn Schießle
cd802ed45b
Merge branch 'master' of github.com:owncloud/core
2013-01-14 10:33:17 +01:00
Björn Schießle
e0173303e6
merge conflict fixed, settings-personal.php is no longer needed
...
Conflicts:
apps/files_versions/templates/settings-personal.php
2013-01-14 10:24:40 +01:00
Jenkins for ownCloud
c29310aaef
[tx-robot] updated from transifex
2013-01-14 00:18:21 +01:00
Jenkins for ownCloud
981fd5e424
[tx-robot] updated from transifex
2013-01-13 00:08:40 +01:00
Jenkins for ownCloud
ad64ce189d
[tx-robot] updated from transifex
2013-01-12 00:10:58 +01:00
Björn Schießle
d276d21c76
- code clean-up
...
- some more code comments
- fixed bug in the expire function, cleanup all_versions array during run. Otherwise it could happen that we try to delete already deleted versions
2013-01-11 19:33:54 +01:00
Björn Schießle
99a0ea44ee
function description fixed
2013-01-11 14:24:00 +01:00
Björn Schießle
67d00bc6bb
some more clean-up, isVersioned() is no longer needed; rename hook fixed if a complete folder gets renamed
2013-01-11 14:23:28 +01:00
Björn Schießle
6be9c0a974
some code clean-up
2013-01-11 11:12:32 +01:00
Thomas Müller
60489764f3
Merge pull request #1133 from owncloud/add_linebreaks_in_sharing
...
add more linebreaks, replace SQL LIMIT with param
2013-01-10 15:14:14 -08:00
Jenkins for ownCloud
d03dce1283
[tx-robot] updated from transifex
2013-01-11 00:06:14 +01:00
Sam Tuke
fed74eda1c
Removed old and unnecessary comments
2013-01-10 18:48:40 +00:00
Sam Tuke
2e30641caa
Removed misleading crypto gen comment
2013-01-10 18:19:37 +00:00
Sam Tuke
9ca9124dc1
Merge branch 'master' into files_encryption
2013-01-10 18:07:15 +00:00
Sam Tuke
61104d1441
Re-added 'checkAdminUser'
...
Improved code formatting
2013-01-10 18:04:52 +00:00
Björn Schießle
dca0fda2ad
keep track of the size of the versions directory
2013-01-10 18:04:30 +01:00
Thomas Müller
23dd7f1bea
Merge pull request #1127 from owncloud/fixing-641-for-webdav-master
...
webdav returns "503 Service Unavailable" in case the ownCloud server is ...
2013-01-10 02:27:00 -08:00
Björn Schießle
417498d519
add complete size of versions to array
2013-01-10 10:36:55 +01:00
Jenkins for ownCloud
912050afa0
[tx-robot] updated from transifex
2013-01-10 00:05:53 +01:00
Lukas Reschke
fda1ada4f0
Merge pull request #1131 from owncloud/more_translations
...
translate move and rename error messages
2013-01-09 12:07:39 -08:00
Lukas Reschke
ca027f3749
Merge pull request #1124 from schiesbn/sabredav2
...
OC_Connector_Sabre_Client no longer needed
2013-01-09 12:06:25 -08:00
Björn Schießle
d51fba7781
every 1000s run reduce the number of versions for all files, not only for the currently edited file
2013-01-09 17:11:46 +01:00
Jörn Friedrich Dreyer
42e3eaf45a
add more linebreaks, replace SQL LIMIT with param
2013-01-09 13:57:51 +01:00
Jörn Friedrich Dreyer
a40c95242f
more translations
2013-01-09 12:48:57 +01:00
Thomas Mueller
ccdaec6296
webdav returns "503 Service Unavailable" in case the ownCloud server is currently in maintenance mode.
2013-01-09 00:37:50 +01:00
Jenkins for ownCloud
533f0e8e25
[tx-robot] updated from transifex
2013-01-09 00:05:49 +01:00
Thomas Tanghus
dae8f15f9f
Merge pull request #938 from owncloud/fix_minor_files_annoyances
...
Fix minor files annoyances
2013-01-08 15:02:06 -08:00
Björn Schießle
43415386a8
Upstream merged my patch to add additional ssl root certificates to the webdav client.
...
This means that OC_Connector_Sabre_Client is no longer needed
2013-01-08 17:44:28 +01:00
Thomas Mueller
7b9e6d2f2c
fixing string concatenation in javascript
...
refs ae54364d7c
2013-01-08 00:32:41 +01:00
Jenkins for ownCloud
b69328e1d1
[tx-robot] updated from transifex
2013-01-08 00:31:36 +01:00
Frank Karlitschek
861f32a22b
Update apps/user_webdavauth/user_webdavauth.php
...
Fixing wrong documentation. Fixes https://github.com/owncloud/core/issues/1110
2013-01-07 16:45:03 +01:00
Björn Schießle
a0b0a1d294
adjust timestamp of the file copied from the version history
2013-01-07 15:13:32 +01:00
Jörn Friedrich Dreyer
3bb7ee521f
attach max upload tipsy to div instead of a to fix tooltip not showing due to new z-index
2013-01-07 12:23:29 +01:00
Björn Schießle
619c3ef56d
use limits defined in issue https://github.com/owncloud/core/issues/860
2013-01-07 12:06:31 +01:00
Jörn Friedrich Dreyer
da442b024c
remove aborted uploads
2013-01-07 11:11:21 +01:00
Jörn Friedrich Dreyer
cbb118d4a3
adapt to isFileNameValid, whitespace cleanup
2013-01-07 10:39:35 +01:00
Jenkins for ownCloud
0b007235b9
[tx-robot] updated from transifex
2013-01-07 00:06:32 +01:00
Thomas Mueller
9671ace32e
Merge branch 'master' into fix_minor_files_annoyances
...
Conflicts:
apps/files/js/files.js
2013-01-06 22:46:40 +01:00
Sam Tuke
a68b597e83
Merge branch 'master' into files_encryption
2013-01-06 18:53:32 +00:00
Sam Tuke
015787fbb3
All in-use unit tests now passing after merge
2013-01-06 18:38:35 +00:00
Sam Tuke
2d98afa1ea
Removed debugging line
2013-01-06 14:06:22 +00:00
Sam Tuke
b024db9f98
Made Keymanager::getFileKey() dependencies explicit, fixed client code and tests accordingly
2013-01-06 13:56:45 +00:00
Thomas Mueller
b4191b7da5
rename containsInvalidCharacters() to isFileNameValid() - NOTE: semantic has changed!
...
adding file name checks and notifications to isFileNameValid() for . and empty file name
2013-01-06 12:52:00 +01:00
Sam Tuke
69e86c0213
Merge branch 'master' into files_encryption
2013-01-05 17:22:01 +00:00
Sam Tuke
7fe9245636
Development snapshot
...
Crypt{} & Util{} unit tests now passing locally
Added keymanager unit tests
2013-01-05 17:12:23 +00:00
Robin Appelman
a5dcbc3d8a
Files: prevent people from renaming files to '.'
2013-01-05 03:30:05 +01:00
