Daniel Molkentin
59bdda6226
Require OpenSSL > 1.0.0, remove obsolete dep from csync
2015-02-05 13:08:28 +01:00
Olivier Goffart
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
Jenkins for ownCloud
4f03234487
[tx-robot] updated from transifex
2015-02-05 02:06:15 -05:00
Olivier Goffart
3dd8ce08b8
Parallel chunk upload: Fix a off-by-one while saving the done chunk in the DB
...
We should assume that the chunk currently uploading is NOT done (hence the -1)
il task 405
2015-02-04 18:52:26 +01:00
Markus Goetz
f233af04f6
Windows XP: Possible fix for #2648
2015-02-04 18:49:04 +01:00
Markus Goetz
3a1501dea4
OS X: Connect to newest possible overlay icon socket
...
This is for branded ownCloud clients which use a different file name.
2015-02-04 18:44:00 +01:00
Olivier Goffart
11f1229c31
Fix Qt4 build
2015-02-04 18:04:50 +01:00
Olivier Goffart
acb7e972ea
Merge pull request #2778 from jturcotte/master
...
Allow building natively on Windows with MinGW
2015-02-04 17:11:56 +01:00
Jocelyn Turcotte
667665b809
Add documentation to build on Windows directly with MinGW
...
This doesn't link to the Generic Build Instructions section like other
platforms documentation does since the cmake and make commands are
different.
2015-02-04 16:57:56 +01:00
Jocelyn Turcotte
1ac523ec01
Output libocsync and libowncloudsync in the bin directory
...
Windows finds DLLs using PATH or the directory of the process'
executable. By outputing those dependend DLLs together with
owncloud.exe, the developer only need to have OpenSSL's bin
and the qtkeychain build directory in his PATH to let the
dynamic linker find them.
As the documentation of RUNTIME_OUTPUT_DIRECTORY points out,
this only affects windows as other platforms don't consider
libraries as runtime targets.
2015-02-04 15:00:22 +01:00
Olivier Goffart
ca56e5d9ca
SyncEngine: Fix crash
...
We must check if 'it' is not == to begin() before doing it-1
Also i believe the logic was reversed if it was begin()
Task #2765
2015-02-04 14:52:41 +01:00
Jocelyn Turcotte
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
Olivier Goffart
68ec24797b
Add some define.
...
Since Qt5.4, on release build, qDebug do not provide anymore the line
number unless we define QT_MESSAGELOGCONTEXT
Also define QT_USE_QSTRINGBUILDER while i'm on it (free optimisation)
2015-02-04 13:43:02 +01:00
Olivier Goffart
26132fd14e
owncloudconnectionmethoddialog: typo
2015-02-04 13:42:49 +01:00
Jenkins for ownCloud
5fdf9bb7d2
[tx-robot] updated from transifex
2015-02-04 02:06:17 -05:00
Olivier Goffart
ca68ccd76a
Fix Qt4 build
2015-02-03 20:04:04 +01:00
Olivier Goffart
1f9d7c41e8
owncloudconnectionmethoddialog: Change order of buttons, fix wording, and add the URL
2015-02-03 17:55:01 +01:00
Olivier Goffart
52d330d8e5
csync: add neon include directories
2015-02-03 16:00:55 +01:00
Klaas Freitag
17eb509c4e
Merge pull request #2771 from rullzer/sharedialog_copybtn
...
Sharedialog: add copy button text and actually connect the button
2015-02-03 13:56:05 +01:00
Roeland Jago Douma
48254579a2
Sharedialog: add copy button text and actually connect the button
2015-02-03 13:02:52 +01:00
Markus Goetz
9d93642102
Update CONTRIBUTING.md
...
Fix broken links
2015-02-03 12:04:51 +01:00
Daniel Molkentin
a3106b1771
Client Dialog Support: Fix certificate dialog
2015-02-02 23:35:39 +01:00
Daniel Molkentin
d2670b8473
Merge pull request #2767 from jdhoek/feature/choose-connection-method
...
Add dialog to connection wizard for client-side TLS certificates
2015-02-02 23:22:19 +01:00
Jeroen Hoek
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
Jenkins for ownCloud
6c3e19e531
[tx-robot] updated from transifex
2015-02-02 02:06:11 -05:00
Jenkins for ownCloud
ed49a708d0
[tx-robot] updated from transifex
2015-02-01 02:06:12 -05:00
Jenkins for ownCloud
e04300a01c
[tx-robot] updated from transifex
2015-01-31 02:06:13 -05:00
Carla Schroder
65cebe7edd
Merge pull request #2759 from owncloud/desktopsync
...
remove obsolete account setup page
2015-01-30 14:08:49 -08:00
Carla Schroder
63cda04b56
remove obsolete account setup page
2015-01-30 14:05:47 -08:00
Carla Schroder
acda7bddb8
Merge pull request #2758 from owncloud/install
...
updated installation page 1.8 client
2015-01-30 13:00:14 -08:00
Carla Schroder
6ffc04808d
typo fixes 1.8 install
2015-01-30 12:58:42 -08:00
Carla Schroder
c932e26f83
markup and typo fixes 1.8 install page
2015-01-30 12:54:49 -08:00
Carla Schroder
682ce2e1e2
New page on installing 1.8 client
2015-01-30 12:48:12 -08:00
Carla Schroder
9873204be6
replace references to "Mirall" with "client"
2015-01-30 09:14:42 -08:00
Christian Kamm
49021fd96d
SyncJournal: Reset all prepared statements. #2757
...
Makes closing of the database actually release file locks.
2015-01-30 15:35:42 +01:00
Klaas Freitag
5dc2871e2b
Nautilus plugin: Fix broken indentation (python).
2015-01-30 14:27:15 +01:00
Klaas Freitag
481d4f3478
CMake: Changed message about compiling against Qt4.
2015-01-30 13:21:38 +01:00
Jenkins for ownCloud
5cf8726e60
[tx-robot] updated from transifex
2015-01-30 02:06:17 -05:00
Olivier Goffart
db6214e090
SyncEngine: Do not assert when the neon session is 0
...
It can now be 0 if neon is not in used
Issue #2755
2015-01-30 01:05:46 +01:00
Markus Goetz
bb215ad095
OS X: Don't show menu item outside sync folder
...
As per #2732
2015-01-29 21:13:09 +01:00
Markus Goetz
df214cd6c1
Folder: Make debug message clearer
...
The thread was actually already started in the discovery phase.
2015-01-29 20:47:45 +01:00
Markus Goetz
ea72d7bb11
CMake: Remove FIXME
2015-01-29 20:47:33 +01:00
Klaas Freitag
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
Klaas Freitag
37f19dd0fe
nautilus menu: Do not show entry on external files.
2015-01-29 18:11:04 +01:00
Daniel Molkentin
0c987f58e6
FF binary submodule
2015-01-29 16:43:07 +01:00
Daniel Molkentin
f84758eaac
Add Resource File for OCContextMenu, adjust (c) dates.
2015-01-29 16:37:51 +01:00
Daniel Molkentin
8c58236e7c
Remove template file
2015-01-29 16:13:36 +01:00
Daniel Molkentin
027328d3a6
Windows Integration: Don't use size_t in StringUtil, it's unsigned
2015-01-29 16:11:42 +01:00
Daniel Molkentin
332601ed26
Remove noisy debug output
2015-01-29 15:37:21 +01:00
Daniel Molkentin
6c0a449ebe
NSIS: Fix c&p error
2015-01-29 15:25:14 +01:00
