1
0
mirror of https://github.com/chylex/Nextcloud-Desktop.git synced 2024-09-29 00:42:45 +02:00
Commit Graph

15295 Commits

Author SHA1 Message Date
Kevin Ottens
9398260fb3
Merge pull request #2880 from nextcloud/bump_to_3.1.2
Bump release to 3.1.2
2021-01-28 09:27:09 +01:00
Kevin Ottens
ef3922a899
Bump release to 3.1.2
Signed-off-by: Kevin Ottens <kevin.ottens@nextcloud.com>
2021-01-28 08:07:49 +01:00
Nextcloud bot
6bb3db0546
[tx-robot] updated from transifex 2021-01-28 03:58:34 +00:00
Kevin Ottens
71633e78bb
Merge pull request #2878 from nextcloud/backport/2872/stable-3.1
[stable-3.1] Use push notifications for Tray activities/notifications fetch trigger.
2021-01-27 19:34:36 +01:00
allexzander
1d3bc4e961 Use push notifications for Tray activities/notifications fetch trigger.
Signed-off-by: allexzander <blackslayer4@gmail.com>
2021-01-27 18:19:32 +00:00
Kevin Ottens
9f2190bad3
Merge pull request #2871 from nextcloud/backport/2867/stable-3.1
[stable-3.1] Start file conflict resolve dialog asynchronous
2021-01-27 09:22:35 +01:00
Felix Weilbach
aa6615ace6 Start file conflict resolve dialog asynchronous
Fixes #2804

Signed-off-by: Felix Weilbach <felix.weilbach@t-online.de>
2021-01-27 08:11:34 +00:00
Nextcloud bot
6599a93f78
[tx-robot] updated from transifex 2021-01-27 03:46:29 +00:00
Nextcloud bot
044a5ba2c2
[tx-robot] updated from transifex 2021-01-26 03:44:42 +00:00
Felix Weilbach
9eb5bd0192
Merge pull request #2866 from nextcloud/backport/2814/stable-3.1
[stable-3.1] Add push notifications for file changes
2021-01-25 09:48:29 -08:00
Felix Weilbach
38d7e1e98f
Add push notifications for file changes
Resolves #2802

Signed-off-by: Felix Weilbach <felix.weilbach@nextcloud.com>
2021-01-25 18:25:55 +01:00
Nextcloud bot
6eea1322bf
[tx-robot] updated from transifex 2021-01-25 03:43:14 +00:00
Nextcloud bot
51d9a9a8ae
[tx-robot] updated from transifex 2021-01-24 03:41:07 +00:00
Nextcloud bot
ea14b99d04
[tx-robot] updated from transifex 2021-01-22 03:46:51 +00:00
Kevin Ottens
c94a535e9c
Merge pull request #2849 from nextcloud/backport/2845/stable-3.1
[stable-3.1] Default to colored systray on linux
2021-01-21 08:13:37 +01:00
Kevin Ottens
167236b43d Fix the branding detection for monochrome icons on Mac
Signed-off-by: Kevin Ottens <kevin.ottens@nextcloud.com>
2021-01-21 07:02:47 +00:00
Kevin Ottens
c89b6b8094 Revert "Make monochrome icons the default on Linux and Mac OS."
This reverts commit 016410dbaa.

Signed-off-by: Kevin Ottens <kevin.ottens@nextcloud.com>
2021-01-21 07:02:47 +00:00
Nextcloud bot
a18cdf1d12
[tx-robot] updated from transifex 2021-01-21 03:45:52 +00:00
Kevin Ottens
540eed0526
Merge pull request #2846 from nextcloud/backport/2844/stable-3.1
[stable-3.1] Handle SVG branded clients
2021-01-20 16:16:33 +01:00
Kevin Ottens
00fc4807f7 Use APPLICATION_ICON_SET for themed icons
We now favor APPLICATION_ICON_SET to isBranded() regarding the decision
to use PNG or SVG for icons.

