Olivier Goffart
b470d0f7b8
Folderman: make the backup number starts with 2: #3512
2015-08-05 10:46:33 +02:00
Jenkins for ownCloud
c73a97a17c
[tx-robot] updated from transifex
2015-08-05 02:19:02 -04:00
Markus Goetz
f6cd2c79d5
CSync: Proper error for invalid filenames #2777 #3128 #2240
2015-08-04 22:13:38 +02:00
Markus Goetz
a7b0f7b42e
check_vio_ext: Fix on OS X
2015-08-04 17:25:48 +02:00
Markus Goetz
ad9ef0493e
FolderManTest: Make compile
2015-08-04 16:55:10 +02:00
Olivier Goffart
46964b1b87
Merge pull request #3549 from phil-davis/patch-1
...
Notify of big folders that are greater than or equal to the limit
2015-08-04 16:07:18 +02:00
Phil Davis
8216727553
Notify of big folders that are greater than or equal to the limit
...
This should allow for the case when a user has set the limit to 0 and a new empty folder appears on the server. The folder will have size 0 (no files in it). Doing the >= test here will mean that the user will be prompted about the new folder, which I think is the behaviour they would expect.
The side-effect of this change is that if the user has a limit of, for example, 10,000,000 and a new folder comes along with exactly 10,000,000 of content then they will now be prompted about it. Before the change such a new folder would have been auto-synced without prompting the user. I do not think this is a big deal - I cannot believe that users will be counting exact bytes for this limit, they are just setting a rough number of MB at the UI.
Should fix https://github.com/owncloud/client/issues/3542
2015-08-04 19:28:23 +05:45
Daniel Molkentin
864bf33f10
NSIS: Elevate uninstaller, too
...
Resolves #3546
2015-08-04 12:38:29 +02:00
Markus Goetz
514372db6b
Exclude list: Add entries from other sync programs #2814
2015-08-04 09:40:53 +02:00
Jenkins for ownCloud
45a6436b6d
[tx-robot] updated from transifex
2015-08-04 02:19:00 -04:00
Daniel Molkentin
db8b919099
NSIS: add polish translation
2015-08-03 20:02:11 +02:00
Daniel Molkentin
18efb21157
win32: libwebp has been bumped to version 5
2015-08-03 19:24:01 +02:00
Markus Goetz
89ebad895d
Merge pull request #3540 from aputtu/patch-2
...
Minor typo: Ingored -> Ignored
2015-08-03 17:44:11 +02:00
Aputsiaĸ Niels Janussen
cd19ee5020
Minor typo: Ingored -> Ignored
...
Issue raised by user 'kant' in Transifex on the 1st of August.
2015-08-03 17:35:58 +02:00
Markus Goetz
7da4a081d3
Startup: Don't notify other instance when session restored #3070
2015-08-03 17:32:41 +02:00
Jenkins for ownCloud
32d0d0b33d
[tx-robot] updated from transifex
2015-08-03 02:18:47 -04:00
Jenkins for ownCloud
61e4c3db3a
[tx-robot] updated from transifex
2015-08-02 02:18:57 -04:00
Jenkins for ownCloud
0c9de83a79
[tx-robot] updated from transifex
2015-08-01 13:10:44 -04:00
Daniel Molkentin
f15236acb7
remove stay file
2015-08-01 18:48:00 +02:00
Daniel Molkentin
51a4190192
Merge branch 'new_nsis_modules'
2015-08-01 18:47:26 +02:00
Markus Goetz
d51bd94447
FolderMan: Fix up previous commit #3528
2015-07-31 18:31:54 +02:00
Daniel Molkentin
f66ebb2f1e
NSIS: Actually call the elevation wrapper
2015-07-31 18:25:17 +02:00
Daniel Molkentin
b8d21bdd51
Merge remote-tracking branch 'origin/master' into new_nsis_modules
2015-07-31 18:20:27 +02:00
Markus Goetz
a501bf5b83
FolderMan: Use sync() on config after migration #3528
2015-07-31 17:10:12 +02:00
Markus Goetz
cdb556e404
Reconcile: Improve debug output
2015-07-31 16:43:47 +02:00
Daniel Molkentin
e21ddfedcb
Merge pull request #3513 from owncloud/fix_nautilus_plugin
...
Fix nautilus plugin
2015-07-31 16:06:21 +02:00
Markus Goetz
1e72ea45dd
OS X: Fix enabling overlays for branded clients #3463
2015-07-31 15:13:14 +02:00
Markus Goetz
0a93dc5e63
OS X Settings Dialog: Two-lined account name #3516
2015-07-31 14:56:14 +02:00
Markus Goetz
eafc45d83c
CheckServerJob: Only show SSL ticket warning when actually suceeded
2015-07-30 18:16:37 +02:00
Vincent Petry
79d895ed9e
cmd: properly initialize random seed to avoid transferid collisions #3522
2015-07-30 18:08:28 +02:00
Markus Goetz
fd5330b469
Propagator: Log chunk transferid
2015-07-30 17:47:06 +02:00
Klaas Freitag
817a165da7
utility: Put the config include to top of includes.
2015-07-30 16:38:30 +02:00
Klaas Freitag
0c5528806d
csync cmake: Removed not needed define of DATADIR.
2015-07-30 16:38:30 +02:00
Klaas Freitag
6992631c4c
cmake: rather use SHAREDIR than DATADIR define.
...
DATADIR is a reserved structure name in win32, using it like us here
leads to very nifty compile problems. SHAREDIR is clean.
2015-07-30 16:38:30 +02:00
Markus Goetz
7fc7925d17
Propagator: Don't corrupt file with broken webserver #3373
2015-07-30 14:40:24 +02:00
Markus Goetz
f01b7bb5db
Propagator: More debug output for downloads/uploads
2015-07-30 14:40:24 +02:00
Markus Goetz
48dac23b0f
Folder: Version debug at end
...
Often users send us parts of logs with this information missing.
2015-07-30 14:40:24 +02:00
Markus Goetz
7f8e9a0e70
Sparkleupdater: Use qDebug not qWarning
...
Else QT_FATAL_WARNINGS triggers.
2015-07-30 14:40:24 +02:00
Klaas Freitag
527fd1ac47
Capabilities: Add macro to make win compile again.
2015-07-30 11:04:49 +02:00
Olivier Goffart
795922e2a0
Fix compilation with old GCC
...
that does not understand nullptr
Note that we can't just replace nullptr by 0 in createIndex otherwise
it would be ambiguious.
So leave it commented to show that your intention is to create it with
a null pointer (which is the default because of the default parameter)
2015-07-30 10:44:07 +02:00
Daniel Molkentin
6d3f607396
NSIS: Add conversions for polish and slavic languages
2015-07-29 14:50:24 +02:00
Olivier Goffart
3b261bc612
Wizard: Make the name of the backup folder more user friendly
...
Issue #3512
2015-07-29 12:23:33 +02:00
Olivier Goffart
07ddf18b3b
Account Capabilities: style fixup
...
- Remove the copy constructor. The default constructor is fine. Having
a user defined copy constructor inhibit the move constructor.
- Pass QVariantMap arguments via const references
- Do not return a pointer to Capabilities from the account. It is a
value type and should not be used by pointer.
2015-07-29 12:07:57 +02:00
Jürgen Weigert
0642e63246
Merge pull request #3232 from flocke/master
...
[Unix] Install architecture-independent files to DATADIR.
DATADIR is already used elsewhere. So this even adds consistency!
Thanks!
2015-07-29 12:00:48 +02:00
Markus Goetz
dccaba98af
Merge pull request #3439 from rullzer/use_caps
...
Use server capabilities for share dialog
2015-07-29 11:50:35 +02:00
Klaas Freitag
cbbc5af834
Nautilus Shell Integration: Re-Assemble the whole filename after split.
...
The socketapi uses the colon as delimiter, which splits files that contain
a colon. This patch re-assembles the filename again in case that happened.
2015-07-29 11:47:00 +02:00
Klaas Freitag
b012fae144
Nautilus Shell Integration: Only show menu entry for item state OK
...
If the file is ignored or errornous, do not add the sharing menu item to
the context menu.
This is (a partly) solution to bug ä2775
2015-07-29 11:29:10 +02:00
Jocelyn Turcotte
ed51358478
shell_i: Activate the finder integration on install #3463
...
This makes sure that users won't have to go into settings
to activate the extension. This might upset users by forcing
them to re-disable it on each oC upgrade, but if this becomes
an issue we should then make this configurable in the client's
settings itself.
2015-07-28 17:58:17 +02:00
Jocelyn Turcotte
6d522a1467
Fix the tests build on OS X in debug
2015-07-28 15:19:09 +02:00
Jocelyn Turcotte
73209717ec
Update the qtmacgoodies submodule
...
Include a fix for an assert.
2015-07-28 15:19:09 +02:00
