15295 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
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
Nextcloud bot	583c4960d8	[tx-robot] updated from transifex	2020-12-15 03:47:30 +00:00
Kevin Ottens	6a94f0deef	Merge pull request #2709 from nextcloud/backport/2708/stable-3.1 ... [stable-3.1] Have the new account wizard open again	2020-12-14 16:38:24 +01:00
Kevin Ottens	3c9e065170	Have the new account wizard open again ... UserModel can't be connected to AccountSettings if the settings dialog doesn't exist. This is the case now since we delay the creation of that dialog and free it after use. Instead it should be properly channeled through the Systray object all the way up to OwncloudGui which knows how to handle this properly. Signed-off-by: Kevin Ottens <kevin.ottens@nextcloud.com>	2020-12-14 15:29:24 +00:00
Nextcloud bot	a0719b782b	[tx-robot] updated from transifex	2020-12-14 03:47:59 +00:00
Nextcloud bot	6caff18d7c	[tx-robot] updated from transifex	2020-12-13 03:43:55 +00:00
Nextcloud bot	9114419d8e	[tx-robot] updated from transifex	2020-12-12 03:46:15 +00:00
Nextcloud bot	3991350c47	[tx-robot] updated from transifex	2020-12-11 03:44:45 +00:00
Kevin Ottens	7f4ffd0f72	Merge pull request #2696 from nextcloud/v.3.1.0 ... Bump master version to 3.1.0	2020-12-10 12:16:47 +01:00
allexzander	e6b06d0a6b	Bump master version to 3.1.0 ... Signed-off-by: allexzander <blackslayer4@gmail.com>	2020-12-10 12:47:51 +02:00
Nextcloud bot	e160788204	[tx-robot] updated from transifex	2020-12-10 03:53:56 +00:00
Nextcloud bot	f5d4ac518f	[tx-robot] updated from transifex	2020-12-09 03:44:40 +00:00
allexzander	31d3ce7663	Merge pull request #2685 from nextcloud/fix-slow-sharee-search-in-dialog ... Fixed slow sharee search in the share dialog	2020-12-08 15:56:29 +02:00
allexzander	9266ecc2e8	Fixed slow sharee search in the share dialog ... Signed-off-by: allexzander <blackslayer4@gmail.com>	2020-12-08 13:48:43 +00:00
allexzander	14105d4ec6	Merge pull request #2686 from nextcloud/add-email-sharing ... Added sharing via email.	2020-12-08 15:24:08 +02:00
allexzander	6e8658dc2c	Added sharing via email. ... Signed-off-by: allexzander <blackslayer4@gmail.com>	2020-12-08 11:08:45 +02:00
Nextcloud bot	1d7b7c26d3	[tx-robot] updated from transifex	2020-12-08 03:48:38 +00:00
Kevin Ottens	b2dfa29325	Merge pull request #2690 from nextcloud/update-documentation ... Update documentation on how to generate debug logs.	2020-12-07 16:22:37 +01:00
Camila	09c2279bb5	Update documentation on how to generate debug logs. ... Minor change: bypasses => bypass. Signed-off-by: Camila <hello@camila.codes>	2020-12-07 14:52:51 +01:00
Nextcloud bot	4886525e08	[tx-robot] updated from transifex	2020-12-07 03:48:13 +00:00
Nextcloud bot	f2fd083898	[tx-robot] updated from transifex	2020-12-06 03:43:57 +00:00
Nextcloud bot	8a2eb71c4f	[tx-robot] updated from transifex	2020-12-04 03:45:51 +00:00
Kevin Ottens	8e29935195	Merge pull request #2682 from nextcloud/debug-skip ... Add debug log to check which folders are being skipped during syncing.	2020-12-03 12:37:38 +01:00
Camila	5517ff2c02	Add debug log to check which folders are being skipped during syncing. ... Signed-off-by: Camila <hello@camila.codes>	2020-12-03 12:24:25 +01:00
Nextcloud bot	bd959018a1	[tx-robot] updated from transifex	2020-12-03 03:45:56 +00:00
Camila	a527e85fe6	Merge pull request #2666 from nextcloud/notification_actions_bring_back_from_version_2 ... Notification action buttons and context menu	2020-12-02 15:42:32 +01:00
allexzander	f04281cb69	Implemented notification action buttons and context menu for confirm/dismiss and other actions. ... Signed-off-by: allexzander <blackslayer4@gmail.com>	2020-12-02 08:08:37 +00:00
Kevin Ottens	7721832ee0	Merge pull request #2677 from briankendall/fix-tray-window-spaces-bug ... Fix macOS bug where tray window causes spaces to switch	2020-12-02 08:23:19 +01:00
Brian Kendall	f9991e180c	Fix macOS bug where tray window causes spaces to switch ... Signed-off-by: Brian Kendall <brian@briankendall.net>	2020-12-02 06:54:16 +00:00
Nextcloud bot	bc38c0ba3f	[tx-robot] updated from transifex	2020-12-02 03:46:16 +00:00
Nextcloud bot	9ff8d97647	[tx-robot] updated from transifex	2020-12-01 03:45:58 +00:00