Klaas Freitag
201075827f
Sharedialog: Add a Share button.
2015-02-25 13:44:27 +01:00
Daniel Molkentin
961623d388
Crash Reporter: fix submit URL
2015-02-25 12:33:16 +01:00
Jocelyn Turcotte
a98ab6f51d
shell_integration: Remove OwnCloud from public strings on OSX
...
Also removed it from commented out logs just in case.
2015-02-25 12:13:28 +01:00
Christian Kamm
5c7fd24ea8
Handle 503 due to maintenance more gracefully. #2884
2015-02-25 12:02:10 +01:00
Christian Kamm
76ac628153
Discovery: Distinguish 503 Storage not available. #2884
2015-02-25 12:02:10 +01:00
Christian Kamm
6f71bd9353
SocketAPI: Don't mark .lnk files as ignored on windows. #2447
2015-02-25 11:55:48 +01:00
Christian Kamm
f88398e776
lnk files: Fix exists() calls. #2792
2015-02-25 11:50:32 +01:00
Jenkins for ownCloud
ed315f54e3
[tx-robot] updated from transifex
2015-02-25 02:18:31 -05:00
Christian Kamm
08c33cd1dc
Discovery: Fix handling of 503 on a folder. #2884
2015-02-25 08:09:07 +01:00
Christian Kamm
0464947610
Remove extra ; to silence warning.
2015-02-25 07:14:05 +01:00
Daniel Molkentin
ae57bf28c6
Merge branch '1.8'
2015-02-24 22:02:44 +01:00
Klaas Freitag
1929040bb7
Discovery: Preserve the error message.
2015-02-24 22:02:31 +01:00
Klaas Freitag
3af936c8a1
Some minor cleanups.
2015-02-24 22:02:29 +01:00
Klaas Freitag
6375d0b284
Discovery: Preserve the error message.
2015-02-24 11:00:24 +01:00
Klaas Freitag
4b212f905f
Some minor cleanups.
2015-02-24 10:58:51 +01:00
Jenkins for ownCloud
3bd48c1b3f
[tx-robot] updated from transifex
2015-02-24 02:18:32 -05:00
Jenkins for ownCloud
298ca552c8
[tx-robot] updated from transifex
2015-02-24 01:15:20 -05:00
Jenkins for ownCloud
5dcc6a16ee
[tx-robot] updated from transifex
2015-02-23 02:18:25 -05:00
Jenkins for ownCloud
318b858ce6
[tx-robot] updated from transifex
2015-02-22 02:18:23 -05:00
Jenkins for ownCloud
6c09764b35
[tx-robot] updated from transifex
2015-02-22 01:15:16 -05:00
Jenkins for ownCloud
96501322fa
[tx-robot] updated from transifex
2015-02-21 02:18:23 -05:00
Jenkins for ownCloud
b1e9a74cc2
[tx-robot] updated from transifex
2015-02-21 01:15:14 -05:00
Daniel Molkentin
f38aa698eb
Don't translate dummy strings
2015-02-20 10:12:31 +01:00
Daniel Molkentin
366f3f68b8
Activity view: Always add date
...
Fixes #2223
2015-02-20 10:12:19 +01:00
Olivier Goffart
276dd50650
Update GetGitRevisionDescription.cmake
...
From https://github.com/rpavlik/cmake-modules
2015-02-20 10:11:30 +01:00
Jenkins for ownCloud
defd6180c6
[tx-robot] updated from transifex
2015-02-20 02:18:35 -05:00
Jocelyn Turcotte
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
Jocelyn Turcotte
2ddaf5a06a
Add a NO_MSG_HANDLER cmake option
...
This allows QDebug to output to stdout or OutputDebugString
to ease development.
2015-02-19 16:57:16 +01:00
Olivier Goffart
5e1aa7d383
SyncEngine: Fix move would re-upload the file
...
Because SyncJournalDb::postSyncCleanup was deleting the entries in the database
2015-02-19 15:00:37 +01:00
Olivier Goffart
e1871eb325
libsync: Fix qWarning in SyncEngine::slotJobCompleted saying we cannot find the sync item when moving
...
We need to compare against the original file name, that's why it's there
2015-02-19 13:13:45 +01:00
Daniel Molkentin
1aaa9db34e
Don't translate dummy strings
2015-02-19 11:34:15 +01:00
Olivier Goffart
66fc8e9e27
Merge branch 'master' into 1.8
2015-02-19 11:32:16 +01:00
Daniel Molkentin
cd20208fdc
Activity view: Always add date
...
Fixes #2223
2015-02-19 10:46:18 +01:00
Jenkins for ownCloud
3259cf59f5
[tx-robot] updated from transifex
2015-02-19 02:19:25 -05:00
Jocelyn Turcotte
c6442f67c1
shell_integration: Fix a crash on explorer startup
...
There is a race condition that can initialize the RemotePathChecker
instance concurrently on the same address and cause a crash when locking
the mutex. The reason is that local static initialization is not
thread-safe with MSVC2013.
Fix the issue by using call_once to initialize a static unique_ptr
instead.
This could be related to some reports of issue #2836 .
2015-02-18 17:33:46 +01:00
Olivier Goffart
1998b602b9
SyncEngine: better merge of the renames node
...
The same file is on the two sync trees under different names in case of a rename
We must therefore use the rename target as the key in the _syncItemMap to ensure
that the trees are correctly merged.
Also use the same UTF-8 decoding for the target than for the actual file in order
to catch invalid utf-8 in the rename target
2015-02-18 12:41:06 +01:00
Olivier Goffart
193fca4a8b
SyncFileItem::operator<: must return false when two items are equal
...
Fixes #2852
2015-02-18 12:41:06 +01:00
Jenkins for ownCloud
9659d0bdc7
[tx-robot] updated from transifex
2015-02-18 02:18:34 -05:00
Jocelyn Turcotte
ccf4298c81
shell_integration: Cleanup our uses of NSLog
...
Remove info messages and make sure that error messages
have an OwnCloud prefix since they will be reported by
Finder's process.
2015-02-17 18:23:30 +01:00
Jocelyn Turcotte
0b461e2275
shell_integration: Fix the overlay icons in the column view
...
Based on 79a713ea643e13e95f52bfe2adbbaf4a5ca92f8a in upstream liferay-nativity.
2015-02-17 18:20:16 +01:00
Jocelyn Turcotte
4f4ae5861a
Enable c++11 regardless of the compiler detection
...
CMake is using "c++" as the compiler and the clang detection fails.
Since we require C++11 at this point, enable it in all cases.
Removed the MSVC todos since we don't plan supporting it yet.
2015-02-17 18:20:15 +01:00
Daniel Molkentin
fedf368c7a
Merge pull request #2849 from owncloud/nsis_shortcuts_all_users
...
Install shortcuts for all users
2015-02-17 18:13:11 +01:00
Daniel Molkentin
c5f78fab51
Make NSIS installer with /S fully silent
...
Addresses #2006
2015-02-17 17:59:14 +01:00
Daniel Molkentin
56a907128a
Install shortcuts for all users
...
Implements #2413
2015-02-17 17:17:39 +01:00
Olivier Goffart
fb77cd5f7e
SyncEngine: Fix detection of the server reconfiguration
...
Some files might be kept (like the default files)
The files should be considered as NONE only if they are NONE on both trees
issue #2847
2015-02-17 16:44:13 +01:00
Daniel Molkentin
99d674c346
Default shiboolethwebview to 900x700, remember last size
...
Also add host to the title
Addresses #2285
2015-02-17 15:28:14 +01:00
Daniel Molkentin
9690ca0198
Explain the "crash now" button to translators
2015-02-17 14:03:09 +01:00
Olivier Goffart
9351c7485f
Try another way to fix the build
2015-02-17 14:04:16 +01:00
Olivier Goffart
d43b82dc82
Fix compilation with clang
...
The compilation error was
account.h:140:113: error: expected ')'
const QList< QPair<QString, QString> > &queryItems = QList< QPair<QString, QString> >());
^
followed by more errors.
The problem is because the compiler has hard time disambiguiating the comma
int foo(const QPair<int, int> &p = QPair<int, int>());
^
It is indeed quite hard for the compiler to know if this comma is a separation
between complate arguments or the separation between arguments of the functions.
Use the C++11 construct instead which does not need commas
2015-02-17 11:09:45 +01:00
Olivier Goffart
ce195bd599
SyncEngine: add an getter to the journal
2015-02-17 11:08:16 +01:00