Signed-off-by: Kevin Ottens <kevin.ottens@nextcloud.com>
2021-01-20 15:08:49 +00:00
Kevin Ottens
0b43451008 Use the SVG wizard logo when APPLICATION_ICON_SET says so
Signed-off-by: Kevin Ottens <kevin.ottens@nextcloud.com>
2021-01-20 15:08:49 +00:00
Kevin Ottens
4b64603ee3 Add the APPLICATION_ICON_SET option
Also mention the svg possibly used in the wizard

Signed-off-by: Kevin Ottens <kevin.ottens@nextcloud.com>
2021-01-20 15:08:49 +00:00
Kevin Ottens
d5966eb385 Reference the wizard_logo.svg file from the resources
Somehow this was missing

Signed-off-by: Kevin Ottens <kevin.ottens@nextcloud.com>
2021-01-20 15:08:48 +00:00
Nextcloud bot
ece0557e43
[tx-robot] updated from transifex 2021-01-20 03:46:08 +00:00
Nextcloud bot
09be96e799
[tx-robot] updated from transifex 2021-01-19 03:44:21 +00:00
Nextcloud bot
39edbd3dd9
[tx-robot] updated from transifex 2021-01-18 03:43:20 +00:00
Nextcloud bot
a98e4fa394
[tx-robot] updated from transifex 2021-01-17 03:42:48 +00:00
Nextcloud bot
2ec4e77e8a
[tx-robot] updated from transifex 2021-01-16 03:41:13 +00:00
Nextcloud bot
5b911bfec9
[tx-robot] updated from transifex 2021-01-15 03:48:37 +00:00
Nextcloud bot
e3f9ba1da3
[tx-robot] updated from transifex 2021-01-14 03:46:20 +00:00
Nextcloud bot
111627cd1f
[tx-robot] updated from transifex 2021-01-13 03:51:05 +00:00
Nextcloud bot
2e37ab9861
[tx-robot] updated from transifex 2021-01-12 03:47:25 +00:00
Nextcloud bot
d14ab98746
[tx-robot] updated from transifex 2021-01-10 04:01:50 +00:00
Nextcloud bot
cd7dfe81f8
[tx-robot] updated from transifex 2021-01-09 03:57:53 +00:00
Nextcloud bot
f2a8fc46a6
[tx-robot] updated from transifex 2021-01-08 04:01:21 +00:00
Nextcloud bot
75d60213eb
[tx-robot] updated from transifex 2021-01-07 03:56:58 +00:00
Nextcloud bot
44dfd9cfda
[tx-robot] updated from transifex 2021-01-06 03:56:46 +00:00
Nextcloud bot
7bea176e6f
[tx-robot] updated from transifex 2021-01-05 03:52:30 +00:00
Nextcloud bot
8938d5dd0e
[tx-robot] updated from transifex 2021-01-04 03:53:57 +00:00
Nextcloud bot
42911da98a
[tx-robot] updated from transifex 2021-01-03 03:54:23 +00:00
Nextcloud bot
1cb6145c5d
[tx-robot] updated from transifex 2021-01-02 03:51:57 +00:00
Nextcloud bot
d8efb20881
[tx-robot] updated from transifex 2021-01-01 03:52:03 +00:00
Nextcloud bot
5abe4a2c51
[tx-robot] updated from transifex 2020-12-31 04:00:46 +00:00
Nextcloud bot
c7fd312f5c
[tx-robot] updated from transifex 2020-12-30 03:47:56 +00:00
Nextcloud bot
dc4ea211da
[tx-robot] updated from transifex 2020-12-29 03:47:56 +00:00
Nextcloud bot
be332aa4dd
[tx-robot] updated from transifex 2020-12-28 03:45:12 +00:00
Nextcloud bot
db5bfdc4c8
[tx-robot] updated from transifex 2020-12-27 03:51:03 +00:00
Nextcloud bot
aa0632f375
[tx-robot] updated from transifex 2020-12-26 03:44:56 +00:00
Nextcloud bot
be38b10055
[tx-robot] updated from transifex 2020-12-25 03:44:25 +00:00
Nextcloud bot
da54720aec
[tx-robot] updated from transifex 2020-12-24 03:45:48 +00:00