15235 commits

This branch

This branch

All branches

Author	SHA1	Message	Date
Kevin Ottens	8c4bd2bb52	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 09:40:57 +00:00
Camila	75a97bdaf3	Merge pull request #2713 from nextcloud/usermodel_properly_check_out_of_bound_index ... UserModel: check indices are inside the user list	2020-12-15 10:37:58 +01:00
Kevin Ottens	d640076454	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 08:43:32 +00:00
Nextcloud bot	94c4e3044c	[tx-robot] updated from transifex	2020-12-15 03:48:34 +00:00
Kevin Ottens	2415d9525b	Merge pull request #2708 from nextcloud/fix_new_account_wizard_open ... Have the new account wizard open again	2020-12-14 16:28:31 +01:00
Kevin Ottens	5ed397a430	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:58:52 +01:00
Camila	be1fb77488	Merge pull request #2692 from nextcloud/fix-issue-1029 ... Handle the warning message when unchecking folders for syncing.	2020-12-14 12:54:05 +01:00
Camila	b4dc682690	Handle the warning message when unchecking folders for syncing. ... Split widgets and slot to handle the refreshing of the view: - refreshSelectiveSyncStatus is connected to signal dirtyChanged and will handle big folder warning. - slotSelectiveSyncChanged which is connected to dataChanged signal and will handle the selective sync warning. It fixes #1029 because it looks for the checkbox state before showing the warning. Signed-off-by: Camila <hello@camila.codes>	2020-12-14 12:36:51 +01:00
Nextcloud bot	0b985f2743	[tx-robot] updated from transifex	2020-12-14 03:48:55 +00:00
Nextcloud bot	8c47d62fa2	[tx-robot] updated from transifex	2020-12-13 03:44:59 +00:00
Nextcloud bot	2de52c351a	[tx-robot] updated from transifex	2020-12-12 03:47:17 +00:00
Nextcloud bot	dc229480b3	[tx-robot] updated from transifex	2020-12-11 03:46:02 +00:00
Kevin Ottens	7f0e64ef67	Merge pull request #2698 from nextcloud/themed-icons-v2 ... Use the icon color property to color the icons in the tray window header.	2020-12-10 19:06:40 +01:00
Camila	cfbd22b5e7	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-10 17:43:45 +01:00
Kevin Ottens	5b534761bf	Merge pull request #2697 from nextcloud/v3.1.5 ... Bump master version to 3.1.50	2020-12-10 14:18:35 +01:00
allexzander	7b575fc643	Bump master version to 3.1.5 ... Signed-off-by: allexzander <blackslayer4@gmail.com>	2020-12-10 14:54:25 +02:00
allexzander	6c651f1cb6	Bump master version to 3.1.5 ... Signed-off-by: allexzander <blackslayer4@gmail.com>	2020-12-10 14:44:58 +02: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
István Váradi	62bf777cda	Merge pull request #2652 from ivaradi/debian-version-discrepancy ... Handle the case when the release version differs from that in VERSION.cmake	2020-11-30 16:46:20 +01:00
István Váradi	3d9d5f2fe7	Handle the case when the release version differs from that in VERSION.cmake ... Signed-off-by: István Váradi <ivaradi@varadiistvan.hu>	2020-11-30 15:33:34 +01:00
allexzander	57e1f2ac07	Merge pull request #2675 from nextcloud/fix-appimage-build ... fix AppImage build	2020-11-30 14:20:30 +02:00
allexzander	0fdb423fe0	fix AppImage build by using v0.10.0 for qtkeychain ... Signed-off-by: allexzander <blackslayer4@gmail.com>	2020-11-30 13:41:12 +02:00
Nextcloud bot	7bfd8ea23c	[tx-robot] updated from transifex	2020-11-30 03:43:17 +00:00
Nextcloud bot	57a4cd926d	[tx-robot] updated from transifex	2020-11-29 03:42:10 +00:00
Nextcloud bot	de4edb6099	[tx-robot] updated from transifex	2020-11-28 03:39:34 +00:00
Nextcloud bot	70dbbbeaa4	[tx-robot] updated from transifex	2020-11-27 03:40:43 +00:00
Camila	9614d051a5	Merge pull request #2667 from nextcloud/version-bump ... Master is now 3.0.82.	2020-11-26 13:08:20 +01:00
Camila	8d1fe8ed3c	Master is now 3.0.82. ... Signed-off-by: Camila <hello@camila.codes>	2020-11-26 12:52:55 +01:00