Daniel Molkentin
2961c44bbe
NSIS: look for socketapiclient in the right place
2014-07-03 09:35:45 +02:00
Daniel Molkentin
997559dc6d
NSIS: fix typo
2014-07-03 09:17:08 +02:00
Jenkins for ownCloud
79d28bbc35
[tx-robot] updated from transifex
2014-07-03 01:25:24 -04:00
Daniel Molkentin
6bc425f981
NSIS: Add socketapiclient
2014-07-02 12:05:23 +02:00
Daniel Molkentin
2cdfc16829
SocketAPI: rename test client binary to socketapiclient
2014-07-02 12:03:52 +02:00
Daniel Molkentin
e63d45cca9
SocketAPI: put binary into bin/ dir
2014-07-02 11:15:39 +02:00
Daniel Molkentin
553f186b7c
SocketAPI: Build test client with Qt5
2014-07-02 11:11:11 +02:00
Daniel Molkentin
623dfc0286
Socket API: Add test client
2014-07-02 10:10:32 +02:00
Jenkins for ownCloud
ffa7f35a87
[tx-robot] updated from transifex
2014-07-02 01:25:30 -04:00
Olivier Goffart
081b7d4aa9
Merge pull request #1913 from owncloud/typo-fix
...
Typo fix
2014-07-01 20:39:30 +02:00
Olivier Goffart
9c3c4bac66
Merge remote-tracking branch 'origin/il'
2014-07-01 20:37:42 +02:00
Daniel Molkentin
6ec218ef11
FF docs submodules
2014-07-01 16:24:34 +02:00
Daniel Molkentin
ad2eabeb3b
SocketAPI: Try to make the folder selection work on windows
2014-07-01 16:24:14 +02:00
Daniel Molkentin
26c377d05b
Utility: export new functions
2014-06-30 14:13:45 +02:00
Jenkins for ownCloud
caa75d98be
[tx-robot] updated from transifex
2014-06-30 01:25:23 -04:00
Volkan Gezer
3ad9356ca4
Typo fix
2014-06-29 14:14:44 +02:00
Volkan Gezer
dd5296f03c
Typo fix
...
Suggested by [mnestis](https://www.transifex.com/accounts/profile/mnestis/ )
2014-06-29 14:06:45 +02:00
Volkan Gezer
e673d76f22
Typo fix
...
Suggested by [mnestis](https://www.transifex.com/accounts/profile/mnestis/ )
2014-06-29 14:04:30 +02:00
Volkan Gezer
393eb7bb4d
Typo fix
...
Suggested by [mnestis](https://www.transifex.com/accounts/profile/mnestis/ )
2014-06-29 14:02:50 +02:00
Jenkins for ownCloud
2fa5a5b8c3
[tx-robot] updated from transifex
2014-06-29 01:25:23 -04:00
Jenkins for ownCloud
ca63b79ed8
[tx-robot] updated from transifex
2014-06-28 01:25:25 -04:00
Daniel Molkentin
f8b097669a
Merge remote-tracking branch 'origin/1.6'
...
Conflicts:
VERSION.cmake
doc/building.rst
2014-06-27 15:34:20 +02:00
Olivier Goffart
2f284209d8
Permissions: When moving is not allowed, fallback to delete and upload
...
We decided that we never want to rename a directory behind the
back of the user as the user may be using files in the directory
during the sync.
If moving is not allowed, we just erase the inode form the database so
the next sync will try to do an upload and delete and recover from there
using normal resolution.
This also add some code to update the inode back to the db when it is detected
as changed.
2014-06-27 15:30:08 +02:00
Olivier Goffart
09881040a3
Permissions: fix restoring subdirectories
...
The sync item vector must be sorted before we call checkForPermission
2014-06-27 13:34:15 +02:00
Olivier Goffart
9066ad5790
t7.pl: Test that deleting a directory restores it and all its sub directories
2014-06-27 11:31:35 +02:00
Olivier Goffart
62d0e670dc
Add t7.pl Test for operation of files with restrictions
2014-06-27 11:22:53 +02:00
Jenkins for ownCloud
e7d597045b
[tx-robot] updated from transifex
2014-06-27 02:06:13 -04:00
Jenkins for ownCloud
eaa3a2eae2
[tx-robot] updated from transifex
2014-06-27 01:25:23 -04:00
Klaas Freitag
40d765c73a
Remove version suffix, final release 1.6.1
2014-06-26 16:09:21 +02:00
Olivier Goffart
21d7d8988a
t1.pl: add a sleep to make sure the mtime of the files are different
...
It could be that the files are changed in the same second if the previous
sync was fast, and therefore the changes not detected.
2014-06-26 13:11:47 +02:00
Klaas Freitag
e76386be4f
Revert "ownCloudcmd: Use Account object and ConnectionValidator."
...
We decided that owncloudcmd should not share the config with mirall.
This reverts commit 5f96de32bb
2014-06-26 10:16:56 +02:00
Jenkins for ownCloud
b3b3ca0e16
[tx-robot] updated from transifex
2014-06-26 02:06:14 -04:00
Jenkins for ownCloud
730e86c4cd
[tx-robot] updated from transifex
2014-06-26 01:25:24 -04:00
Daniel Molkentin
23e0af5cc1
Documentation update from Mark.
2014-06-25 22:04:33 +02:00
Jenkins for ownCloud
a92f1cb055
[tx-robot] updated from transifex
2014-06-25 06:34:41 -04:00
Jenkins for ownCloud
a54162e009
[tx-robot] updated from transifex
2014-06-25 06:31:32 -04:00
Olivier Goffart
48864a6921
httpcredentials: Remove useless mutex
...
The mutex is not shared with any thread, so it is totaly useless.
Yes: there are possible races here. (with the account, but also with the
user and password)
2014-06-25 12:15:30 +02:00
Olivier Goffart
92f07cb60f
Enable C++11
...
In order to avoid the warning
warning: anonymous variadic macros were introduced in C99
Due to the use of variadic macro in the qDebug macro in Qt 5.3
C++11 requires a space between string literal and macro to avoid the
ambiguity with user defined litteral
2014-06-25 12:01:27 +02:00
Klaas Freitag
e17243bc1f
AccountMigrator: Read path from QDir::fromNativeSeperators(), add debug.
2014-06-25 11:38:08 +02:00
Klaas Freitag
0e45dd7a3d
AccountMigrator: Do not inherit from QObject as it is not needed yet.
...
As requested by Danimos review.
2014-06-25 11:38:08 +02:00
Klaas Freitag
65f313f1b4
Account: Added missing include statement.
2014-06-25 11:38:08 +02:00
Klaas Freitag
da4958c716
Account: Read settings from ownCloud config if no branded exists.
...
If there is not yet a config for a branded client, but one for the
"normal" client targetting the same URL, it will be migrated.
2014-06-25 11:38:08 +02:00
Klaas Freitag
653b8494f5
FolderMan: Migrate folderlist if no folder definitions can be found
...
and the account indicates that it was migrated. In that case,
read the folder definitions from the ownCloud config directory.
2014-06-25 11:38:08 +02:00
Klaas Freitag
6ed6f84f6e
Account: Add a wasMigrated flag.
...
If an account in a branded client was migrated from a former ownCloud
configuration, the method wasMigrated() will return true.
2014-06-25 11:38:08 +02:00
Klaas Freitag
ff0ba56bc3
ownCloud Theme: Implement appName() and appNameGUI().
2014-06-25 11:38:08 +02:00
Klaas Freitag
e795d04f30
cfg migration: Add a account migrator class.
2014-06-25 11:38:08 +02:00
Klaas Freitag
8d3806b080
folderman: make escapeAlias public as its now used in accountmigrator.
2014-06-25 11:38:08 +02:00
Klaas Freitag
5597ebe455
Account: Add a scoped pointer to the ownCloud theme.
2014-06-25 11:38:07 +02:00
Klaas Freitag
5f96de32bb
ownCloudcmd: Use Account object and ConnectionValidator.
...
That reads the credentials from the mirall config file if it was not
defined on the command line. Moreover, the connection is validated
before, which sets up the credentials properly.
2014-06-24 15:33:42 +02:00
Klaas Freitag
d2436ce23d
Networkjobs: Check if reply body is empty before parsing.
...
This avoids a false warning that the result is not valid JSON.
2014-06-24 15:17:33 +02:00
