7240d349da
Merge branch 'master' into encryption_initial_enc_indicator
2013-11-26 19:15:53 +01:00
1fef97f6a5
Merge pull request #6060 from owncloud/fix-6050-oc6
...
fixing getRawPathInfo() once more
2013-11-26 10:13:58 -08:00
7d1f67b7a9
db-doc: storages description
2013-11-26 18:57:39 +01:00
a018dacac2
db-doc: appconfig description
2013-11-26 18:39:19 +01:00
e2ca88af5e
Merge pull request #6066 from owncloud/extstorage-sftp-overwriteonrename
...
Fixed SFTP storage to overwrite on rename
2013-11-26 09:01:41 -08:00
c7e1fe50c2
added a small version of the dark loading gif, looks nicer on the blue background
2013-11-26 17:14:16 +01:00
52941341fd
fixing failing unit test
2013-11-26 16:52:33 +01:00
fb7aa2f014
[tx-robot] updated from transifex
2013-11-26 10:47:07 -05:00
d9a98b126e
Merge pull request #6065 from owncloud/l10n-update
...
Translate reload message after update
2013-11-26 07:45:22 -08:00
30e086fb53
Fixed SFTP storage to overwrite on rename
2013-11-26 16:32:44 +01:00
81f6be92ef
Translate reload message after update
...
fixes #6064
2013-11-26 16:22:01 +01:00
2653d914d9
Merge pull request #6008 from owncloud/extstorage-smb-webdav-renamefix
...
Fixed SMB rename function to overwrite target file
2013-11-26 06:42:36 -08:00
dbd8128c07
Merge pull request #6059 from owncloud/occ-repair
...
Add a (currently) empty system for running common repair steps
2013-11-26 06:09:45 -08:00
2a93720f3f
fixes #6050
2013-11-26 14:13:33 +01:00
10d84f6e9b
Add a (currently) empty system for running common repair steps
2013-11-26 14:12:48 +01:00
eca9f69282
Merge pull request #6053 from owncloud/remove_passwords_from_log
...
remove passwords from logfile
2013-11-26 04:53:02 -08:00
16ce56553c
Merge pull request #6056 from owncloud/check_login
...
check if user is logged in
2013-11-26 04:50:43 -08:00
a48fc120d0
Merge pull request #6054 from owncloud/extstorage-dropboxfixes
...
Fixed various Dropbox issues + unit tests
2013-11-26 04:48:54 -08:00
5cb1ce4a28
Merge pull request #6057 from owncloud/extstorage-touchoperation
...
Return true when touch succeeds
2013-11-26 04:40:25 -08:00
5d2299eab8
only create complete share key if we know the exact path
2013-11-26 13:30:59 +01:00
69518b9013
Make sure Avatar is set from LDAP upon first login, not later, but also not before due to missing user folder
2013-11-26 12:57:39 +01:00
712b47757a
Updated unit tests for SMB
...
- coverage for touch return value
- fixed directory provider to exclude unsupported cases
2013-11-26 12:53:03 +01:00
2556647a10
check if user is logged in
2013-11-26 12:47:59 +01:00
e102eec89a
Return true when touch succeeds
2013-11-26 12:47:00 +01:00
62afe7fe7a
remove passwords from logfile
2013-11-26 12:26:32 +01:00
06df3822a0
Timestamp test is no longer necessary as we rely on Doctrine and DateTime.
2013-11-26 12:22:08 +01:00
3bbaba1eca
Use the Doctrine to convert date string to DateTime object.
2013-11-26 12:21:31 +01:00
a330b2ef9b
Use DateTime object instead of fixed format date string.
...
Use a DateTime object and have conversion handled by Doctrine instead of using
a date string with a fixed format.
2013-11-26 12:00:31 +01:00
7c81ac3d28
Fixed various Dropbox issues + unit tests
...
- fixed touch function to return true on success
- fixed local metadata cache to remove deleted files/directories
- fixed getMetaData() to ignore files reported as deleted by
Dropbox
- fixed "file not found" case to not log as exception
- fixed "overwrite on rename" case
- fixed unit tests to exclude unsupported cases
- added unit test for touch return value
- unit tests for Dropbox should all run correctly now
2013-11-26 11:59:36 +01:00
9fb1da2811
Use bindValue() instead of passing parameters in execute().
2013-11-26 11:50:14 +01:00
0617e06f69
use POST instead of GET
2013-11-26 11:38:49 +01:00
35a6ad255d
fix typo in var name
2013-11-26 11:38:45 +01:00
dc67c7efa9
[tx-robot] updated from transifex
2013-11-26 04:04:05 -05:00
faf14b4c79
Merge pull request #5937 from owncloud/calc_version_size
...
use oc filesystem operations to calc the versions size
2013-11-25 23:36:18 -08:00
46dff0677d
Merge branch 'master' into calc_version_size
2013-11-26 00:03:54 +01:00
8974107b4e
remove debug output
2013-11-25 23:57:08 +01:00
d6fb2afa85
show a message at the log-in screen if inital encryption take place
2013-11-25 23:49:05 +01:00
5310a5924b
Merge pull request #6044 from owncloud/extstorage-ftpunittestfix
...
Fixed FTP storage unit tests to use the correct class
2013-11-25 14:21:34 -08:00
d7d7d9b8e3
Merge pull request #6036 from owncloud/single-user-mode
...
Add "single user mode"
2013-11-25 14:10:07 -08:00
03375d6c52
LDAP: username2dn should only return DNs that belong to the current LDAP server. Might be not perfect. Easy perfect solution would increase communication with LDAP server. Let's see if it is good enough
2013-11-25 22:08:11 +01:00
3955388f20
LDAP: proxy: configurable return to determine when to try the next LDAP server and when to return (multi server setup)
2013-11-25 22:05:00 +01:00
9fbccc83e3
merge master into single-user-mode
2013-11-25 21:25:04 +01:00
844b4785f1
Merge pull request #6034 from owncloud/fix-api-documentation
...
Fix api documentation
2013-11-25 11:17:16 -08:00
4626fae882
Merge pull request #6038 from owncloud/occ-app-enable
...
add occ commands for enabling and disabling apps
2013-11-25 10:12:49 -08:00
c3e34676ba
Improved unit test for "overwrite on move"
...
Now using a different content to make sure the file was overwritten.
2013-11-25 18:54:58 +01:00
af7118aa5d
Added unit test for "overwrite file on rename/move"
...
Also fixed "rename" unit test that was ready the result out of the wrong
file.
2013-11-25 18:52:14 +01:00
944d4156bf
Fixed FTP storage unit tests to use the correct class
2013-11-25 18:44:34 +01:00
abe63bd329
Add occ command to list all apps
2013-11-25 17:34:16 +01:00
fc1d897ea5
rename app_id to app-id
2013-11-25 17:28:01 +01:00
4b67d4258d
Merge pull request #6035 from owncloud/fixing-rawpath-reverseproxy-oc6
...
Fixing rawpath reverseproxy oc6
2013-11-25 08:21:33 -08:00
Bjoern Schiessle
Björn Schießle
Andreas Fischer
Vincent Petry
Thomas Müller
Morris Jobke
Robin Appelman
Arthur Schiwon
Owen Winkler
icewind1991
Jörn Friedrich Dreyer