chylex/Nextcloud-Desktop
1
0
Fork 0
mirror of https://github.com/chylex/Nextcloud-Desktop.git synced 2026-10-05 11:53:35 +02:00
Code Activity
14,674 Commits 4 Branches 173 Tags
v2.7.0-beta3
Commit Graph
14674 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Daniel Molkentin b8a4a2d2f7 Add ChangeLog 2014-02-25 18:11:04 +01:00
Markus Goetz c7e70533a0 Shibboleth: Detect also QNAM redirects 
If a QNAM job (e.g. Quota or ETag job) gets redirected,
we'll invalidate and then prompt to re-fetch the credentials
from the user.
(The keychain credentials will be wrong so they get deleted)
 2014-02-25 14:22:55 +01:00
Daniel Molkentin d4fa06c4e1 Fix potential crash in c_iconv on Mac OS X 2014-02-25 12:48:40 +01:00
Markus Goetz 065690c2ce Shibboleth: Have proper invalidation if timeout during sync 2014-02-25 09:33:28 +01:00
Jenkins for ownCloud 3cb6fc82dd [tx-robot] updated from transifex 2014-02-25 02:07:10 -05:00
Mr. Jenkins 7d398b20f2 [tx-robot] updated from transifex 2014-02-25 01:26:24 -05:00
Olivier Goffart 75cff87316 add missing copyright header 2014-02-24 19:32:41 +01:00
Markus Goetz b56843ead2 Account: Fix Metatype registratition 2014-02-24 15:31:11 +01:00
Markus Goetz 51b5f3c9b2 Propfind Job: Print redirect URL in log 2014-02-24 15:20:49 +01:00
Daniel Molkentin 7f508c0718 Account needs qRegisterMetaType 2014-02-24 14:56:57 +01:00
Daniel Molkentin 45a7d4ff4c Fix Wizard when returning from later steps 
We need to reset the credential type when
returning to the first page from later steps.
Otherwise, unfinished credential instances
and their NAM will try to fetch data, which
will fail with weird symptoms.
 2014-02-24 14:56:57 +01:00
Daniel Molkentin 995e8938ad SSLButton: Fix certificate display 2014-02-24 14:56:56 +01:00
Olivier Goffart 1e43d1fa49 Add missing license headers in tests 
LGPL for csync tests,  GPL for mirall tests
 2014-02-24 11:08:58 +01:00
Mr. Jenkins b03e49f492 [tx-robot] updated from transifex 2014-02-23 01:26:46 -05:00
Mr. Jenkins 3ed5f43e90 [tx-robot] updated from transifex 2014-02-22 01:26:39 -05:00
Daniel Molkentin 5c1d612761 Account settings: Set correct state icon right away 2014-02-21 21:02:35 +01:00
Olivier Goffart f92cf3dee3 ammand last commit 
We should not close the directory twice in the normal case
 2014-02-21 19:09:38 +01:00
Olivier Goffart a71cb1d3ef Fix potential crash in case of abort while update: 
We need to reset ctx->remote.read_from_db  BEFORE caling vio_closedir
Otherwise, it may interpret the handle as a 'bdtree' handle instead of
a owncloud handle.

Should fix #1442
 2014-02-21 16:57:24 +01:00
Markus Goetz 4630244b51 Windows: Special case csync_vio_local_stat 
By not calling tstat _and_ GetFileInformationByHandle, but only
GetFileInformationByHandle, we can save some precious msec in the local
update phase.
 2014-02-21 14:15:34 +01:00
Olivier Goffart cd13144415 Fix adding a file in a Shared readonly directory 
It should not create a conflict in that case.

Also when editing a file, create a conflict using the normal way,
after downloading the file and checking it is not the same
 2014-02-21 10:53:09 +01:00
Daniel Molkentin 67c07c4daa bump to 1.5.2 2014-02-21 09:56:04 +01:00
Mr. Jenkins 7ec534067e [tx-robot] updated from transifex 2014-02-21 01:26:44 -05:00
Daniel Molkentin 8e7290b450 Fix online state handling 
Before this commit, parts of mirall were aware of the state, but not all.
Also, the state was not set back to Connected again in all cases. This
commit introduces the following changes:

- Make QuotaInfo a member of Account
- QuotaInfo and Folder (EtagJob) can put the client in disconnected mode
- FolderMan now disables etag-polling when offline

