Commit graph

8265 commits

Author SHA1 Message Date
Carla Schroder
9f24f10186 Update installing.rst 2015-08-27 10:07:54 +02:00
Carla Schroder
bc37668e9f 1st batch of updates for 2.0 2015-08-21 13:19:15 -07:00
Daniel Molkentin
22d87218b7 Merge pull request #3601 from individual-it/master
checking if file or folder is to be shared to fix issue #3556
2015-08-18 11:45:31 +02:00
Markus Goetz
62d64acd7b Merge pull request #3589 from owncloud/sharedir
Use SHAREDIR for i18n dir
2015-08-13 16:02:11 +02:00
Individual IT Services
c6ff73f3e5 checking if file or folder is to be shared to fix issue #3556 2015-08-12 21:48:04 +05:45
hefee
a87602af3f use SHAREDIR for i18n
SHAREDIR is used in src/gui/application.cpp and should also use that in
CMakeLists.txt.
2015-08-11 15:14:59 +02:00
Daniel Molkentin
3ce210f298 Merge pull request #3578 from owncloud/LukasReschke-patch-1
Use HTTPS links
2015-08-10 12:29:23 +02:00
Lukas Reschke
f74053f8ed Use HTTPS links
No need to have an additional redirect
2015-08-10 12:15:45 +02:00
Olivier Goffart
68cff5cd10 Merge branch '2.0' 2015-08-07 11:31:44 +02:00
Daniel Molkentin
b906c70a86 ownSql: Do not use sqlite3 method not present in older version
Was only used for debug output anyway and broke RHEL/CentOS6
2015-08-07 11:14:14 +02:00
Olivier Goffart
2a4396fbdb Fixup ce5be89a18 2015-08-07 11:05:04 +02:00
Daniel Molkentin
9ecd892a48 Editorial changes to Changelog 2015-08-07 09:29:55 +02:00
Daniel Molkentin
c7353fc382 Revert "win32: libwebp has been bumped to version 5"
This reverts commit 18efb21157.

Our toolchain relies on an older version now that has version 4
2015-08-07 09:21:08 +02:00
Jenkins for ownCloud
b8b4e2c094 [tx-robot] updated from transifex 2015-08-07 09:03:56 +02:00
Jenkins for ownCloud
ee75d37983 [tx-robot] updated from transifex 2015-08-07 02:18:51 -04:00
Daniel Molkentin
ecf545a0b9 Updater: update Linux updater code to work with changes in master
master moved much of the responsibility of the updating process
to the updater class.

