Daniel Molkentin
46abd47bfe
Merge pull request #2787 from cmeh/patch-1
...
Orthography: "an folder" corrected to "a folder"
2015-02-06 10:31:57 +01:00
Olivier Goffart
2a88f5083c
t6.pl: Add a test that re-upload a chunked file with lot of chunks
2015-02-06 10:23:20 +01:00
Olivier Goffart
5ec793e045
propagateupload: Save the mtime given by the server in the reply to GET
...
There could be a race condition if the file was updated on the server
between the discovery and the propagate phase. By taking the mtime from
the server, we make sure that we do not have a race.
This is tested by t6.pl with BIG3.file because the script was modifying
the file between the two phases
2015-02-06 10:23:20 +01:00
cmeh
1554f41441
Orthography: "an folder" corrected to "a folder"
2015-02-06 10:22:49 +01:00
Daniel Molkentin
9e945eb471
Settings dialog: better color for separator line
2015-02-06 08:30:51 +01:00
Jenkins for ownCloud
b5212c4467
[tx-robot] updated from transifex
2015-02-06 02:06:13 -05:00
Daniel Molkentin
c4dd1cfb69
Mac Settings Dialog: Native icons for account
2015-02-06 07:54:25 +01:00
Jenkins for ownCloud
00774b95a1
[tx-robot] updated from transifex
2015-02-06 01:25:20 -05:00
Jenkins for ownCloud
7de559f351
[tx-robot] updated from transifex
2015-02-05 19:11:07 -05:00
Volkan Gezer
eaa9c4fdf8
json capital
2015-02-05 20:41:08 +01:00
Jenkins for ownCloud
6050d5873c
[tx-robot] updated from transifex
2015-02-05 13:58:32 -05:00
Markus Goetz
94e61c3205
Notifications: Fix creation of notification (fixup2)
...
For #2728
2015-02-05 17:20:52 +01:00
Markus Goetz
c4cf13bd97
Notifications: Fix creation of notification (fixup)
...
For #2728
2015-02-05 16:55:32 +01:00
Markus Goetz
71e22ffe2c
Notifications: Fix creation of notification
...
For #2728
2015-02-05 16:46:40 +01:00
Olivier Goffart
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
Daniel Molkentin
e7b190404a
FF binary submodule to include the XP build fix
2015-02-05 16:16:42 +01:00
Markus Goetz
446e2b27d7
OS X Sparkle: Fix warning
2015-02-05 15:49:46 +01:00
Olivier Goffart
856df4c5f6
libsync: Get the capabilities and store it in the account
2015-02-05 15:42:56 +01:00
Olivier Goffart
34237f604e
JsonApiJob: Refactor out of the shibbolethuserjob
2015-02-05 15:42:01 +01:00
Daniel Molkentin
6d380c8548
cmake: Clearly Define qtmain.lib link policy on Windows
2015-02-05 15:37:22 +01:00
Jocelyn Turcotte
af0001a149
[shell_integration] Remove the usage of Win32 APIs not available on XP
2015-02-05 15:15:05 +01:00
Jocelyn Turcotte
2debd5a198
[shell_integration] Setup precompiled headers properly with MSVC
...
This also fixes a minor compile error when using VS Express.
2015-02-05 15:14:42 +01:00
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
