Daniel Molkentin
8dd374fc2b
NSIS: depend on nsProcess instead of Processes NSIS plugin
...
The Processes plugin is no longer maintained, and OBS
compiles an up-to-date version of nsProcess for us.
2015-03-13 14:04:16 +01:00
Daniel Molkentin
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
Christian Kamm
95f299f865
Remote folder wizard: Add optional manual entry #2613
2015-03-13 09:52:21 +01:00
Jenkins for ownCloud
09749e2c7f
[tx-robot] updated from transifex
2015-03-13 02:18:46 -04:00
Carla Schroder
dc33784a76
spelling corrections
2015-03-12 09:48:00 -07:00
Carla Schroder
961df1fc44
fix server side permissions table
2015-03-12 09:46:27 -07:00
Jocelyn Turcotte
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
Klaas Freitag
286ad0c478
Doc: Formatting fixes
2015-03-12 16:59:12 +01:00
Klaas Freitag
e30970ff90
Some ChangeLog corrections.
2015-03-12 16:49:41 +01:00
Daniel Molkentin
14e0e4a072
Win32: More reserved file names to ignore, including Recycle Bin
...
Addresses #2955
2015-03-12 16:25:32 +01:00
Jocelyn Turcotte
60da0a15e6
shell_integration: Remove the incorrect usage of the MIIM_BITMAP flag
...
This flag should only be specified if the hbmpItem member of the
MENUITEMINFO has been set.
2015-03-12 15:22:29 +01:00
Jocelyn Turcotte
0f84510e6f
Fix the build with GCC 4.7
...
Disable bitfields completely in SyncFileItem with that compiler.
2015-03-12 14:54:11 +01:00
Christian Kamm
1dd3488973
Uploads: Fix big seeks on Windows. #2954
2015-03-12 13:18:08 +01:00
Klaas Freitag
12e5306947
Set version postfix to rc1
2015-03-12 11:21:23 +01:00
Christian Kamm
9249d6c2f9
Logging: Print instruction when job completed.
2015-03-12 10:26:44 +01:00
Christian Kamm
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
Christian Kamm
3992fba168
Activity: Set a message for conflicts. #2792
...
Also show size when conflicting files are downloaded.
2015-03-12 10:00:45 +01:00
Daniel Molkentin
4601ac8b0e
Remove unused (and partly binary!) NSIS artifacts
2015-03-12 09:29:48 +01:00
Jenkins for ownCloud
a81b0db2a8
[tx-robot] updated from transifex
2015-03-12 02:18:36 -04:00
Jocelyn Turcotte
d88751bb8b
shell_integrations: Fix the precompiled headers usage in OCUtil
...
Enable it in all configurations and add the missing include.
2015-03-11 22:17:46 +01:00
Markus Goetz
f13dfc19a0
OS X: Fix UI glitches related to sync folder
...
For #2113 and #2947
2015-03-11 16:42:12 +01:00
Jocelyn Turcotte
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
Klaas Freitag
a2aab28ba6
ShareDialog: Connect the proper DateEdit signal.
2015-03-11 15:46:05 +01:00
Klaas Freitag
8e7b7caf04
ShareDialog: If the password is empty, disable button
2015-03-11 14:57:55 +01:00
Klaas Freitag
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
Klaas Freitag
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
Klaas Freitag
5a6eecd694
doc: Added snippet about custom WebDAV properties.
2015-03-11 14:11:18 +01:00
Christian Kamm
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
Jocelyn Turcotte
db7919dc2f
Shrink sizeof(SyncFileItem) by 20%
...
Move all small fields together in the struct and make them use bitfields.
Also remove the unused log::_other_remotePerm field.
2015-03-11 11:49:11 +01:00
Olivier Goffart
4a01644625
Disable parallel uploads for server versions <= 8.0.2
...
Issue #2938
2015-03-11 11:31:51 +01:00
Jenkins for ownCloud
1ca68140f6
[tx-robot] updated from transifex
2015-03-11 02:18:42 -04:00
Klaas Freitag
071177cee2
Output a more sensible error message for auth errors
2015-03-10 12:14:14 +01:00
Klaas Freitag
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
Jenkins for ownCloud
791a0fd01e
[tx-robot] updated from transifex
2015-03-10 02:18:50 -04:00
Markus Goetz
3b12b9d81d
Revert "Propagator: Delete job on finish"
...
Needs a bit more thinking.
This reverts commit 8746914f3b
2015-03-09 16:19:16 +01:00
Markus Goetz
31e4009737
Propagator: Use QBA for responseTimestamp instead of QString
2015-03-09 15:52:52 +01:00
Markus Goetz
8746914f3b
Propagator: Delete job on finish
2015-03-09 15:41:43 +01:00
Klaas Freitag
2fa6839ac7
Make win32 build work again.
2015-03-09 15:14:55 +01:00
Klaas Freitag
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
Jenkins for ownCloud
659f5ad301
[tx-robot] updated from transifex
2015-03-09 02:18:47 -04:00
Jenkins for ownCloud
6fe7f01a8d
[tx-robot] updated from transifex
2015-03-07 02:18:24 -05:00
Jocelyn Turcotte
99f51998f2
Fix a crash in the crash reporter on OSX
...
The install_name of dependent libraries need to be updated
like we do for cmd and gui.
2015-03-06 19:28:53 +01:00
Jocelyn Turcotte
4c13992f5d
Add a gen_sym_files script for OSX
...
This attempts to replicate what i686-w64-mingw32-gen_sym_files
is doing for us with MinGW by parsing the output of otool -L
to get the library name actually used by the executable.
2015-03-06 19:28:53 +01:00
Klaas Freitag
40cdbda312
Merge pull request #2927 from owncloud/bump-copy-right-to-2015
...
Bump Copyright year to 2015
2015-03-06 16:43:12 +01:00
Klaas Freitag
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
Klaas Freitag
b6e24cbd45
Push version to beta3
2015-03-06 16:41:59 +01:00
Klaas Freitag
d2848b9c26
Theme: Return the correct version string from version()
2015-03-06 16:41:59 +01:00
Daniel Molkentin
227ed8ae07
win32: libproxy is not needed
2015-03-06 15:47:15 +01:00
Lukas Reschke
bd8b7cdff2
Bump Copyright year to 2015
...
Otherwise the copyright meta-info of the application shows 2014
2015-03-06 11:54:03 +01:00
Markus Goetz
b622981b23
SyncEngine: Show a debug msg only when relevant
2015-03-06 09:28:50 +01:00
