Klaas Freitag
eea982fb14
Merge pull request #4162 from owncloud/phil-davis-patch-1
...
tagLastSuccessfullETagRequest comment wording
2015-11-19 07:36:44 +01:00
Jenkins for ownCloud
5a7eebe16e
[tx-robot] updated from transifex
2015-11-19 01:15:40 -05:00
Phil Davis
55a96af7cc
tagLastSuccessfullETagRequest comment wording
...
Improve this to say what I think it means.
2015-11-19 11:02:15 +05:45
Klaas Freitag
8abaf92083
Merge git://github.com/NvanAdrichem/client into 2.1, pull #4060
2015-11-18 17:00:19 +01:00
Klaas Freitag
b0c29d5c66
Merge pull request #4159 from owncloud/fix_3490
...
csync updater: Handle file firewall reply codes correctly: Ignore the files.
Fixes #3490
2015-11-18 16:55:53 +01:00
Olivier Goffart
41a6f6df84
FolderStatusModel: add hints for translators ( #4158 )
2015-11-18 16:35:11 +01:00
Olivier Goffart
4984da7e0d
Activity Widget: Fix runtime warning
...
Fix the warning:
QLayout: Attempting to add QLayout "" to OCC::ActivitySettings "", which already has a layout
It was caused because one layout was created with the wrong parent
2015-11-18 15:32:39 +01:00
Klaas Freitag
be88e5a2c3
csync_update: refactor a bit and remove redundant code.
2015-11-18 15:31:55 +01:00
Klaas Freitag
e7ad7d405c
csync_update: Add missing comment about 403 forbidden handling.
2015-11-18 15:31:55 +01:00
Klaas Freitag
62d26814b2
SyncEngine: Handle 403 Forbidden properly.
...
A 403 is a reply code sent from the file firewall to indicate that
this directory is forbidden to use for the user.
The patch handles it by setting the state to IGNORED.
This addresses #3490
2015-11-18 15:31:55 +01:00
Markus Goetz
f2d8143511
Activity View: Update only if visible and when becoming visible #4083
2015-11-18 15:25:29 +01:00
Markus Goetz
3c1a605f62
Connectivity: Also accept SyncEngine etag as received ETag
...
Avoids requests on startup.
For #3964
2015-11-18 14:51:28 +01:00
Klaas Freitag
300c1c2055
Merge remote-tracking branch 'origin/depclean' into 2.1
...
Conflicts:
cmake/modules/QtVersionAbstraction.cmake
2015-11-18 14:43:41 +01:00
Klaas Freitag
fb42183bc7
Merge remote-tracking branch 'origin/patches_list' into 2.1
2015-11-18 14:33:32 +01:00
Markus Goetz
65ec8a9e94
Connectivity: Decrease debug logging
...
For #3964
2015-11-18 12:13:21 +01:00
Klaas Freitag
60598c0d34
Use the configuration value of remotePollInterval rather than hardcoded.
2015-11-18 11:40:29 +01:00
Klaas Freitag
3d7fc711ca
AccountState: Avoid ConnectionCheck if ETag job was just done.
...
This patch lets a successful etag job check mark a timestamp.
If next time a connection check is requested, it is checked if
the last ETag happened within the last 30 seconds and if so the
connection check can be checked.
This way we avoid half of the PROPFINDs if all goes well.
2015-11-18 11:40:29 +01:00
Klaas Freitag
46dbca1bf5
ShareDialog: Remove Qt4 incompatible property of QScrollView.
2015-11-18 10:30:02 +01:00
Klaas Freitag
f5da95a5b7
ActivityWidget: Make compile with Qt4
2015-11-18 10:30:01 +01:00
Daniel Molkentin
b37361e21c
Remove spacer that would constrain a vertical resize
...
Fixes #4157
2015-11-18 10:06:38 +01:00
Jenkins for ownCloud
32a208a176
[tx-robot] updated from transifex
2015-11-18 02:18:50 -05:00
Markus Goetz
40395bdc0e
VERSION.cmake: master is now 2.2
2015-11-17 15:47:46 +01:00
Klaas Freitag
5ec4fd94e0
ActivityWidget: No progress indic. for non connected accounts.
2015-11-17 15:05:54 +01:00
Klaas Freitag
c9ef4d5fa0
ActivityWidget: Detect new items in the list to refetch the activities.
...
On refresh, remove the activity list object from the models list.
2015-11-17 14:46:25 +01:00
Klaas Freitag
1cdf0e8597
ActivityWidget: Always combine the final activity list.
...
In cases where the activity app is not activated on the server, the
returned list of activities is empty, so it is better this way.
2015-11-17 14:46:25 +01:00
Daniel Molkentin
7ba88cc9e3
Merge remote-tracking branch 'origin/2.0'
2015-11-17 12:57:31 +01:00
Daniel Molkentin
914df32587
Documentation: Fix PDF logo, version number
2015-11-17 12:55:41 +01:00
Olivier Goffart
e0f54428d0
ShareDialog: softer line separator ( #3737 )
2015-11-17 12:02:20 +01:00
Markus Goetz
52a11b0835
Activities: Fix on Mac #4083
2015-11-17 11:53:49 +01:00
Markus Goetz
ef17dc6482
Connectivity: Improve log output
2015-11-17 11:02:53 +01:00
Markus Goetz
9978dc3f6c
QNAM: Use invalid configuration instead of default configuration
...
For #3969 and others.
2015-11-17 11:02:53 +01:00
Olivier Goffart
f618ed3dfb
gui: Fix some icons in highdpi
...
QIcon does not need to use Theme::hidpiFileName because QIcon takes care
of the @2x images
2015-11-17 10:48:45 +01:00
Olivier Goffart
ef915fb2e5
SharedDialog: Fix the delete icon on windows and mac ( #3737 )
2015-11-17 10:40:45 +01:00
Olivier Goffart
6e42405113
ShareDialog: remove the search button ( #3737 )
2015-11-17 10:24:35 +01:00
Olivier Goffart
11ef07c74a
ActivityWidget: fix compiler warnings
2015-11-17 09:54:38 +01:00
Jenkins for ownCloud
486d7690c4
[tx-robot] updated from transifex
2015-11-17 02:19:08 -05:00
Daniel Molkentin
b3c2c594bd
Add the set of currently used patches
2015-11-16 18:35:50 +01:00
Klaas Freitag
8852911f67
Merge branch 'master' of github.com:owncloud/mirall
2015-11-16 18:16:58 +01:00
Klaas Freitag
e38bc6eab8
AcitivityWidget: Moved timespan-in-words method to utility.
...
Also added a second parameter, fixed plural translation and added
a less-than-a-minute-ago term.
2015-11-16 18:08:25 +01:00
Olivier Goffart
459e200ac0
ShareDialog: add a QScrollArea (issue #4125 )
2015-11-16 18:01:11 +01:00
Klaas Freitag
c781155b60
General Settings page: Remove the add account button.
...
It is now in the toolbox on the account page.
2015-11-16 17:07:05 +01:00
Klaas Freitag
87aa1de67a
Merge branch 'newactivity'
2015-11-16 17:02:05 +01:00
Klaas Freitag
ccb871c30b
ActivityWidget: Show the subject in the Tooltip.
...
the original text might be elided.
2015-11-16 16:44:52 +01:00
Klaas Freitag
74ed0b4f09
Merge pull request #4139 from owncloud/account_toolbox
...
AccountSettings: Add a toolbox button for the account specific actions.
2015-11-16 15:53:30 +01:00
Klaas Freitag
becbb7b284
AccountSettings: Address jans suggestions in #4139
...
- Changed sequence of menu items
- lowercased entries
- removed the "Account" from entries, its in the toolbox button already
- added a little space between toolbox button label and the rectangle.
2015-11-16 15:50:32 +01:00
Klaas Freitag
ff76a842d0
Added some documentation.
2015-11-16 15:38:08 +01:00
Klaas Freitag
a56926b8d9
ActivityWidget: open local file in file manager if exists.
2015-11-16 15:31:24 +01:00
Olivier Goffart
0d21503ee5
ShareDialog: fix auto completion to actualy auto complete
2015-11-16 15:23:02 +01:00
Klaas Freitag
631cb095dd
ActivityWidget: Show the local path in a tooltip.
...
Note that the activity has also entries of files that are not synced so
that not every activity entry has to have a local pendant.
Also, one activity entry can reference multiple files, so only the first
one is shown.
2015-11-16 15:07:02 +01:00
Klaas Freitag
caba719950
Folderman: Added method to find local files for a rel. server path.
2015-11-16 15:04:59 +01:00
