chylex/Nextcloud-Desktop
1
0
Fork 0
mirror of https://github.com/chylex/Nextcloud-Desktop.git synced 2024-10-31 11:42:48 +01:00
Code
14,959 Commits 4 Branches 173 Tags 91 MiB
v3.0.3
Commit Graph

14959 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
Daniel Molkentin
b1d2e1fa10 More translation adjustments 2015-01-29 14:44:48 +01:00
Daniel Molkentin
44e1d33faa Further string fixes 2015-01-29 13:35:48 +01:00
Daniel Molkentin
183b3c61e4 Update NSIS installer to install ContextMenu Extension 2015-01-29 13:19:54 +01:00
Daniel Molkentin
a199f2ba40 Update binary to reflect state of last commit 2015-01-29 13:13:43 +01:00
Daniel Molkentin
d6c4f749a6 Windows Shell Integration: Also ensure correct TargetName on x86/release 2015-01-29 13:03:38 +01:00
Daniel Molkentin
8af2c6c397 Update MSVC Project files to a consistent state 2015-01-29 13:00:30 +01:00
Daniel Molkentin
367ef7195a Windows Shell Integration: Fix warnings 2015-01-29 13:00:29 +01:00
Christian Kamm
43d6dbb0f2 SQL: Add debugging options. #2693 
OWNCLOUD_SQLITE_JOURNAL_MODE: To use something else than WAL
OWNCLOUD_SQLITE_TEMP_STORE: To test with storing temporaries in memory.
 2015-01-29 11:02:01 +01:00
Christian Kamm
cd0ad21132 SQL: Improve error reporting of failed exec(). #2693 2015-01-29 09:47:48 +01:00
Daniel Molkentin
6fa73e073f Certificate Wizard: Remove dead code, cleanup style 2015-01-28 17:38:38 +01:00
Christian Kamm
5fc231cda4 Shib: Fix fetching of 'user'. #2751 2015-01-28 15:15:35 +01:00
Daniel Molkentin
1ca8ab81c7 Fix for non C++11 compilers 2015-01-28 14:19:37 +01:00
Olivier Goffart
22d3a4a48f csync_owncloud: don't deref null pointer 2015-01-28 14:16:33 +01:00
Olivier Goffart
d70e146c1f Merge remote-tracking branch 'origin/ssl_client_cert' 
Conflicts:
	CMakeLists.txt
	csync/src/CMakeLists.txt
	csync/src/csync_owncloud.c
 2015-01-28 14:13:40 +01:00
Klaas Freitag
3888a461f3 Set APPLICATION_SHORTNAME correctly, fixes prev. commit 2015-01-28 13:55:09 +01:00
Klaas Freitag
4df2c8d872 cmake: Have a defined APPLICATION_SHORTNAME again. 
The most scripts expect the APPLICATION_SHORTNAME to be a lowercase
APPLICATION_NAME. Is needed in package building.
 2015-01-28 13:53:06 +01:00
Daniel Molkentin
989005d616 Clientcert support: Explictly link libsync against openssl 2015-01-28 13:31:17 +01:00
Daniel Molkentin
ed05a24cc4 Merge pull request #2749 from vtsingaras/patch-1 
Update Toolchain-mingw32-openSUSE.cmake
 2015-01-28 13:10:42 +01:00
Christian Kamm
2cee591b0e Merge branch 'sharedialog_fixes' of git://github.com/rullzer/client 
Fix missing OcsShareJob constructor.

Conflicts:
	src/gui/sharedialog.cpp
 2015-01-28 12:19:40 +01:00
ckamm
8a71d7d254 Merge pull request #2730 from rullzer/filebrowser_integration 
Sharedialog: 404 is also an acceptable response when retriving shares
 2015-01-28 12:09:33 +01:00