Fixes #1459
Fixes #1441
 2014-02-20 23:24:03 +01:00
Daniel Molkentin b51a722347 Fix German translation for branch 2014-02-20 23:23:46 +01:00
Daniel Molkentin 30d0e2fee8 Remove stray debug 2014-02-20 23:23:46 +01:00
dragotin c38c3ce6e2 Merge pull request #1450 from owncloud/remove-file-string 
remove 'File' word from notification
 2014-02-20 17:31:57 +01:00
Klaas Freitag 04647b0d61 Handle empty passwords returning from the keychain read procedure. 
This is needed if the keychain does not have the an QSettings based
fallback any more.
 2014-02-20 16:53:38 +01:00
Klaas Freitag e991bcd112 Do not store the password in the config file. Erase it if it is there. 
This fixes bug #1458
 2014-02-20 14:35:02 +01:00
Mr. Jenkins aa02ce2481 [tx-robot] updated from transifex 2014-02-20 03:17:59 -05:00
Markus Goetz 6a55324261 OwncloudCmd: Struct needs to be zeroed 
Else the --silent was always true on Windows where memory did not get
zeroed.
 2014-02-19 17:50:15 +01:00
Markus Goetz f1fa1f125d Fix previous commit 2014-02-19 17:39:11 +01:00
Klaas Freitag 82afb3b613 If a file in a read only share was edited, restore and create conflict. 
This fixes bug #1448
 2014-02-19 17:21:43 +01:00
Markus Goetz 141f005c34 Ignore conflict files all the time 
The OwncloudCmd currently does not load the exclude files.
It is safer to just always ignore conflict files.
 2014-02-19 17:16:10 +01:00
Mr. Jenkins e32ca49c31 [tx-robot] updated from transifex 2014-02-19 09:42:10 -05:00
Olivier Goffart f5e16540a1 Merge branch '1.5' 
Conflicts:
	src/mirall/owncloudpropagator.cpp
 2014-02-19 15:38:03 +01:00
Daniel Molkentin 726b41b0c7 Shib: Close browser window after login 2014-02-19 15:34:43 +01:00
Olivier Goffart e74f0f2854 Better support when user remove or rename the Shared directory 2014-02-19 15:23:36 +01:00
Markus Goetz 65ffe53c20 Register metatype at better place 2014-02-19 14:53:31 +01:00
Markus Goetz 06f2989ac8 Fix build on Qt4 
Unfortunately I had to remove the 'static'
 2014-02-19 13:29:00 +01:00
Olivier Goffart a51f050a08 More fix for moving shared directories 
Abort a directory job if the first job fails

Also make sure the jobs are in the directory job of their destination paths
 2014-02-19 13:08:35 +01:00
Markus Goetz 399b08ad40 OwncloudCmd: Register a meta type 2014-02-19 12:00:38 +01:00
Olivier Goffart 5b561e4462 Use AUTOMOC 
This should also fix the compilation of owncloudcmd.cpp
Since we have a Q_OBJECT in a .cpp file and qt_wrap_cpp would not generate
the moc file.
 2014-02-19 11:55:08 +01:00
Olivier Goffart 1be322579c Merge remote-tracking branch 'origin/master' 
Conflicts:
	src/owncloudcmd/owncloudcmd.cpp
 2014-02-19 11:19:56 +01:00
Markus Goetz b7c7c9f3eb Accountsettings: Fix warning 2014-02-19 10:59:57 +01:00
Markus Goetz 9237293cc0 OwncloudCmd: Fixup URL 
Allow users to specify owncloud(s) or http(s)
 2014-02-19 10:57:29 +01:00
Markus Goetz 63083a558b OwncloudCmd: Print update phase duration values 2014-02-19 10:51:04 +01:00
Olivier Goffart d4bd327fef Merge branch 'parallel_upload' 
Conflicts:
	src/mirall/csyncthread.cpp
 2014-02-19 10:24:34 +01:00
Olivier Goffart 2de288c5f3 Merge remote-tracking branch 'origin/1.5' 
Conflicts:
	VERSION.cmake
 2014-02-19 10:21:23 +01:00
Markus Goetz fcc0e89044 Update phase: Allow benchmarking / progress update 2014-02-18 21:41:20 +01:00
Jan-Christoph Borchardt 8267b9e590 remove 'File' word from notification 2014-02-18 18:42:49 +01:00