e5ad1b27b4
Settings dialog: show the first account page at start
2015-04-28 11:39:27 +02:00
92e259c276
Add folder: Do not add at other accounts folder to know if you can add a folder
2015-04-28 11:29:35 +02:00
f81918173b
Account settings: show the folder of the right account
2015-04-27 19:09:48 +02:00
4006bcdaed
Wizard: Setup the folder in the right account
2015-04-27 17:43:07 +02:00
3e4886725a
Folder: remove the member references to the FolderDefinition members
2015-04-27 17:33:59 +02:00
f688bda759
Wizard: Save the settings after adding an account
...
So the account persist even if the client is not properly closed
2015-04-27 17:19:46 +02:00
ac855858de
owncloud gui: move a comment where it belongs
...
The code was moved long time ago in commit ea1c95100
2015-04-27 17:14:25 +02:00
23dc464ea2
Folderman: Fix crash when adding an account
...
Clang is picky if we forget to return a value
2015-04-27 14:34:39 +02:00
04382c467b
Progress: Fix broken signal connection
2015-04-27 12:34:15 +02:00
be1b39067d
Merge branch 'master' into new-ui
2015-04-27 12:32:12 +02:00
ddfb7f3b7a
Merge remote-tracking branch 'origin/1.8'
2015-04-27 12:20:11 +02:00
78e82eb920
AccountWizard: Fix auth error handling. #3155
...
The problem was that on network error the networkError() and
finishedWithError() signals both fired. To fix it, I collapse all
error handing into a slot triggered by finishedWithError().
I tested the redirection case and the invalid credentials case.
2015-04-24 16:03:28 +02:00
27159104a9
Folders: Store inside account config.
2015-04-24 13:42:35 +02:00
a13a974e2d
Account: Generate shorter account ids.
2015-04-24 09:54:42 +02:00
f184d66ea2
Save and restore multiple accounts.
2015-04-23 16:08:20 +02:00
11927d625d
Fix crash on exit by not making Account parent of AccountState.
2015-04-23 16:08:20 +02:00
d64373c610
Never use 'new Account' directly, prefer Account::create()
2015-04-23 15:47:49 +02:00
28306e5dfb
Move AccountState::displayName to Account.
2015-04-23 15:47:49 +02:00
89bb58ac30
Ensure 'user' is available early enough for ui in httpcreds
2015-04-23 15:47:49 +02:00
3cc2e1a968
Fix bad connect/disconnects.
2015-04-23 14:24:54 +02:00
8390b0b930
Determine right account in ownCloudGui::slotShowShareDialog
2015-04-23 14:14:28 +02:00
dbddabfcd7
Remove SelectiveSyncText
...
It is unused and there were compiler warnings about it not
appearing it various switch() statements.
2015-04-23 14:13:33 +02:00
0d30e01e98
Add explanations to fixmes
2015-04-23 14:13:13 +02:00
137bce6dd0
Folder: Clear _syncResult better
...
I had a situation here where we were showing stale desktop notifications when a remote folder
errored out and then sync finished with _syncResult data from previous sync.
2015-04-23 13:30:30 +02:00
68bf22f469
Revert "AccountSettings: Update progress only twice per second. #3014 "
...
This reverts commit 0f33e266ce#3014 .
2015-04-22 11:46:00 +02:00
96ecdb866d
Time estimate: Refactor remaining time guess. #2328
2015-04-22 11:20:31 +02:00
7d68c628db
Time estimation: Use a consistent check for size dependence. #2328
2015-04-22 10:45:41 +02:00
0f33e266ce
AccountSettings: Update progress only twice per second. #3014
2015-04-22 10:45:41 +02:00
6c5ca055c4
ShareDialog: Unused/invalid forward declaration
2015-04-21 10:33:38 +02:00
cf5100a20b
Merge remote-tracking branch 'origin/1.8'
2015-04-20 14:58:45 +02:00
b039c2ce86
More change to compile with 5.5
...
The problem is again that QStringList no longer include QDataStream
2015-04-20 09:47:25 +02:00
12d7484b85
Pass SyncFileItems by pointer instead of by value
...
Use a QSharedPointer to keep the same ownership and
continue passing the SyncFileItems as a const& when
ownership isn't taken. This allows sharing the same
allocations between the jobs and the result vectors.
This saves about 20MB of memory (off 120MB) once all
jobs are created.
2015-04-18 14:26:40 +02:00
a932eac832
Multi-account WIP
2015-04-17 17:56:17 +02:00
155c965866
Prevent another crash in ~SocketApi #3118
...
Since the QLocalServer parent of the QLocalSockets gets destroyed
after the _listeners QList, onLostConnection might try to update
an already destroyed list.
Fix the issue by simply making sure that _localServer is destroyed
first.
2015-04-17 12:42:40 +02:00
2da3bfb96f
Merge branch 'master' into new-ui
2015-04-16 12:50:21 +02:00
5dffd11755
Merge branch '1.8'
2015-04-16 12:49:31 +02:00
ed80a712ab
Sort folder sizes SelectiveSyncTreeView numerically
...
Fixes #3112
2015-04-14 20:00:42 +02:00
9d8fc4aa4d
ProtocolWidget: Fix adding of seconds. #2535
2015-04-10 12:11:35 +02:00
57ac1d9ea2
AuthRedirect: Use the configured DAV path. #3082
2015-04-10 09:24:25 +02:00
d9ea6936ab
Handle redirect of auth request. #3082
2015-04-10 09:18:15 +02:00
afdd01488f
AccountManager: Move out of libsync
...
The AccountManager does not belong in the libsync because it is not
part of the synchronisation algorithm, but is just an helper class
for the UI to maintain the account and read/save the config
2015-04-09 16:19:17 +02:00
f3cb5f8a9d
Merge remote-tracking branch 'origin/1.8'
2015-04-09 14:24:26 +02:00
85ff245aef
Account settings: add the progress back on the new ui
2015-04-09 12:06:47 +02:00
5a83636f81
Only show share dialog if we are connected.
2015-04-08 09:53:57 +02:00
760e11bc5d
Sharedialog: Fix compiler warnings.
2015-04-08 08:59:36 +02:00
4a6f4919d7
More GUI refinements.
2015-04-07 13:38:01 +02:00
b98040c7d5
ShareDialog: handle resize properly with elided text
2015-04-07 13:38:01 +02:00
1240a8163d
ShareDialog: Some GUI rework requested by Jan.
2015-04-07 13:38:01 +02:00
50ba73860c
Merge remote-tracking branch into 1.8
2015-04-07 08:02:55 +02:00
750cdc1910
AbstractSslErrorHandler: Also give QSslConfiguration
2015-04-06 21:46:03 +02:00
f4e2c84111
AccountState: Fix uninitialized memory access spotted by valgrind
...
QuotaInfo's constructor uses the AccountState's _state which is
initialized after
2015-04-06 16:21:05 +02:00
c2fd7d6ebd
Clean up remains of SOCKETAPI_TCP
2015-04-01 15:03:42 +02:00
4a893c5267
Fix a crash on shutdown in ~SocketApi #3057
...
Deleting the QLocalSocket while iterating the QList with qDeleteAll
would trigger onLostConnection, which would modify the list mid-air
and leave dangling pointers in it.
2015-04-01 15:03:42 +02:00
2473183f19
Windows: Add version information for owncloud.exe
...
This should help us know what version or build number a crash report was generated with.
2015-04-01 15:03:41 +02:00
f2fa812b0b
Updater: Give context as to which app is about to be updated
...
Fixes #3040
2015-03-30 14:44:34 +02:00
426d2338d9
Settings: New UI that intergate the selective sync within the account settings
2015-03-27 16:50:35 +01:00
ea985a85af
ProtocolWidget: Always add seconds to the DateTime locale. #2535
2015-03-27 11:25:30 +01:00
dfd9d8725c
Merge remote-tracking branch 'origin/1.8'
...
Conflicts:
doc/installing.rst
2015-03-27 11:19:59 +01:00
2a8c23aac3
Account: Destroy on exit.
...
During shutdown we want the account object to be deleted and
therefore we need to be able to remove the strong reference
in AccountManager.
2015-03-27 10:43:14 +01:00
4b56cc6e08
On creation of a share always retrieve the share
...
This makes sure that if a default expiration date is set this is reflected in
the dialog. #2889
2015-03-26 13:48:33 +01:00
e0ae34f01b
SslButton: Make menu creation lazy
...
Saves ~200msec on my not-so-old MBP on OS X.
For #3007 #2990
2015-03-25 15:41:23 +01:00
a202203325
Proxy: Fix issues with previous patch
...
This is for #2993 and #2802
2015-03-25 12:25:49 +01:00
83c3d76966
Proxy: Look up system proxy from different thread
...
We should actually upstream this into QNAM.
This is for #2993 and #2802
2015-03-25 08:52:23 +01:00
9c05150c12
SSLButton: Fix a crash
...
Made with danimo.
Attempt to fix a crash seen on breakpad reports.
(cc06b990-0c10-40eb-bcec-4d3902150320)
2015-03-23 18:30:53 +01:00
c7eb85ef78
Activity: Correctly restore column sizes
...
Fixes : #3005
2015-03-23 18:22:25 +01:00
4df455f2e0
Add-folder Wizard: Select the newly created folder
2015-03-23 16:50:37 +01:00
653a00d63d
Add-folder wizard: Make sure there is a scrollbar if folder names are too long
...
Fixes #2962
2015-03-23 16:32:41 +01:00
e81d1ab9b8
application: --confdir option with invalid direcotry now exit
...
Show an error and exit if an invalid directory (eg, a file) is passed to --confdir
Fixes : #2453
2015-03-23 15:02:27 +01:00
9d7cf6b852
Merge remote-tracking branch 'origin/1.8'
2015-03-23 14:37:16 +01:00
57c14a0eba
Windows: Reset QNAM as a workaround. #2899 #2895 #2973
...
The QNetworkAccessManager is reset when we are disconnected, just
before attempting to fetch the server's status.php.
This may help fix the problem described in various issues where we
get 'Connection closed' or timeout errors after the OS has woken
from sleep.
2015-03-19 11:40:47 +01:00
5264a8c7f6
shell_integration: Fix disappearing context menus on Windows #2898
...
Since each new connection to the socket API would trigger a broadcast
of REGISTER_PATH to all existing connections, opening the context menu
would trigger a SHChangeNotify call of the root directory through
the overlay icon extension, which is currently also connected to the
socket API, waiting for changes.
Fix the issue by sending the initial REGISTER_PATH automatic response
only to the connecting socket.
2015-03-13 20:53:59 +01:00
457f9b587d
Merge remote-tracking branch 'origin/1.8'
...
Conflicts:
src/gui/sharedialog.cpp
src/gui/sharedialog.h
2015-03-13 14:03:03 +01:00
95f299f865
Remote folder wizard: Add optional manual entry #2613
2015-03-13 09:52:21 +01:00
e93c1ccb73
Install the crash handler earlier during startup
...
This moves the crash handler installation during the OCC::Application
contruction. This still leaves a window where crashes wouldn't be
caught, leaving the QtSingleApplication and theme initialization
code unreported, but isn't requiring any refactoring for now.
Issue #2952
2015-03-12 17:16:05 +01:00
d0f07ee3a9
FolderMan: fix folderSyncStateChange emission. #2896
...
It was not emitted when a removed folder finished its sync,
and that left the UI in an old state sometimes.
Removing the Folder explicitly is unnecessary as a QSignalMapper
will automatically remove mappings for deleted QObjects.
2015-03-12 10:00:45 +01:00
3992fba168
Activity: Set a message for conflicts. #2792
...
Also show size when conflicting files are downloaded.
2015-03-12 10:00:45 +01:00
f13dfc19a0
OS X: Fix UI glitches related to sync folder
...
For #2113 and #2947
2015-03-11 16:42:12 +01:00
0fccf5e50d
Completely disable the crash handler if the user disabled it
...
The config currently only disable the reporter, but still leaves
the crash handler installed on startup. This causes conflicts
when running those builds in lldb.
Work around the issue by requiring the crash reporter to be
disabled in the settings before owncloud can be run in lldb.
This has the negative side-effect of not covering the
initial ConfigFile loading with the crash handler.
Issue #2946
2015-03-11 15:49:49 +01:00
a2aab28ba6
ShareDialog: Connect the proper DateEdit signal.
2015-03-11 15:46:05 +01:00
8e7b7caf04
ShareDialog: If the password is empty, disable button
2015-03-11 14:57:55 +01:00
8cc5ff0e70
ShareDialog: Consider if resharing is not allowed on a share.
...
If a file or directory is shared without resharing permission, the
share dialog displays an error. This is not the optimal solution, but
best for now, as we do not have the permissions available for the file
manager plugin.
This fixes #2923
2015-03-11 14:12:08 +01:00
9086f09fe2
SocketAPI: If filename has a trailing slash, remove it.
...
The SyncJournal stores the the names of directories without trailing slash.
2015-03-11 14:11:18 +01:00
efe9f1b442
Lnk: Work around QFile::rename() #2792
...
QFile::rename() fails if the source file is a shortcut to a file
or directory that does not exist.
2015-03-11 12:29:33 +01:00
071177cee2
Output a more sensible error message for auth errors
2015-03-10 12:14:14 +01:00
c88742fad3
Revert "SetupW: Display proper error messages if password or user was wrong."
...
This reverts commit 396f38598f
2015-03-10 11:17:35 +01:00
31e4009737
Propagator: Use QBA for responseTimestamp instead of QString
2015-03-09 15:52:52 +01:00
b09e08c06f
ShareDialog: Made it less "webbish" for better usability.
...
- Check the share checkbox automatically on open of the dialog
- Use the date picker with popping up calendar
- Proper initial size
- no resizing and appearing and disappearing.
Fixes probably #2917 , also #2764
2015-03-09 14:33:02 +01:00
396f38598f
SetupW: Display proper error messages if password or user was wrong.
...
If the password or user was wrong during setup, the client showed a
ConnectionClosed error instead of a proper Username or password wrong
message. This was because in HTTPCredentials::slotAuthentication, the
reply is closed, and a property is set to indicate the auth problem.
This patch now checks at all occurences of networkErrors if it might
have been an authentication problem, and displays something useful.
There is a good chance that this is a sufficient fix for
owncloud/enterprise#556
2015-03-06 16:41:59 +01:00
4d85f1daec
setup wizard: use a PROPFIND instead of a GET on the webdav url
...
In order to initiate the conneciton, we should not send a GET on the
webdav URL because that is not a valid webdav command on a collection.
Issue #2911
2015-03-03 16:03:53 +01:00
bd6769a3fd
LsColJob: one must now specify the properties
...
So the discovery phase don't ask for the quota, and the selective sync
don't ask for all the other properties
Issue #2906
2015-03-02 11:03:25 +01:00
05624e3fc8
FileSystem: Remove QFileInfo based implementations.
...
QFileInfo has to be refreshed if the underlying file has been
modified in between. That is dangerous so ckamm and me decided
to eliminate the QFileInfo based implementations.
This was triggered by a bug that the client uploaded files that
it should not have.
2015-02-27 15:27:49 +01:00
e381143a8f
Ensure good sync state if in-progress folder is deleted. #2896
...
The slotFolderSyncFinished() didn't reliably trigger because
the folder was being deleted before the syncFinished signal could
fire.
2015-02-27 12:39:19 +01:00
b03209ccef
Inform user about ignored long files. #2882
2015-02-27 12:12:39 +01:00
8507aba9f8
SocketAPI: Append trailing slash for directories in UPDATE_VIEW.
...
This fixes #2233
2015-02-26 16:41:55 +01:00
c8167b77c9
Remove mention of allprop #2865
2015-02-26 12:36:11 +01:00
c37792f58f
Propagator: Upload files with future timestamps. #2880
2015-02-26 11:00:06 +01:00
842e5ba5e0
Sharing: Fix for folders containing &. #2892
2015-02-26 09:58:09 +01:00
fba9020950
Added copyright header
2015-02-25 18:32:25 +01:00
506cc3908a
Add proper copyright headers to some files, fixes #2869
2015-02-25 17:00:27 +01:00
ca00b02b0a
ShareDialog: Improve some GUI, fix #2850
...
This improves some wording and fixes some show/hide issues with password
setting.
2015-02-25 13:44:27 +01:00
201075827f
Sharedialog: Add a Share button.
2015-02-25 13:44:27 +01:00
5c7fd24ea8
Handle 503 due to maintenance more gracefully. #2884
2015-02-25 12:02:10 +01:00
6f71bd9353
SocketAPI: Don't mark .lnk files as ignored on windows. #2447
2015-02-25 11:55:48 +01:00
f88398e776
lnk files: Fix exists() calls. #2792
2015-02-25 11:50:32 +01:00
f38aa698eb
Don't translate dummy strings
2015-02-20 10:12:31 +01:00
366f3f68b8
Activity view: Always add date
...
Fixes #2223
2015-02-20 10:12:19 +01:00
03e23da6a3
Show the settings also when no arguments are passed
...
sendMessage would only be called if there were options to
be sent to the running application.
Fix the issue by having explicitly named messages and always
send the show settings message.
Issue #2374
2015-02-19 16:57:16 +01:00
9690ca0198
Explain the "crash now" button to translators
2015-02-17 14:03:09 +01:00
c0c8a22fa3
SyncEngine: pass a non-const reference to the SyncFileItemVector in aboutToPropagate
...
That way, users of the library can change the contents of the sync item vector.
2015-02-17 11:08:16 +01:00
a955defae5
Raise the share window to make sure that the user sees it
2015-02-16 16:47:00 +01:00
2423aa592f
Add new icons by Jan
2015-02-16 14:47:32 +01:00
151228b2a6
Fix build when compiling libsync without QtGui
...
Utility must stay QtGui-free, move the hidpiFileName to the theme which
is the only part in libsync which uses it, and already has #ifdefs
2015-02-16 10:24:42 +01:00
bd4f68233f
some typos, grammar and sentence fixes
2015-02-14 23:47:07 +01:00
40dbc78407
concatUrl: Remove manual parsing, add test. #2817
2015-02-13 14:53:55 +01:00
0bf0bab1eb
One more Qt4 compile fix
2015-02-12 22:13:58 +01:00
00e42d1177
More HIDPI support
...
Except for the non-native activity tab
icon in settings, this should fix #11
2015-02-12 19:44:40 +01:00
d37dd040d0
Sharedialog: Use new share link from ownCloud Server 8 on.
...
This is derived from pull request https://github.com/owncloud/client/pull/2813
2015-02-12 17:04:03 +01:00
8f75434558
QuotaInfo: Ensure only one QuotaJob during startup. #2801
2015-02-12 15:25:44 +01:00
3dd6bcc323
Disable GUI support for TLS client certificates
...
The feature needs mor work
2015-02-12 15:17:59 +01:00
f4144d6d38
Merge pull request #2827 from rullzer/fix_2812
...
Added push button to sharedialog to set password
2015-02-12 13:49:56 +01:00
eada70ba44
Sharedialog: Removed Thumbnail retrieval.
...
It uses an unstable API that the server does not really support.
We need to postpone that. Removed for now.
2015-02-12 13:47:07 +01:00
ba3bab8f49
Remove certificateDate property and other superfluous code
2015-02-12 12:37:42 +01:00
e4fce1250b
Progress: Ensure overall progress is between 0 and 100. #2648
...
This should *already* be the case - but @dahan1999 reported that
it fixed #2648 .
2015-02-12 10:09:07 +01:00
8523803d94
Added push button to sharedialog to set password
...
Added button to explicitly set the password (makes is clear the user has to do
somethign!). Patch for #2812
2015-02-11 22:14:51 +01:00
91ae912373
ShareDialog: Don't crash with bad response. #2811
2015-02-11 16:02:50 +01:00
e79e2b80c8
SocketApi: Fix crash on exit. #2798
...
The _listeners list is destroyed before the _localServer.
And since _localServer is the parent of all generated QLocalSockets,
they get destroyed in turn - which triggers onLostConnection() and
thus accessed the destroyed _listeners list.
To avoid that, delete all active QLocalSockets in SocketApi before
its members are destructed.
We also now delete sockets when we're done with them. I think
disconnected sockets would otherwise linger until SocketApi destruction.
2015-02-11 09:50:10 +01:00
f8b24ac34d
Fix reconnection after long network outage #2321
...
The problem was that StatusNotFound can indicate either a transient
network problem or a permanent server configuration problem.
2015-02-11 09:24:56 +01:00
51b9ec30a9
Remove connect to removed slot.
...
This seems to have slipped back in, probably during a complex merge
in ba8b1bbe06
2015-02-11 08:12:09 +01:00
0bf6a220ae
Merge pull request #2807 from rullzer/sharedialog_force_password_multshare
...
Reset _public_share_id after we delete the share, thanks
2015-02-10 12:18:10 +01:00
c44abf4918
Reset _public_share_id after we delete the share
2015-02-10 07:53:35 +01:00
d7f5e89a1d
Sharedialog: retrive thumbnail from server for shares
...
Initial patch for #2726 . Request a thumbnail from the server if files are to be
shared.
2015-02-09 22:17:37 +01:00
d4132072d8
OS X: Send notification natively
...
For #2728
2015-02-07 18:23:40 +01:00
4849c31add
Sharing: Handle "Enforce password" for public shares properly.
...
If a 403 is received from the attempt to create a public link, the
dialog shows the password field, as this is server enforced.
This fixes #2774
2015-02-06 16:27:11 +01:00
01bca39138
s/mirall/client in transifex & translations
...
Last part of #2470
2015-02-06 15:16:55 +01:00
6e8527e66d
Wizard: Show the remote folder name when the theme has one
...
Relates to issue #2788
2015-02-06 14:50:52 +01:00
0d2b7967bc
Windows: Fix opening activity entries with a space in the name
...
This fixes #2601
2015-02-06 13:44:06 +01:00
70c8803a79
SelectiveSync: show a message in case of error or if there is no subfolder
...
Usefull when the folder does not exist (for example in case the theme
has a defaultServerFolder that does not yet exist, #2788 )
But also to avoid confusion (issue #2663 )
2015-02-06 12:27:54 +01:00
0d2fb0754c
Wizard: Fix the advanced setup page when the theme has a defaultServerFolder
...
Especially the selective sync dialog
Task #2788
2015-02-06 12:27:54 +01:00
7c0d3b8485
Sharing: tr()s added
2015-02-06 11:11:09 +01:00
1554f41441
Orthography: "an folder" corrected to "a folder"
2015-02-06 10:22:49 +01:00
9e945eb471
Settings dialog: better color for separator line
2015-02-06 08:30:51 +01:00
c4dd1cfb69
Mac Settings Dialog: Native icons for account
2015-02-06 07:54:25 +01:00
94e61c3205
Notifications: Fix creation of notification (fixup2)
...
For #2728
2015-02-05 17:20:52 +01:00
c4cf13bd97
Notifications: Fix creation of notification (fixup)
...
For #2728
2015-02-05 16:55:32 +01:00
71e22ffe2c
Notifications: Fix creation of notification
...
For #2728
2015-02-05 16:46:40 +01:00
3169a6f170
SelectiveSync: change the wording of the dialog on the wizard
...
Have different wording depending on the wizardSelectiveSyncDefaultNothing theme option
Relates to #2580
2015-02-05 16:22:04 +01:00
446e2b27d7
OS X Sparkle: Fix warning
2015-02-05 15:49:46 +01:00
21345b81f1
wizard: fix the EntityExistJob URL
...
We need to add the davPath in there.
Otherwise there will be a redirect which will break shiboleth
(We want to only enter the password once)
Issue #2739 and #2780
2015-02-05 12:53:04 +01:00
f233af04f6
Windows XP: Possible fix for #2648
2015-02-04 18:49:04 +01:00
43a51c1bef
Fix the MinGW build
...
- qtkeychain isn't necessarily in a qt5keychain subdirectory.
- Explicitly add OpenSSL to the include directories
- Make sure that the USE_OUR_OWN_SQLITE3 code is initialized
for csync by calling find_package.
2015-02-04 14:50:38 +01:00
26132fd14e
owncloudconnectionmethoddialog: typo
2015-02-04 13:42:49 +01:00
ca68ccd76a
Fix Qt4 build
2015-02-03 20:04:04 +01:00
1f9d7c41e8
owncloudconnectionmethoddialog: Change order of buttons, fix wording, and add the URL
2015-02-03 17:55:01 +01:00
48254579a2
Sharedialog: add copy button text and actually connect the button
2015-02-03 13:02:52 +01:00
a3106b1771
Client Dialog Support: Fix certificate dialog
2015-02-02 23:35:39 +01:00
227b7ccabd
Add dialog to connection wizard
...
When connecting to a https:// URL fails, present the user with three
choices:
* Try again with a http:// URL
* Configure client-side TLS certificates
* Go back and enter a different URL
This allows users connecting with an ownCloud server secured with
client-side TLS certificates to start the certificate import wizard
manually instead of relying on a custom server error message.
2015-02-02 22:29:21 +01:00
df214cd6c1
Folder: Make debug message clearer
...
The thread was actually already started in the discovery phase.
2015-01-29 20:47:45 +01:00
d2f1e6e03e
ShareDialog: Disable sharing of external files.
...
See https://github.com/owncloud/client/issues/2732 for discussion.
2015-01-29 18:11:04 +01:00
43d6dbb0f2
SQL: Add debugging options. #2693
...
OWNCLOUD_SQLITE_JOURNAL_MODE: To use something else than WAL
OWNCLOUD_SQLITE_TEMP_STORE: To test with storing temporaries in memory.
2015-01-29 11:02:01 +01:00
6fa73e073f
Certificate Wizard: Remove dead code, cleanup style
2015-01-28 17:38:38 +01:00
5fc231cda4
Shib: Fix fetching of 'user'. #2751
2015-01-28 15:15:35 +01:00
1ca8ab81c7
Fix for non C++11 compilers
2015-01-28 14:19:37 +01:00
d70e146c1f
Merge remote-tracking branch 'origin/ssl_client_cert'
...
Conflicts:
CMakeLists.txt
csync/src/CMakeLists.txt
csync/src/csync_owncloud.c
2015-01-28 14:13:40 +01:00
2cee591b0e
Merge branch 'sharedialog_fixes' of git://github.com/rullzer/client
...
Fix missing OcsShareJob constructor.
Conflicts:
src/gui/sharedialog.cpp
2015-01-28 12:19:40 +01:00
8a71d7d254
Merge pull request #2730 from rullzer/filebrowser_integration
...
Sharedialog: 404 is also an acceptable response when retriving shares
2015-01-28 12:09:33 +01:00
f59515883d
FolderMan: Require 2s minimum delay.
...
Otherwise we run into "can't upload because it's too recent" issues
when the folder watcher triggers a sync.
We used to do this, but my recent refactoring started counting the
time since the last sync against this minimum delay, leading to
1ms delays in practice. This fixes the regression.
2015-01-28 11:24:47 +01:00
524f04f34e
Wizard: Give useful error message when server access is forbidden
...
Final fix for #2607
2015-01-28 11:06:41 +01:00
9e7ee42eb7
Wizard Remove unused pointer
2015-01-28 11:06:41 +01:00
6f82e80698
Remove debug
2015-01-28 11:06:41 +01:00
37680a0909
ShareDialog: Prepare for multiaccount. #43
...
Also fix a possible bug with the share dialog when no account
is configured.
2015-01-28 10:52:55 +01:00
350ad98c27
Folderwizard: Prepare for multiaccount. #43
...
Avoid accessing the global account instance and instead pass it in
from the outside.
2015-01-28 10:40:32 +01:00
b0dbb49ca8
Shib: fix broken signal/slot connections
2015-01-26 16:23:43 +01:00
3169833cd7
gui: Still give a decent experience if there is no system tray
...
Helps for tasks #1138 , #2023 , #2123
2015-01-26 13:00:45 +01:00
9abc3e1333
fixes required by upstream
2015-01-23 19:22:56 +00:00
b856266e91
Remove neon link flag when not required
2015-01-23 17:35:17 +01:00
807277c0ae
Socket API: Do not broadcast the shared menu entry on all socket when one connects to the socket API
...
Now we reply to the command SHARE_MENU_TITLE
2015-01-23 16:09:38 +01:00
3885d5d706
Discovery: Report root etag from engine to folder
...
For #2352
2015-01-23 15:30:44 +01:00
c54621eb19
OS X: Share menu for Finder
2015-01-23 12:00:31 +01:00
2943b4a85a
CMake: Fixed the rpath settings to make the nighlies build again.
2015-01-23 11:50:42 +01:00
ed0b4e48d5
Sharedialog: Fix some error display.
2015-01-23 11:50:42 +01:00
f9938c90ff
Sharedialog: 404 is also an acceptable response when retriving shares
...
When we try to get the shares for a file/dir that has no shares yet 404 is an
acceptable response from the server.
2015-01-23 10:29:12 +01:00
bcdc19f0e3
Sharedialog: Moved more logic to OcsShareJob
...
To make the Sharedialog a bit cleaner and to only have the logic in one place.
The postdata is now passed as a QList<QPair<QString, QString>> to the
OcsShareJob.
2015-01-23 09:41:10 +01:00
fb967427e8
Sharedialog: We always want json return format
...
Cleanup the code a bit and set that we want json as return format for all
replies.
2015-01-23 09:17:00 +01:00
0b10761291
Sharedialog: emit proper error code, only show error label if there is one
2015-01-23 09:10:02 +01:00
0f98a90858
Wizard: Add an option in the theme to default to nothing selected in the selective sync
...
Issue #2580
2015-01-22 15:57:55 +01:00
094da51d82
FolderWatcher: Fix ignore list usage.
...
All patterns with started with a ] were not working correctly.
2015-01-22 15:42:47 +01:00
168c89aba7
Wizard: fix spacing
2015-01-22 15:11:03 +01:00
c9f9d55658
Merge branch 'qnam_csync_update'
...
Conflicts:
src/libsync/networkjobs.cpp
2015-01-22 14:34:36 +01:00
fa4e6d8261
Exponential backoff for rapid follow up syncs. #2355
2015-01-22 08:55:52 +01:00
145df8ec67
Pause between sync runs (particularly long ones) #2355
2015-01-22 08:55:52 +01:00
af5cbdbed8
Folder: Add timer for sync duration.
2015-01-22 08:55:52 +01:00
ba8b1bbe06
adds 'SSL client certificate' support from n.octeau with qknight changes as:
...
* removed broken QSsl::SslV3 default
* rewrote slotHandleErrors(): no longer claim errors which are none.
* hack reverted: lib64 was not the cause for NixOS issues related to libraries.
* refactored csync/src/csync_owncloud.c and discovered+fixed why the dav_connect was never getting the certPath+certPassoword
* cleanup of code but seems this crushed the ssl client certificate support
* fixes the https://github.com/owncloud/client/issues/69#issuecomment-69358377 issue
* lots of cleanup
* From TODO list : translate all french comments into english
* changed _pemCertificate type from QString to QByteArray
2015-01-21 23:55:11 +00:00
f2a7e0b28f
Selective sync dialog: give a proper size by default
2015-01-21 15:37:00 +01:00
0e86ceff73
Connection Validator: let the user cancel the password dialog
...
And don't ask for the password again if this happens
2015-01-21 15:33:51 +01:00
c91de092e5
Setup wizard: Fix the http fallback logic
...
Also don't allow to go back from the advanced settings page because
this break everything
2015-01-21 15:33:51 +01:00
7a173f6e62
OS X: Fix path rewrite for owncloudcmd
...
It was broken after the folder restructuring (cmd/ and client/)
2015-01-21 15:17:40 +01:00
95f7e83c5c
Sharedialog: Some more refinements after the merge of the branch.
...
- Some dialog changes: Made it less vertical space comsuming
- Some variable cleanups
- Allow to share files that are not within the synced dir by
copying them to the root of a sync dir first.
2015-01-21 15:05:23 +01:00
fb87ad1442
OS X: Fix path rewrite for owncloudcmd
...
It was broken after the folder restructuring (cmd/ and client/)
2015-01-20 19:03:56 +01:00
906779c4b1
SyncEngine: Use QNAM for csync_update
...
This is for #2507
2015-01-20 18:27:25 +01:00
bd80c034ba
Merge pull request #2723 from rullzer/filebrowser_integration
...
Sharedialog: link sharing from desktop
2015-01-20 17:45:34 +01:00
00ed37dd02
Merge pull request #2709 from rullzer/monochrome-state-info-icon
...
Resepct theming when no syncs are configure
2015-01-20 08:21:42 +01:00
4de815ad67
Merge pull request #2710 from rullzer/sort_folder_order
...
Manged folder list in the tray icon is now sorted
2015-01-19 18:56:55 +01:00
86eed7cb81
Fix SSL button icons
2015-01-18 15:34:48 +01:00
63f18a7ebb
Sharedialog: Pass QDate around instead of QString
...
Now pass a QDate object around so we only do the conversion in one place in
case the API changes.
2015-01-17 09:57:17 +01:00
233f0423fa
Sharedialog: Also reply on delete should be checked
2015-01-17 09:48:18 +01:00
d5bddca01d
Sharedialog: More Q_FOREACH
2015-01-17 09:29:13 +01:00
00cb6f71da
Sharedialog: Set correct minimum date
...
The minimum date should always be the current date + 1 day.
2015-01-17 09:10:42 +01:00
9ac35d5869
Sharedialog: Use arg instead of append
2015-01-17 09:01:24 +01:00
bd1db30eea
Sharedialog: Minor fixes
...
The server generates a new share when a password is set/deleted so we need to
refetch the shares once that is done.
It is not possible to set an expiration date in the past for a share. So do not
allow the user to select a date in the past.
2015-01-17 08:50:28 +01:00
6c3a5b1d69
Sharedialog: Do not hard code error reply messages
...
The server provides error messages in the json return code. Use those error
messages.
2015-01-17 08:29:20 +01:00
c233baab5b
Sharedialog: grouped sharelink stuff in one widget
...
A bit of grouping in the UI requiring less ->hide() and ->show() calls
2015-01-17 08:10:18 +01:00
aa6a5e4ac2
Credentials: Use the bound account everywhere.
...
This is preparation for multiaccount.
2015-01-16 15:22:56 +01:00
71560ace71
Sharedialog: Show general info about a share
...
A start with some general share info in the share dialog.
2015-01-16 14:48:56 +01:00
0fba4eee98
Sharedialog: Removed user/group sharing
2015-01-16 14:06:34 +01:00
91fce3ea73
Make public API explicit about blacklist kind. #2301
...
'blacklist' can mean the selective sync blacklist or the error
blacklist. Names in public API are now explicit about which
blacklist is meant.
2015-01-16 10:17:19 +01:00
a5ae1a9734
Folder: Only count error free downloads for the gui notification.
2015-01-15 20:51:30 +01:00
506360716a
FolderMan: Removed too explicit logging that scares users.
2015-01-15 20:51:30 +01:00
c9f1b3229b
Add Folder Wizard: fix wording
...
(Relates #2663 )
2015-01-15 13:55:48 +01:00
2b8b204cfc
SelectiveSyncDialog::estimatedSize: return qint64 because -1 in case of error
2015-01-15 13:07:16 +01:00
cd0c9b2ddb
Sharedialog: More error checking
2015-01-14 19:47:25 +01:00
b80bbe6587
Sharedialog: more const
2015-01-14 19:36:42 +01:00
879d41bf2d
Sharedialog: Fix spinners and passwordfield
...
The password field now show correct info when a password is entered etc.
Maybe we should have an extra info part where we state that the user needs to
press enter to submit the password
2015-01-14 19:08:04 +01:00
7b1cfd69d7
Sharedialog: use QProgressIndicator
...
This is a merge from the movie in the original commit (which was local) to the
QProgressIndicator. However, on all connections I tested it, it did not add
much since the API is in gernal pretty quick. So maybe we can just remove this.
2015-01-14 18:42:56 +01:00
ef9f2a965d
Fix for issue #2703
2015-01-14 17:39:14 +01:00
ac0e8b1fe1
Qt 4 fix
2015-01-14 16:30:10 +01:00
da0f7317b4
Wizard: Show the size of the folders that will be downloaded
...
Part of #2580
2015-01-14 16:11:07 +01:00
3e81839af5
Sharedialog: Removed duplicted code
...
Handling of updated shares is identical from users and groups
2015-01-14 15:27:15 +01:00
885aafcea3
SelectiveSync dialog: Show the sizes of the folder
2015-01-14 15:08:09 +01:00
0bd6eb1792
Sharedialog: fix changes due to rebase
2015-01-14 13:51:02 +01:00
e420a689dc
Sharedialog: More reply checking and removing some duplicated code
2015-01-14 13:43:01 +01:00
9addd56f9b
Sharedialog: follow correct behavior for files when editing permissions
2015-01-14 13:43:01 +01:00
a7e69a5dc5
Sharedialog: Started parsing server replies
2015-01-14 13:43:01 +01:00
f6a83d5de2
ShareDialog: UI is different for files/dirs
...
Bunch of if statements to make sure that we do not display delete/create on
files.
2015-01-14 13:43:01 +01:00
d1d8a40acf
Sharedialog: fix unused var compiler warnings
2015-01-14 13:39:07 +01:00
cb18dfaaef
Sharedialog: Of course users can also have create and delete privileges
2015-01-14 13:39:07 +01:00
a22a03e501
ShareDialog: Group sharing is now also possible
...
Basically the same functionality as for user sharing. Maybe it would be wise to
merge the two functionalities. Should be rather straight forward if we also
merge the UI parts.
2015-01-14 13:39:06 +01:00
9a35b5670e
ShareDialog: Allow sharing with users
...
This commit needs a lot of cleaning up. And a lot of error checking needs to be
added. However it is now possible to change and add new shares with users.
Sharing with groups should be just copy paste.
Also the UI needs some love.
2015-01-14 13:39:06 +01:00
017b54f9a8
Sharedialog: Allow modifications of permission for users
2015-01-14 13:39:06 +01:00
9b7e6cc5c1
Fix warnings.
...
* remove Unused variable
* zorder for spacers makes no sense
2015-01-14 11:28:53 +01:00
209276efa8
ShareDialog: Moved open slot from Application object to Gui object.
...
Also set auto delete flag for the dialog explicitely.
2015-01-13 13:50:41 +01:00
31e584e3e3
Fix win32 build
2015-01-12 13:53:40 +01:00
ad09f6491b
ShareDialog: Fix const ref for arguments.
2015-01-12 11:35:11 +01:00
efbe033bfb
Sharedialog: Fix merge problem (use AccountPtr) plus cleanup.
2015-01-12 11:30:02 +01:00
2c6f0950f6
Merge pull request #2674 from rullzer/filebrowser_integration
...
Add Sharing from the desktop, SocketAPI and Dialog.
2015-01-12 11:16:28 +01:00
b680788f48
Sharedialog: Allow setting and retrieving of experiation data for public urls
2015-01-12 10:14:45 +01:00
488f993f45
Fix compilation on Windows
2015-01-12 09:40:11 +01:00
811cbc27c0
Sharedialog: Construct correct public url for existing shares
2015-01-11 14:16:49 +01:00
25e90ff658
Sharedialog: use Q_FOREACH
2015-01-11 13:56:23 +01:00
fa390299f9
Added Q_FUNC_INFO at several places
2015-01-11 13:41:15 +01:00
accb036507
Removed some unused outcommented code
2015-01-11 13:36:45 +01:00
44690ff596
ShareDialog: fixed "" -> QString
2015-01-11 13:27:32 +01:00
e20f819c1d
Sharedialog: QString("") -> QString()
2015-01-11 13:24:40 +01:00
1d011a2f9a
ShareDialog: make visible text translatable
2015-01-11 13:22:48 +01:00
bc84a78b0f
ShareDialog: Made slot arguments const
2015-01-11 11:19:12 +01:00
6034bd0946
Wizard: Never attempt to hide server page
...
The wizard code used to call hide() on hardcoded wizards.
This means that for a brief moment, the first page with the URL
(disabled line edit) may be seen. I think that's completely
legitimate from a feedback perspective. The alternative would
be to unhide on error, but this is rather unelegant...
2015-01-11 07:38:09 +01:00
786a877986
SocketAPI: Some cleanups plus added some consts
2015-01-09 11:44:01 +01:00
c86d8e5acf
Clean up BSD support patch
2015-01-08 22:40:47 +01:00
7671ae8df7
Application: Initialize the folderman after we checked for existance
...
So we don't start the SocketAPI if we are going to quit.
We also do not log any message anymore before we install the hooks
Should solve #2666
2015-01-08 16:52:23 +01:00
c3468b7ed6
Merge remote-tracking branch 'origin/master' into accountstate
...
Conflicts:
src/gui/owncloudsetupwizard.cpp
src/gui/owncloudsetupwizard.h
src/libsync/propagatedownload.cpp
src/libsync/propagatedownload.h
2015-01-08 15:33:39 +01:00
309ff2997c
potential fix for #1865
...
Do not show ignored files in context menu
2015-01-08 11:42:14 +01:00
8e8ca97eec
Fix build
2015-01-08 09:42:26 +01:00
51d7559a2c
Simplify checkDowngradeAdvised logic
...
Also, show() and back() belong into slotConnectionCheck only
2015-01-07 18:22:44 +01:00
5c4f706fe4
Setup Wizard: Make sure to reset auth type when URL changes
2015-01-07 18:01:18 +01:00
7ac32a19b5
Do not show the HTTP-reconnect popup when its not warranted
...
Fixes usability issues in the workaround of #2607
2015-01-07 18:01:11 +01:00
8e3dbcb7c0
SocketAPi: use absoluteFilePath unstead of canonicalFilePath
...
Because canonicalFilePath is way too slow.
Issue #2671
2015-01-07 14:37:05 +01:00
414ac5433d
Merge branch '1.7'
...
Conflicts:
binary
doc/accountsetup.rst
doc/architecture.rst
doc/navigating.rst
doc/owncloudcmd.rst
doc/troubleshooting.rst
2015-01-05 14:40:53 +01:00
ee2e6e5dce
Also allow sharing if we only sync a part
2014-12-28 20:13:11 +01:00
facb6b2e81
Check box public link now works multiple times
...
When deleting a share (public link) and recreating it we need to store the new
id.
2014-12-28 20:13:11 +01:00
ec3c83c0c9
Minor sharedialog.ui fixes
2014-12-28 20:13:10 +01:00
0ad4fb7273
Create valid poststring
2014-12-28 20:13:10 +01:00
763d5f67cd
Some error checking on SHARE sockeAPI command
2014-12-28 20:13:10 +01:00
b7d4c997a3
Fix rebase of branch
2014-12-28 20:13:10 +01:00
bd7f45e398
Everything works now, albeit without error checking.
2014-12-28 20:13:10 +01:00
748440ced3
Initial push for filebrowser integration, not finished yet but it's a start :)
2014-12-28 20:13:10 +01:00
cd8affc255
Resepct theming when no syncs are configure
2014-12-19 15:08:49 +01:00
8677fb18bb
Manged folder list in the tray icon is now sorted
...
We are using a QHash to store all the folder objects. This does not allow for
easy sorting and looks weird to the user. Now they are first inserted into a
temp QMap to sort them properly.
2014-12-19 13:59:50 +01:00
a9da5ebff6
Wizard: Sometimes preserve folders when folder config is skipped.
...
* When folder config is used, other folder definitions are always
removed.
* Fix a bug with the wizard becoming stuck when 'skip folder config'
is used.
2014-12-18 15:39:51 +01:00
38ebfec1fb
Use global Account/AccountState less.
...
* Use a shared pointer to Account everywhere to ensure
the instance stays alive long enough for a sync to terminate
* Folder is now tied to an AccountState
* SyncEngine and OwncloudPropagator tie to an Account and use that
for all jobs they run
Issue: Since the setup wizard currently always replaces the
account, it will always wipe all folder definitions, even when
the actual changes to the account were minor.
2014-12-18 15:39:51 +01:00
6c7acd585e
Account: Split into libsync/Account and gui/AccountState.
...
This allows all the account state information to live in gui
while the sync-relevant data stays in libsync.
I also moved quotainfo to gui since it depends on the account state.
2014-12-18 15:39:51 +01:00
a006c6962c
Move account state related logic into Account.
...
The account state is now managed mostly by the Account itself
instead of through Application. The gui can still control whether
an account is signed out or not.
2014-12-17 12:01:10 +01:00
414838cae8
Settings dialog: remove the code that was updating the account icon
...
I just wanted to fix the warning:
QObject::connect: No such slot OCC::SettingsDialog::slotUpdateAccountIcon(QIcon) in settingsdialog.cpp:108
It turns out we don't need anymore the signal or any of the code that
was updating the account icon in the settings dialog since it we now have a fixed icon
2014-12-16 11:36:52 +01:00
3ee14164db
network jobs: Refactor the redirect handling in AbdtractNetworkJob
...
Move the redirect handling from CheckServerJob to AbstractNetworkJob, so we can
later use it in any job (in preparation for task #2614 )
2014-12-16 11:27:02 +01:00
1a3041690f
ConValidator: Simplify and cleanup.
...
* This way using it with multiple accounts will be easier.
* Timeouts on the authed requests are handled.
2014-12-11 14:48:01 +01:00
d8c59fcb73
Use connection validator to ping the server. #2485
...
* Stop the quota job from having an effect on account status
as it can sometimes take a long time to reply. See #2485 and
owncloud/core#12744 .
* Instead of indirectly using the quota job, use the connection
validator to regularly ping the server with a basic PROPFIND for
'getlastmodified' on /.
This request was usually fast for users even when the quota PROPFIND
was slow.
2014-12-10 13:40:11 +01:00
53d5de685c
Merge remote-tracking branch 'origin/1.7'
...
Conflicts:
src/gui/folder.cpp
src/gui/folder.h
src/libsync/networkjobs.cpp
src/libsync/owncloudpropagator.h
src/libsync/propagatedownload.cpp
2014-12-10 13:01:36 +01:00
d034f10af3
Fix compilation
2014-12-08 19:25:57 +01:00
a2b817f0c0
mirall.qrc -> client.qrc
2014-12-08 18:00:29 +01:00
d5f2c36abd
Mirall -> (Desktop) Client
2014-12-08 17:54:32 +01:00
b7323dc403
Merge branch 'master' into rename_client
2014-12-02 14:33:28 +01:00
c6d74d6c12
Fix typo
2014-12-02 14:33:17 +01:00
3016844dd7
Merge branch 'master' into rename_client
...
Conflicts:
README.md
src/gui/folderman.cpp
src/gui/settingsdialog.cpp
src/libsync/accessmanager.cpp
src/libsync/propagateupload.h
2014-12-02 13:37:22 +01:00
3f5887cc03
Merge pull request #2565 from owncloud/accountsettings_itemsontop
...
Refactor generic settings dialog
2014-12-01 15:01:45 +01:00
512492bf30
Merge remote-tracking branch 'origin/1.7'
...
Conflicts:
src/libsync/propagatedownload.cpp
2014-12-01 14:37:47 +01:00
afee1ee1c0
Make all ptr-based members either const or check for their existance
2014-12-01 13:08:49 +01:00
714599aeaa
Refactor generic settings dialog
...
- move items on top like on Mac OS (right is free for accounts now)
- The account icon no longer reflects the current status (in prep for multi-account)
2014-12-01 11:37:06 +01:00
0fe7a69b39
FolderWatcher: Detect own changes. #2297
2014-11-20 13:16:29 +01:00
6d09f1b6c0
Folder watcher now reports changing paths instead of dirs.
2014-11-20 12:51:16 +01:00
1ada20ac7b
Linux folderwatcher: Get full path of changed file. #2297
2014-11-20 12:42:59 +01:00
d04eedeb8d
OSX: Trust the file watcher. #2297
...
* Use a bigger default force sync interval (2h)
* Allow the file watcher to schedule a sync while a sync for
the same file is running.
2014-11-20 12:42:59 +01:00
f275002ebe
Merge branch '1.7'
2014-11-20 12:41:06 +01:00
4d7b8bdb25
Merge remote-tracking branch 'origin/1.7'
...
Conflicts:
OWNCLOUD.cmake
test/CMakeLists.txt
test/testfolderwatcher.h
2014-11-19 14:45:25 +01:00
281c0e1553
Merge branch 'master' into rename_client
...
Conflicts:
CMakeLists.txt
src/gui/main.cpp
src/libsync/accessmanager.cpp
src/libsync/accessmanager.h
src/libsync/owncloudpropagator_p.h
2014-11-12 00:07:59 +01:00
cdac8d56d5
Merge remote-tracking branch 'origin/master' into crashreporter
...
Conflicts:
src/libsync/utility.cpp
src/libsync/utility.h
2014-11-11 23:53:38 +01:00
2db17a57d2
Fix header names
2014-11-09 23:25:57 +01:00
a992c5b8d3
Fix build
2014-11-09 23:10:18 +01:00
269b59c2ba
More CMake adjustments
2014-11-09 22:58:24 +01:00
d57d3cf1f6
Drop Mirall from strings
2014-11-09 22:35:29 +01:00
ae85aa33fd
Adjust namespaces
2014-11-09 22:34:07 +01:00
f2eadacf09
Remove "Mirall" from class names
2014-11-09 22:30:29 +01:00
9ebc41ed6f
Remove "Mirall" from cmake project files
2014-11-09 22:30:05 +01:00
de11f602d5
Merge remote-tracking branch 'origin/il'
...
Conflicts:
csync/src/csync_private.h
src/CMakeLists.txt
src/gui/folder.cpp
src/libsync/owncloudpropagator.cpp
src/libsync/owncloudpropagator.h
src/libsync/propagator_qnam.cpp
src/libsync/propagator_qnam.h
src/libsync/syncengine.cpp
src/libsync/syncengine.h
src/mirall/syncjournaldb.cpp
2014-11-08 10:48:36 +01:00
f25d175b5d
Merge remote-tracking branch 'origin/1.7'
2014-11-06 19:54:20 +01:00
dc1e73dcb7
Merge remote-tracking branch 'origin/1.7'
...
Conflicts:
src/libsync/syncjournaldb.cpp
test/CMakeLists.txt
2014-10-28 23:27:58 -04:00
c832226aa1
Merge remote-tracking branch 'origin/1.7' into master
2014-10-22 12:25:58 +02:00
a20375372d
Blacklist: Don't ignore error files forever. #2247
...
Instead try them again regularly, but don't show the user any
error messages if the error persists.
2014-10-22 12:25:18 +02:00
7ae0338f5c
Merge remote-tracking branch 'origin/1.7'
...
Conflicts:
src/CMakeLists.txt
src/cmd/cmd.cpp
src/gui/socketapi.h
src/libsync/syncengine.h
test/CMakeLists.txt
2014-10-22 10:41:55 +02:00
50e718b1e7
Merge branch '1.7'
...
Conflicts:
src/CMakeLists.txt
src/cmd/cmd.cpp
src/gui/folder.cpp
src/gui/socketapi.cpp
translations/mirall_ca.ts
translations/mirall_cs.ts
translations/mirall_de.ts
translations/mirall_el.ts
translations/mirall_en.ts
translations/mirall_es.ts
translations/mirall_es_AR.ts
translations/mirall_et.ts
translations/mirall_eu.ts
translations/mirall_fa.ts
translations/mirall_fi.ts
translations/mirall_fr.ts
translations/mirall_gl.ts
translations/mirall_hu.ts
translations/mirall_it.ts
translations/mirall_ja.ts
translations/mirall_nl.ts
translations/mirall_pl.ts
translations/mirall_pt.ts
translations/mirall_pt_BR.ts
translations/mirall_ru.ts
translations/mirall_sk.ts
translations/mirall_sl.ts
translations/mirall_sv.ts
translations/mirall_th.ts
translations/mirall_tr.ts
translations/mirall_uk.ts
translations/mirall_zh_CN.ts
translations/mirall_zh_TW.ts
2014-09-18 17:10:21 +02:00
ece11dc3d8
Updater: Add "didn't check for updates" message. #2175
...
Don't show "Checking server..." when we are not.
2014-09-17 11:41:04 +02:00
f3cc614427
Fix apple build.
...
The apple build was broken because the elseif in the CMakeLists is never triggered.
Some code was not properly adapted for the new qtmacgoodies.
Some paths were not adapted to new split.
2014-09-12 14:24:26 +02:00
1aca22b5f8
Make crash reporter executable branded
2014-08-30 10:46:09 +02:00
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
38ff7d87c8
Hide crashreporter config option if not build with crashreporter enabled
2014-08-29 17:07:31 +02:00
6abaad1ae8
Show crash reporter if trying to read the crash-reporter-enabled config crashes
2014-08-28 16:23:14 +02:00
89aec52503
Add checkbox to general settings to disable the crash reporter
2014-08-28 16:19:17 +02:00
439bf7641e
Use include path for libcrashreporter-qt instead of lengthy relative include
2014-08-28 11:11:42 +02:00
cf12a56b4c
Merge remote-tracking branch 'origin/1.7'
...
Conflicts:
src/gui/socketapi.cpp
2014-08-27 18:22:07 +02:00
2b4849a2fa
Add crash reporter using libcrashreporter-qt
2014-08-26 18:15:13 +02:00
17e16f5e79
Add "Crash" entry to systray if started with --debug
2014-08-26 15:46:24 +02:00
b176ff6626
Don't use CMAKE_INSTALL_PREFIX for RPATH
2014-08-26 15:19:46 +02:00
e5471d8318
Build after merge
2014-08-26 14:33:21 +02:00
902bb7a198
Merge remote-tracking branch 'origin/master' into move_lib_to_sep_dir
...
Conflicts:
src/CMakeLists.txt
src/gui/accountsettings.cpp
src/gui/folderwizard.cpp
src/gui/settingsdialog.cpp
src/libsync/syncengine.h
2014-08-26 11:29:42 +02:00
4fc044d368
Merge branch 'master' into move_lib_to_sep_dir
...
Conflicts:
cmake/modules/NSIS.template.in
src/CMakeLists.txt
src/creds/shibboleth/authenticationdialog.cpp
src/creds/shibboleth/authenticationdialog.h
src/gui/owncloudgui.cpp
src/libsync/creds/shibboleth/authenticationdialog.cpp
src/libsync/creds/shibboleth/authenticationdialog.h
src/libsync/mirallaccessmanager.cpp
src/mirall/authenticationdialog.cpp
src/mirall/authenticationdialog.h
2014-08-12 21:08:44 +02:00
bb32831a60
Merge remote-tracking branch 'origin/master' into move_lib_to_sep_dir
...
Conflicts:
src/gui/folderman.cpp
2014-07-17 11:31:45 +02:00
3c2e43d883
Merge remote-tracking branch 'origin/master' into move_lib_to_sep_dir
2014-07-14 10:50:53 +02:00
5041880854
Try to handle BUILD_LIBRARIES_ONLY correctly
...
Also, try to fix OS X build
2014-07-11 12:36:01 +02:00
2c904afd04
OS X explicitly requires the neon include path to be set
2014-07-11 12:11:04 +02:00
2cc13fb74a
Fix includes in mac specific headers
2014-07-11 11:38:01 +02:00
df3c3bca02
Split into three separate projects: library, gui and cmd
2014-07-11 11:07:31 +02:00
Olivier Goffart