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
Jocelyn Turcotte
c85ace11dd
Allow the OSX build to work without make install
...
Also deploy sync-exclude.lst to the build directory in this case.
2015-07-28 15:19:09 +02:00
Klaas Freitag
b07ab14c31
Merge pull request #3470 from rullzer/use_ocs_url
...
If the OCS Share API returns an url use that
2015-07-28 14:26:23 +02:00
Klaas Freitag
c95bbe27e7
Merge pull request #3495 from rullzer/dont_share_root
...
Don't allow sharing of the root folder
2015-07-28 14:00:38 +02:00
Olivier Goffart
d9c52f6316
owncloudcmd: fix --httpproxy
...
It was only used for csync, but not for QNAM
Issue #3465
2015-07-28 13:33:58 +02:00
Olivier Goffart
ec86d1a151
Wizards: allow adding a folder in a non-existing directory and create that folder
...
The owncloud wizard already created the directory, but the recent addition
of FolderMan::checkPathValidityForNewFolder stopped allowing unexisting directories.
So change FolderMan::checkPathValidityForNewFolder to allow non existing directory
and whange the FolderWizard to create the directory if it does not exist.
Issue #3492
2015-07-28 12:14:52 +02:00
Olivier Goffart
22013eb528
ConfigFile: remove some unused functions
2015-07-28 12:05:34 +02:00
Roeland Jago Douma
6c8ff7c61a
Added capabilities class
2015-07-28 12:04:24 +02:00
Olivier Goffart
4016e0863f
Fix warning
2015-07-28 11:20:22 +02:00
Klaas Freitag
3b510969a2
Fix test, make it independent on the sort order of readdir.
2015-07-27 13:28:21 +02:00
Olivier Goffart
28ab3666d3
Tests: Some tests need QtWidgets
2015-07-27 11:04:49 +02:00
Olivier Goffart
ff6c11f126
Confirm feature: tray noticiation message when a new folder need to be confirmed
...
Issue #3148
2015-07-27 10:33:05 +02:00
Olivier Goffart
45b598cacb
Confirm feature: default to 500MB
...
Issue #3148
2015-07-27 10:04:53 +02:00
Olivier Goffart
0ccaae9a22
Confirm feature: Confirm for any folder, not only shared ones
...
issue #3148
2015-07-27 09:54:20 +02:00
Roeland Jago Douma
6f498aea3b
Do not open the share dialog if the user tries to share the root folder
2015-07-24 10:10:41 +02:00
Roeland Jago Douma
a2f9ba47fb
If the OCS Share API returns an url use that
...
To avoid us having to construct the URL for public shares just rely on the
server to do it.
This makes it easier to maintain. For example if (in the not do distat future)
the index.php part is removed the server would just server this new url.
2015-07-23 21:10:53 +02:00
Markus Goetz
fea997c84a
Bandwidth Limit: Fix new "Automatic Download" setting #1485
2015-07-23 13:46:42 +02:00
Klaas Freitag
316427c801
Merge branch 'regular_update_check'
...
Conflicts:
src/gui/application.cpp
src/gui/application.h
src/gui/updater/ocupdater.h
2015-07-23 11:34:12 +02:00
Klaas Freitag
c34641f4f7
Updater: Added a class UpdaterSchedule.
...
It schedules the regular update checks. Keeps Application and
other classes easy.
2015-07-22 13:44:19 +02:00
Klaas Freitag
21f7cea609
ConfigFile: Let updateCheckInterval return int instead of quint64.
...
QTimer wants that in setInterval()
2015-07-22 13:42:54 +02:00
Markus Goetz
59a7ae56d4
UI: Add more tooltips #3385
2015-07-20 19:06:40 +02:00
Markus Goetz
a58cb049b2
OS X: Fix layout of quota info in SettingsDialog
2015-07-20 18:43:18 +02:00
Markus Goetz
a6f493ff94
OS X Overlay Icons: Use waitForFinished() with timeout
2015-07-20 18:32:02 +02:00
Markus Goetz
afed400ac6
SettingsDialog: Make bigger and more native on OS X
...
On OS X, the width of the dialog must not change, only its height.
2015-07-20 18:16:33 +02:00
Klaas Freitag
89b8555aa7
PassiveUpdateNotifier: Fix condition on when to show the update.
2015-07-20 15:33:44 +02:00
Klaas Freitag
320cc1c7dd
Updater: Avoid to show the update notification to often.
...
If the update is only available through the system, the notification
is only shown once.
2015-07-20 15:33:17 +02:00
Klaas Freitag
0a08a51a41
Updater: really do not forget to start the updater timer.
2015-07-20 15:32:27 +02:00
Klaas Freitag
b22e284191
Application: Remove unused connection to updater.
2015-07-20 15:32:00 +02:00
Klaas Freitag
adc239c9d0
UpdateCheck: Clean up Application class and move most to updater.
...
Add the update timer also to the update class and remove all the
proxy slots from the Application class.
2015-07-20 12:17:31 +02:00
Klaas Freitag
681466213f
ConfigFile: Return proper type for update check interval.
2015-07-20 12:10:30 +02:00
Klaas Freitag
cb4bfd8060
ConfigFile: Fix spelling.
2015-07-20 12:10:00 +02:00
Olivier Goffart
a9dfcdd463
FolderDefinition: fix uninitialized variable
2015-07-19 11:33:17 +02:00
