1
0
mirror of https://github.com/chylex/Nextcloud-Desktop.git synced 2024-10-25 21:42:48 +02:00
Commit Graph

15325 Commits

Author SHA1 Message Date
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
Nextcloud bot
83331e5336
[tx-robot] updated from transifex 2020-12-23 03:46:01 +00:00
Kevin Ottens
75c329f4ff
Merge pull request #2761 from nextcloud/bump_to_3.1.1
Bump release to 3.1.1
2020-12-22 10:54:32 +01:00
Kevin Ottens
b69c047be1
Bump release to 3.1.1
Signed-off-by: Kevin Ottens <kevin.ottens@nextcloud.com>
2020-12-22 10:44:45 +01:00
Nextcloud bot
f0292b15a0
[tx-robot] updated from transifex 2020-12-22 03:47:02 +00:00
Kevin Ottens
e1b0e3474f
Merge pull request #2753 from nextcloud/backport/2739/stable-3.1
[stable-3.1] Fixed the autostart for AppImages. See #2504.
2020-12-21 12:15:54 +01:00
Hannah Rittich
98077abfba Fixed the autostart for AppImages. See #2504.
Signed-off-by: Hannah Rittich <hrittich@users.noreply.github.com>
2020-12-21 11:08:29 +00:00
Nextcloud bot
1d265c791b
[tx-robot] updated from transifex 2020-12-21 03:44:58 +00:00
Nextcloud bot
f93829afd7
[tx-robot] updated from transifex 2020-12-20 03:47:21 +00:00
Nextcloud bot
68bc4367d2
[tx-robot] updated from transifex 2020-12-19 03:45:53 +00:00
Nextcloud bot
1ead3608f0
[tx-robot] updated from transifex 2020-12-18 03:47:04 +00:00
Kevin Ottens
48dcd9c8f0
Merge pull request #2730 from nextcloud/backport/2725/stable-3.1
[stable-3.1] Make monochrome icons the default on Linux and Mac OS.
2020-12-17 11:00:24 +01:00
Camila
7688d5f607 Make monochrome icons the default on Linux and Mac OS.
Unless it is branded with other icons.

Signed-off-by: Camila <hello@camila.codes>
2020-12-17 07:03:54 +00:00
Nextcloud bot
7957b1b6b7
[tx-robot] updated from transifex 2020-12-17 03:45:10 +00:00
Nextcloud bot
f3957ba72b
[tx-robot] updated from transifex 2020-12-16 03:47:14 +00:00
Camila
b391d88ed4
Merge pull request #2717 from nextcloud/backport/2714/stable-3.1
[stable-3.1] Ensure a sync happens after a conflict resolution
2020-12-15 11:18:31 +01:00
Kevin Ottens
9774b6a429 Ensure a sync happens after a conflict resolution
You'd expect that after a conflict resolution the file watcher would
pick up the change and trigger a sync. For some reason it doesn't seem
to happen on at least some Ubuntu systems. In such cases the user would
then still have a stale conflict entry in the activity list and wouldn't
be able to do anything with it.

Signed-off-by: Kevin Ottens <kevin.ottens@nextcloud.com>
2020-12-15 10:04:15 +00:00
Camila
2e216c8f29
Merge pull request #2715 from nextcloud/backport/2713/stable-3.1
[stable-3.1] UserModel: check indices are inside the user list
2020-12-15 11:03:12 +01:00
Kevin Ottens
8997d5ced9 UserModel: check indices are inside the user list
The model was just checking for the user list being empty or not which
is overly optimistic. Indeed there might be cases where the id is
actually outside the boundaries so properly check for this.

Signed-off-by: Kevin Ottens <kevin.ottens@nextcloud.com>
2020-12-15 09:51:38 +00:00
Camila
c85d12425d
Merge pull request #2716 from nextcloud/backport/2698/stable-3.1
[stable-3.1] Use the icon color property to color the icons in the tray window header.
2020-12-15 10:50:34 +01:00
Camila
3fa796e11e Use the icon color property to color the icons in the tray window header.
The icon color is set with APPLICATION_WIZARD_HEADER_TITLE_COLOR in the
theme.

Signed-off-by: Camila <hello@camila.codes>
2020-12-15 09:44:51 +00:00