This also fixes a build failure
2015-08-06 19:34:23 +02:00
Daniel Molkentin
aade9111d4 ownCloud Client 2.0 beta1 2015-08-06 18:20:07 +02:00
Markus Goetz
7c52e925b9 Propagator: Use fetchAndAddAcquire to get parallelism 2015-08-06 18:13:48 +02:00
Markus Goetz
b5edc635a1 Windows: Don't use UTF-8 arrows #3095 2015-08-06 18:08:05 +02:00
Daniel Molkentin
6a20ea5e73 Merge pull request #3472 from owncloud/linux_restart_on_new_version
On Linux restart if new version is found on disk
2015-08-06 17:47:10 +02:00
Jenkins for ownCloud
cad2d639af [tx-robot] updated from transifex 2015-08-06 11:37:16 -04:00
Daniel Molkentin
5657d4ec1b NSIS: Remove (almost untranslated) Slovak tr for now 2015-08-06 17:36:53 +02:00
Daniel Molkentin
4b9352f291 Fix codepages for Czech and Slovak 2015-08-06 17:36:53 +02:00
Markus Goetz
2d49f4c844 AbstractNetworkJob: Make sure to print URL on timeout 2015-08-06 17:33:33 +02:00
Markus Goetz
71c9e4da16 Update ChangeLog for 2.0
Info taken from commits
(danimo's taken from github issues)
2015-08-06 17:28:52 +02:00
Daniel Molkentin
50195ce4be Revert "Update NSIS translations"
This reverts commit 47a8fbb07e.
2015-08-06 17:19:37 +02:00
Daniel Molkentin
47a8fbb07e Update NSIS translations 2015-08-06 17:08:53 +02:00
Daniel Molkentin
3501f66a0f Update ChangeLog 2015-08-06 17:00:33 +02:00
Markus Goetz
049d49eba8 OwnSql: Show potential error on close #3421 2015-08-06 15:47:38 +02:00
Markus Goetz
593aa003d6 Propagator: Re-order statement of previous commit
The user should be allowed to override.
For issue #3382
Will also help for #3095
2015-08-06 15:28:50 +02:00
Olivier Goffart
29d7903c22 Propagator: do not use parallelism when we have bandwidth limit
When user wants to limit the bandwidth, he does not care about speed
anymore. And parallelism on slow network might cause problems.

For issue #3382
Will also help for #3095

(cherry picked from commit b20f29f22797367c7aa92bd74389c99b10c852a4)
2015-08-06 15:27:18 +02:00
Markus Goetz
1feb74981e Progress: Show real speed and all filenames #3403 #3095 2015-08-06 15:25:16 +02:00
Olivier Goffart
2cf29352b8 SyncJournalDB: clear all the prepared query when closing the database
Not closing it may keep the file open (issue #3421)
2015-08-06 14:28:02 +02:00
Olivier Goffart
ce5be89a18 Fix warning
csync_vio_local_unix.c:109:7: warning: ignoring return value of function declared with
      warn_unused_result attribute [-Wunused-result]
      asprintf(&file_stat->original_name, "%s/%s", handle->path, dirent->d_name);
      ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
2015-08-06 13:58:04 +02:00
Olivier Goffart
7202bbcf5d Fix Qt4 build 2015-08-06 13:58:03 +02:00
Markus Goetz
aee20e0ed3 1.8 Migration: Fix password overwrite #3539 2015-08-06 12:49:18 +02:00
Daniel Molkentin
72b2c52e15 Merge branch 'master' into linux_restart_on_new_version
Conflicts:
	src/gui/application.cpp
	src/gui/owncloudsetupwizard.cpp
2015-08-06 11:11:52 +02:00
Markus Goetz
7985c0d7f1 Merge pull request #3531 from jturcotte/master
Remove need for UPDATE_VIEW to refetch the status #2340
2015-08-06 11:03:28 +02:00
Jocelyn Turcotte
12fbca48b8 Merge pull request #3562 from owncloud/revert-2920-utility_SHGetKnownFolderPath
Revert "Use dynamic library loading for detecting the correct path for links #2920"
2015-08-06 10:43:04 +02:00
Jocelyn Turcotte
a9858d4ed2 Revert "Use dynamic library loading for detecting the correct path for links" 2015-08-06 10:41:33 +02:00
Olivier Goffart
499e13377d check_vio_ext.c: assert_string_equal is a macro and we cannot have #ifdef in it 2015-08-06 10:02:12 +02:00
Jenkins for ownCloud
6e32c2c14e [tx-robot] updated from transifex 2015-08-06 02:19:02 -04:00
Daniel Molkentin
26cb737bb1 Merge pull request #3558 from owncloud/si-units
Utility: use SI units for the sizes in bytes
2015-08-05 17:45:53 +02:00
Olivier Goffart
8ec4d0f19b Utility: use SI units for the sizes in bytes 2015-08-05 16:22:09 +02:00
Olivier Goffart
dc299b0bf9 Account settings: Fix a label
The feature is for all folder, not only shared folder
2015-08-05 16:12:58 +02:00
Olivier Goffart
952c249039 Selective sync: on the first sync, do not ask confirmation for every folders
Since we already confirmed a previous selective sync dialog
2015-08-05 16:11:59 +02:00
Olivier Goffart
0e3262b181 Theme: add a settings for configuring the default of newBigFolderSizeLimit 2015-08-05 15:33:51 +02:00
Olivier Goffart
ba896eabfb FolderStatusModel: do not expand the unconfimred folder themselfs 2015-08-05 15:33:51 +02:00
Olivier Goffart
646890abb3 SettingsDialog: use the same short display name on Win/Linux than on Mac
Issue #3516
2015-08-05 15:33:51 +02:00
Markus Goetz
cad33de824 OS X: Try harder to enable 10.10 plugin #3463 2015-08-05 15:10:00 +02:00