Markus Goetz
b62b87eed3
OS X: Rename LiferayNativity code for shell icons
2014-08-18 12:57:29 +02:00
Klaas Freitag
4b716f3ea6
About page: Fix the translation of developer names.
2014-08-18 12:17:13 +02:00
Klaas Freitag
ddbe181e48
Update phase progress: Check if callback is defined.
2014-08-18 11:51:45 +02:00
Klaas Freitag
27f9d4523b
Settings: Display the commit SHA both in branded and unbranded.
...
Also, do not put the developer names into the translation string.
2014-08-18 11:27:56 +02:00
Jenkins for ownCloud
8a7cfbd8de
[tx-robot] updated from transifex
2014-08-18 01:25:25 -04:00
Volkan Gezer
463a9a5485
space
2014-08-17 17:38:33 +02:00
Jenkins for ownCloud
ee7fe4a38a
[tx-robot] updated from transifex
2014-08-17 01:25:21 -04:00
Klaas Freitag
dccb9def3a
Merge pull request #2067 from owncloud/grammar
...
subject verb agreement - very good, thanks.
2014-08-16 12:13:01 +02:00
Jenkins for ownCloud
5c5d57a996
[tx-robot] updated from transifex
2014-08-16 02:06:14 -04:00
Jenkins for ownCloud
de2ce5a0a2
[tx-robot] updated from transifex
2014-08-16 01:25:23 -04:00
Sandro Knauß
7b114e2cae
Use QStandardPaths for linux if building with qt>=5
2014-08-16 03:12:20 +02:00
Volkan Gezer
25d519fed3
subject verb agreement
2014-08-15 20:49:47 +02:00
Klaas Freitag
8d819956d3
Tests: Fixed the CSync statedb test defined in the mirall module.
2014-08-15 18:33:04 +02:00
Klaas Freitag
4aec783362
Nautilus Overlays: Fix: do not change an dictionary which is iterated.
...
Also, item.invalidate_extension_info() is sufficient, no need to call
update_file_info afterwards.
2014-08-15 17:16:47 +02:00
Klaas Freitag
b494181764
Nautilus Overlays: Use port 34001 by default.
2014-08-15 17:16:47 +02:00
Olivier Goffart
9575271fcd
Selective sync: hide the header
2014-08-15 16:49:22 +02:00
Olivier Goffart
b6eda9076e
Selective sync: add a page in the folder wizard
2014-08-15 16:40:11 +02:00
Markus Goetz
88072a985a
SyncEngine & UI: Move QElapsedTimer to object
...
Using a function static is too dangerous when multiple threads are involved.
2014-08-15 16:20:43 +02:00
Markus Goetz
c27f151451
SyncEngine & UI: Make the function part of UpdateJob
...
That way we can easily emit UploadJob's signals
2014-08-15 16:11:51 +02:00
Markus Goetz
64a7025522
CSync: Add a 30 second connect (not read) timeout
2014-08-15 15:54:13 +02:00
Markus Goetz
ce2741cebc
SyncEngine & UI: Progress notifications for update phase
...
For each directory (local and remote, we have UI update throtting code)
a signal is emitted.
It is used by the settings dialog and the tray menu.
2014-08-15 15:28:35 +02:00
Daniel Molkentin
b40b670639
Remove owncloud_logo_blue.png from mirall.qrc resource
...
It not used in mirall itself.
2014-08-15 15:12:42 +02:00
Daniel Molkentin
3d6b622879
Merge pull request #2064 from owncloud/fix-1959
...
Show folder icon a offline when account is offline
2014-08-15 15:11:06 +02:00
Daniel Molkentin
4c67a8812a
Show folder icon a offline when account is offline
...
Fixes #1959
2014-08-15 15:01:01 +02:00
Olivier Goffart
4c4d02c0d0
Selective Sync: refactor the widget in its own class
2014-08-15 14:58:16 +02:00
Olivier Goffart
c1831f4946
Selective sync: use a black list instead of a white list
2014-08-15 12:29:10 +02:00
Olivier Goffart
4b2c1bacd1
Merge remote-tracking branch 'origin/master' into selective_sync
2014-08-15 10:28:50 +02:00
Jenkins for ownCloud
3909102436
[tx-robot] updated from transifex
2014-08-15 01:25:29 -04:00
Klaas Freitag
78e50747e4
Updated the about text for the generic ownCloud Theme.
2014-08-14 17:12:23 +02:00
Klaas Freitag
b09498d852
csync journal: Improve get_below_path query.
...
Add another index on the pathlen column. Use that column to deselect
all rows that are shorter than the path to search files below. That
shrinks the amount of rows to examine using LIKE tremendously by
a cheaply to query for criteria.
2014-08-14 13:52:44 +02:00
Klaas Freitag
7fcf723039
SyncJournal: Add an index on inode to the journal database.
2014-08-14 13:22:43 +02:00
Klaas Freitag
d27ab8c6ca
Revert "FolderMan: Proper singleton implementation."
...
This reverts commit 0350508b65
2014-08-14 12:46:01 +02:00
Klaas Freitag
0350508b65
FolderMan: Proper singleton implementation.
...
The connect in SocketAPI had to be moved because it also uses
FolderMan::instance(). And since SocketAPI is instanciated in
FolderMans constructor, this was a deadlock.
Now the connect is tried on every new socket connection in SocketAPI
but I assume that multiple attempts to connect are not an issue.
2014-08-14 11:32:03 +02:00
Klaas Freitag
32739cc305
SyncEngine: End the journal transaction after update.
2014-08-14 11:32:02 +02:00
Klaas Freitag
f515fe77c4
SyncJournal: Fix logging text.
2014-08-14 11:32:02 +02:00
Klaas Freitag
f6d20cbe55
nautilus overlay: Fix reconnect, create a new socket everytime.
2014-08-14 11:07:31 +02:00
Klaas Freitag
8bc0d9acd3
Updater: Added a bit of useful logging.
2014-08-14 11:07:31 +02:00
Klaas Freitag
73325bcd41
csync statedb: Fixed handling of sqlite reply value.
2014-08-14 11:07:31 +02:00
Klaas Freitag
1b5bbfdad3
csync statedb: Set sqlite3_busy_timeout to 5 seconds.
2014-08-14 11:07:31 +02:00
Klaas Freitag
fcd211b190
overlayNautilus: Better reconnect behaviour if mirall was not running.
2014-08-14 11:07:31 +02:00
Jenkins for ownCloud
55b3eb467f
[tx-robot] updated from transifex
2014-08-14 01:25:22 -04:00
Jenkins for ownCloud
192c23bfce
[tx-robot] updated from transifex
2014-08-13 02:06:14 -04:00
Jenkins for ownCloud
72e0418e4c
[tx-robot] updated from transifex
2014-08-13 01:25:32 -04:00
Daniel Molkentin
4fc044d368
Merge branch 'master' into move_lib_to_sep_dir
...
Conflicts:
cmake/modules/NSIS.template.in
src/CMakeLists.txt
src/creds/shibboleth/authenticationdialog.cpp
src/creds/shibboleth/authenticationdialog.h
src/gui/owncloudgui.cpp
src/libsync/creds/shibboleth/authenticationdialog.cpp
src/libsync/creds/shibboleth/authenticationdialog.h
src/libsync/mirallaccessmanager.cpp
src/mirall/authenticationdialog.cpp
src/mirall/authenticationdialog.h
2014-08-12 21:08:44 +02:00
Daniel Molkentin
1544606bf0
Always handle 401 requests, except for network jobs
...
It is not enough to only implement it for the QNAM returned
by the ShibbolethCredentials, because we sometimes need it
when we have no valid credentials set (and are using dummy
credentials in the course). The main use case is the
Webview opened by Shibboleth for FBA.
But as a side-effect, we can use it to handle auth requests
from the updater and other places.
2014-08-12 19:25:59 +02:00
Olivier Goffart
255330d342
Add a "Skip Folder Configuration" button in the wizard
...
This allow to start owncloud the first time but not automatically sync
everything, but let the user configure sub folders instead
2014-08-12 17:34:54 +02:00
Olivier Goffart
ad139e19ab
Fix error reported by address sanitizer
...
Qt allow to call deleteLater on a null object, but it is an undefined behaviour
2014-08-12 17:34:54 +02:00
Markus Goetz
4c0891a22e
Tests: Give a more random name to test directories
...
Conflicts:
csync/tests/ownCloud/ownCloud/Test.pm
2014-08-12 16:27:03 +02:00
Markus Goetz
8e6e51f9a6
OS X: Move include to MAC define
2014-08-12 14:58:34 +02:00
Markus Goetz
faa502163e
OS X: Finally(?) fix stay-on-top behaviour of settings dialog
...
Fixes #1795
2014-08-12 14:48:42 +02:00
