Daniel Molkentin
48c9222578
Switch back to an existing sha
2015-03-23 22:40:57 +01:00
Daniel Molkentin
b5ea56df73
Add docker buildscript for win32
2015-03-23 22:24:43 +01:00
Carla Schroder
d55d8c0152
add note re linux password managers
2015-03-23 10:57:05 -07:00
Carla Schroder
2fdf6dd8f2
Merge pull request #3008 from owncloud/passman
...
add note re password managers
2015-03-23 10:55:24 -07:00
Carla Schroder
5b8c9eb16f
add note re password managers
2015-03-23 10:52:57 -07:00
Olivier Goffart
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
Daniel Molkentin
c7eb85ef78
Activity: Correctly restore column sizes
...
Fixes : #3005
2015-03-23 18:22:25 +01:00
Olivier Goffart
4df455f2e0
Add-folder Wizard: Select the newly created folder
2015-03-23 16:50:37 +01:00
Olivier Goffart
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
Jocelyn Turcotte
3c9acdf724
Fix a crash when accessing a dangling UploadDevice pointer #2984
...
This is largely a guess, but this is the only place where we use
a QIODevice to push data through QNAM and that the QIODevice isn't
a direct child of the QNetworkReply.
Fix the issue by making sure that we don't go back to the event loop
and possibly handle network events between the destruction of the
upload QIODevice and the QNetworkReply, which might lead to QNAM
dereferencing a dangling QIODevice pointer.
2015-03-23 16:14:54 +01:00
Olivier Goffart
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
Olivier Goffart
9d7cf6b852
Merge remote-tracking branch 'origin/1.8'
2015-03-23 14:37:16 +01:00
Jocelyn Turcotte
ad5620efb5
Disable asserts in official builds
...
Make sure that we define NDEBUG in all configurations.
Also remove inconsistent defines:
WIN32: We don't use
_DEBUG;_WINDOWS;_USRDLL: Should be defined by the compiler if necessary
OCCONTEXTMENU_EXPORTS: We currently don't use dllimport anyway
This also update the binary submodule with an updated build.
2015-03-23 13:53:09 +01:00
Daniel Molkentin
f455c71338
Merge pull request #2997 from owncloud/fix_shell-integration-python3
...
fix python3 syntax errors
2015-03-23 11:28:28 +01:00
Olivier Goffart
033f2cd231
Merge pull request #2998 from owncloud/remove-old-mirall-translation
...
Remove forgotten file.
2015-03-23 11:06:14 +01:00
Hefee
c9eccd729d
Remove forgotten file.
2015-03-22 18:01:25 +01:00
Hefee
b1100cd9e5
fix python3 syntax errors
2015-03-22 17:49:09 +01:00
Jenkins for ownCloud
8f728ddfb2
[tx-robot] updated from transifex
2015-03-20 02:18:41 -04:00
Christian Kamm
4ef0ce112c
CookieJar: Session cookies should *not* be stored in cookies.db.
2015-03-19 11:57:25 +01:00
Christian Kamm
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
Christian Kamm
89f831e7d4
Remote delete: Consider 404 a success. #2919
2015-03-19 10:04:02 +01:00
Jenkins for ownCloud
917b8409ae
[tx-robot] updated from transifex
2015-03-19 02:18:50 -04:00
Daniel Molkentin
1d3100848e
Merge pull request #2915 from oostenveld/patch-1
...
fixed small typo in read me
2015-03-18 15:25:54 +01:00
Jenkins for ownCloud
86fd39e3a9
[tx-robot] updated from transifex
2015-03-18 02:18:42 -04:00
Jenkins for ownCloud
04db332051
[tx-robot] updated from transifex
2015-03-18 01:15:17 -04:00
Markus Goetz
06a2f58c51
Propagator: Introduce custom property to make error soft
...
This can be set by a custom credential QNAM.
2015-03-17 23:31:30 +01:00
Jenkins for ownCloud
b87d55758b
[tx-robot] updated from transifex
2015-03-17 02:18:44 -04:00
Klaas Freitag
38ef525d5e
Push version to final 1.8.0
2015-03-16 15:28:58 +01:00
Jenkins for ownCloud
367b1fcc33
[tx-robot] updated from transifex
2015-03-16 02:18:44 -04:00
Jenkins for ownCloud
f5c930968e
[tx-robot] updated from transifex
2015-03-14 02:18:44 -04:00
Jocelyn Turcotte
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
Markus Goetz
6c4b7f1479
OS X: Always return 0 from pre_install.sh
2015-03-13 16:35:44 +01:00
Markus Goetz
c42c9f0002
Propagator: Add comment
2015-03-13 15:48:35 +01:00
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
