ckamm
4decd15ca9
Merge pull request #2161 from ckamm/stale-downloadinfo
...
Clean up stale journal entries and temporaries. #2057
2014-09-04 14:14:39 +02:00
ckamm
3a59dd24f3
Merge pull request #2162 from ckamm/error-missing-exclude
...
Don't do a broken sync when the system exclude file is missing
2014-09-04 14:14:07 +02:00
Olivier Goffart
c232411e96
uploading: make sure to cast to uint64 to avoid integer overflow
2014-09-04 13:46:01 +02:00
Christian Kamm
1cf1f6edcb
Fix style issues.
2014-09-04 13:27:11 +02:00
Christian Kamm
5d36a27893
Clean up stale journal entries and temporaries. #2057
...
* Downloadinfo entries for files that no longer need to be downloaded
are useless and can be removed. In particular, the temporary files
holding partially retrieved files are now deleted when no longer
necessary.
* The same is true for blacklist entries for paths that are no longer
being discovered.
* Same for uploadinfos for files that no longer need to be uploaded.
2014-09-04 13:14:15 +02:00
Christian Kamm
da94533647
Folders: Signout should not switch folders to paused state. #2112
...
On signout, syncs that are running in folders are aborted. That used to
also switch the state of these folders to 'paused'. To fix that, aborts
that are caused by user actions no longer change the folder paused
state.
Aborts due to errors should still pause folders! Otherwise we'd try
resyncing them even though there was an error.
2014-09-04 11:21:28 +02:00
Jenkins for ownCloud
db08d5021e
[tx-robot] updated from transifex
2014-09-04 01:25:25 -04:00
Markus Goetz
69066013c1
ownCloudTheme: Fix casing in appName()
...
Without this fix, the section in the config file uses the wrong name,
leading to re-configuration of the client needed.
2014-09-03 17:30:34 +02:00
Christian Kamm
aef569ee9d
SyncEngine: Use exclude file fallback next to binary on linux.
...
This is mainly useful for developers where the system-wide exclude file
may not exist.
2014-09-03 14:53:01 +02:00
Christian Kamm
cf881aa6dc
SyncEngine: Fix invalid slot name in sync error condition.
2014-09-03 14:52:55 +02:00
Christian Kamm
a48bf3142c
SyncEngine: Abort sync with error if system exclude file is missing.
...
Syncing without the system exclude file would cause lots of trouble.
For instance we would try uploading the temporary files we store
partially completed downloads in.
2014-09-03 14:52:46 +02:00
Jenkins for ownCloud
33d9f4b882
[tx-robot] updated from transifex
2014-09-03 01:25:21 -04:00
Markus Goetz
49c40a4b11
OS X: Have the PKG installer also be signed
2014-09-02 17:57:22 +02:00
Markus Goetz
d1eff0ae24
OS X: Add sign_app.sh
2014-09-02 16:14:00 +02:00
Daniel Molkentin
c0131695c5
Return from Folder::slotPollTimerTimeout() if the account object is 0
...
Right now, we crash instead. This can happen if a folder is created
when an account object is not (anymore/yet) created.
Fixes #2142
2014-09-02 14:51:33 +02:00
Daniel Molkentin
fcbadda40f
Make Settings Window close on Ctrl+W
...
Fixes #2141
(cherry picked from commit 2ab19b23d7
)
2014-09-02 14:03:20 +02:00
Daniel Molkentin
2455faa6fe
Account Migrator: Switch to string comparison for URLs.
...
QUrl does not normalize trailing slashes, so there is no benefit
of using QUrl here.
(cherry picked from commit d770f9cc1a
)
2014-09-02 14:03:07 +02:00
Markus Goetz
7da8a5e374
OS X: Create tbz in create_mac_pkg.sh
...
Sparkle needs this
2014-09-02 12:15:11 +02:00
Jenkins for ownCloud
b3950165c4
[tx-robot] updated from transifex
2014-09-01 15:47:58 -04:00
Jenkins for ownCloud
b8ab859c59
[tx-robot] updated from transifex
2014-09-01 01:25:19 -04:00
Jenkins for ownCloud
99a3cb0eab
[tx-robot] updated from transifex
2014-08-31 13:00:41 -04:00
Markus Goetz
0be4b59cff
Sparkle: Keep permissions from bundle
2014-08-31 18:57:39 +02:00
Jenkins for ownCloud
fef37b0222
[tx-robot] updated from transifex
2014-08-31 02:06:16 -04:00
hefee
ddfc7c75df
Fix minor Python styling issues
...
* Do not use sapces inside parenthesis
* make indend PEP8
* empty lines should not contain whitespaces
2014-08-31 00:35:56 +02:00
David Prévot
7618f29657
Fix minor Python syntax errors
...
The installation fails because of these:
TabError: inconsistent use of tabs and spaces in indentation
SyntaxError: Missing parentheses in call to 'print'
2014-08-31 00:28:25 +02:00
Olivier Goffart
291231c561
Merge missing commits from 1.6.2-themefix into 1.7
...
Conflicts:
VERSION.cmake
2014-08-30 17:57:58 +02:00
Dominik Schmidt
7ad557f2f8
Add crash reporter to osx package and don't build it with BUILD_LIBRARIES_ONLY enabled
2014-08-30 14:45:39 +02:00
Dominik Schmidt
ef70052b0e
Package installer if it was built
2014-08-30 14:12:40 +02:00
Dominik Schmidt
202426f536
Make crash reporter application name branded
2014-08-30 11:05:52 +02:00
Dominik Schmidt
d240415671
Make crash reporter logo branded
2014-08-30 11:05:34 +02:00
Dominik Schmidt
1aca22b5f8
Make crash reporter executable branded
2014-08-30 10:46:09 +02:00
Jenkins for ownCloud
ff970ee3f5
[tx-robot] updated from transifex
2014-08-30 02:06:15 -04:00
Jenkins for ownCloud
51a46a8ad7
[tx-robot] updated from transifex
2014-08-30 01:25:30 -04:00
hefee
68792ee9db
Fixing spellingerror
...
GNU Public License -> GNU General Public License
2014-08-30 02:18:55 +02:00
Klaas Freitag
bcff1ced5e
Merge branch '1.7'
...
Conflicts:
src/CMakeLists.txt
src/cmd/cmd.cpp
src/gui/folderman.cpp
src/gui/wizard/owncloudadvancedsetuppage.cpp
src/libsync/account.cpp
2014-08-29 20:40:33 +02:00
Klaas Freitag
7ce2a93c63
Merge remote-tracking branch 'origin/reuse_oc_config' into 1.7
...
Conflicts:
src/CMakeLists.txt
src/mirall/folderman.cpp
src/mirall/folderman.h
src/mirall/owncloudtheme.h
2014-08-29 20:23:07 +02:00
Klaas Freitag
4d33773cef
Nautilus Overlays: Rename icons according to branding.
...
Added a script that renames the icons and patches the python file for
nautilus.
2014-08-29 20:02:52 +02:00
Olivier Goffart
5d19426930
Propagator: When the server don't support ranges, reset the counter so the progress is not messed up
...
Issue #2081
2014-08-29 19:33:20 +02:00
Olivier Goffart
1b51a10b19
Socket API: be consistant in the VERSION command and add the VERSION at the beginning
2014-08-29 17:28:36 +02:00
Olivier Goffart
aab870af32
desktop file: add a Comment
...
Fixes #2130
2014-08-29 17:14:40 +02:00
Dominik Schmidt
38ff7d87c8
Hide crashreporter config option if not build with crashreporter enabled
2014-08-29 17:07:31 +02:00
Markus Goetz
7c70ada423
Exclude List: Gnucash temp files
...
Fixes #2045
2014-08-29 16:45:08 +02:00
Markus Goetz
12e2bac16b
Propagator: Also parse OC-ETag header
...
Client side part of https://github.com/owncloud/core/issues/9005
2014-08-29 16:30:58 +02:00
Olivier Goffart
34a27c748a
Progress: in case of resuming chunks, advance directly at startup by the amount of chunk already done
...
Fixes #2103
2014-08-29 16:06:56 +02:00
Markus Goetz
7ec0c52439
Poll URL: Use trimmed() on response
2014-08-29 13:58:33 +02:00
Jenkins for ownCloud
905dd20d0c
[tx-robot] updated from transifex
2014-08-29 01:25:25 -04:00
Olivier Goffart
a73fbccf8c
t4.pl: add a test to test that ignored file are not deleted
2014-08-28 19:33:52 +02:00
Klaas Freitag
7f1d707d23
ownCloud Theme: Do not have the oCSetupTop custom media, see #1445
2014-08-28 18:10:53 +02:00
Klaas Freitag
f1fb36bcb8
Tests: Get rid of the Carp package that ogoffart does not have.
...
Recommendation: Use a decent distribution! But anyway....
2014-08-28 18:10:53 +02:00
Daniel Molkentin
25c274a0bd
X11: Bring Settings window to front when launched
2014-08-28 17:25:00 +02:00