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
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
hefee
68792ee9db
Fixing spellingerror
...
GNU Public License -> GNU General Public License
2014-08-30 02:18:55 +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
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
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
Olivier Goffart
d4bbd28757
csync: remove ignored_cleanup: it's not used anymore
2014-08-28 17:16:51 +02:00
Olivier Goffart
98b7248df0
reconcile/update: don't remove directory that contains ignored files
2014-08-28 17:16:17 +02:00
Olivier Goffart
0fb0f2c204
Selective sync: start a sync when the selective sync settings changes
2014-08-28 16:27:46 +02:00
Olivier Goffart
79d13d9242
Selective sync: deselecting a folder removes it from the local file system
2014-08-28 15:53:49 +02:00
Markus Goetz
b6f42a91f4
OS X: Fix Finder bundle NVTY->OWNC
2014-08-28 15:45:07 +02:00
Daniel Molkentin
cc5f5cf3a6
Set the minimum supported OS X version to 10.7
...
We dropped 10.6 support quite a while ago.
This should avoid bug reports from 10.6 users.
Fixes #2122
2014-08-28 14:50:00 +02:00
Olivier Goffart
79f00c2a2a
Wizard: adjust alignements
2014-08-28 13:32:14 +02:00
Olivier Goffart
e5068e7543
Selective sync: if one click twice on the button in the wizard, it should keep the blacklist
2014-08-28 12:25:44 +02:00
Olivier Goffart
858218ac34
Wizard: new layout
2014-08-28 12:18:19 +02:00
Markus Goetz
d69049ce10
OS X: Fix Finder plugin
2014-08-28 10:21:56 +02:00
Daniel Molkentin
59a9cc7c12
OS X build: use correct macro for version number
2014-08-28 00:08:24 +02:00
Markus Goetz
2f34b046d0
Overlay Icons: Improve OS X version, improve general feedback
...
Now the update phase of the syncing algorithm pushes stuff the notification socket too.
2014-08-27 19:15:43 +02:00
Olivier Goffart
a73316306d
Selective sync: new design in the wizard
2014-08-27 19:03:11 +02:00
Olivier Goffart
928652e4cf
Selective sync: rename the button 'choose what to sync'
2014-08-27 17:31:57 +02:00
Olivier Goffart
7950b49cb1
Selective sync dialog: fix fetching sub directory when the folder is not the root folder
2014-08-27 17:19:36 +02:00
Markus Goetz
f8b1b243c1
OS X: Fix installer target name if we have a build number
2014-08-27 14:44:21 +02:00
Klaas Freitag
cc6aa66ab0
JournalDB: Do prepare the queries even if the db update failed.
...
Also, add more logging in case SQL errors happen while db structure
update.
2014-08-27 14:01:33 +02:00
Olivier Goffart
ea381392a7
SocketAPI: fix the BROADCAST message
2014-08-27 13:55:06 +02:00
Olivier Goffart
bb7f63dcfd
AccountSettings: be less verbose in the status string
2014-08-27 13:51:14 +02:00
Olivier Goffart
253d65727b
Socket api: Add a VERSION command
2014-08-27 13:51:14 +02:00
Markus Goetz
61138b58bf
OS X: Quote the installer filename
...
Viel hilft viel
2014-08-27 12:49:22 +02:00
Markus Goetz
5490063b7e
OS X: Fix installer creation
...
The script should know independently of the machine
2014-08-27 12:02:57 +02:00
Klaas Freitag
d2e1489fe7
Propagator: Set the chunk size to 20MB as requested by Matt.
2014-08-27 10:35:58 +02:00