chylex/Nextcloud-Desktop
1
0
Fork 0
mirror of https://github.com/chylex/Nextcloud-Desktop.git synced 2025-09-08 02:53:10 +02:00
Code Activity
13,590 Commits 4 Branches 173 Tags
2.6.2-buildtest1
Commit Graph

6388 Commits

Author SHA1 Message Date
Camila San
49377976db Removes notification row from the view when clicking on Dismiss. 
Signed-off-by: Camila San <hello@camila.codes>
 2018-07-30 22:06:00 +02:00
Camila San
ef4a30fcb9 Displays a menu once the user clicks on the button in the notifications. 
- In activityitemdelegate the mouse events are filtered (ActivityItemDelegate::editorEvent) to check if the user clicked
on a button in the list of activities/notifications. Then a signal is emitted to ActivityWidget that does the rest:
show submenu when there are more options, open browser, open file manager, send request to server.

Signed-off-by: Camila San <hello@camila.codes>
 2018-07-30 22:06:00 +02:00
Camila San
9ad01f0819 Fixes order of the notifications: latest on top. 
Signed-off-by: Camila San <hello@camila.codes>
 2018-07-30 22:06:00 +02:00
Camila San
7fa5e41e8d Only displays buttons if it is a notification and adjust space left. 
- Do not display buttons for activities.
- Adds correctly text and button in the space left depending on the widget size.

Signed-off-by: Camila San <hello@camila.codes>
 2018-07-30 22:06:00 +02:00
Camila San
4e4a0da3b7 Returns the activity type to the list view. 
Signed-off-by: Camila San <hello@camila.codes>
 2018-07-30 22:05:59 +02:00
Camila San
2350b41dc3 List model returns the list of actions for each activity. 
- The list of possible actions (server requests( was not being used in
the activityitemdelegate. This is needed to be able to draw the primary
action buttons and other options for each notification in the view.)
- Minor changes:
  - Uses different icons for activities and notifications in the list view.
  - Align elements in the list view of notifications/activities properly.

Signed-off-by: Camila San <hello@camila.codes>
 2018-07-30 22:05:59 +02:00
Camila San
d1f4f8a558 Correctly removes actions - account, separator and settings widget from toolbar when account is removed. 
Signed-off-by: Camila San <hello@camila.codes>
 2018-07-30 22:05:59 +02:00
Camila San
a6331c7a75 Fixes widget stack visibility when switching actions. 
Signed-off-by: Camila San <hello@camila.codes>
 2018-07-30 22:05:59 +02:00
Camila San
22a6303c9d Adds space bewteen different accounts and activity. 
Signed-off-by: Camila San <hello@camila.codes>
 2018-07-30 22:05:59 +02:00
Camila San
1b1468a9c6 Each user has its own list of activities. 
Signed-off-by: Camila San <hello@camila.codes>
 2018-07-30 22:05:59 +02:00
Camila San
b13f77c0fb Adds one activity widget for each user. 
- ActivityListModel and ActivityWidget stores an AccountState to connect user and widget.

Signed-off-by: Camila San <hello@camila.codes>
 2018-07-30 22:05:59 +02:00
Camila San
8e0c036fc3 Aligns Network and General to the right. 
Signed-off-by: Camila San <hello@camila.codes>
 2018-07-30 22:05:59 +02:00
Camila San
75c2613b1b Displays activity and notification messages in the list view. 
Signed-off-by: Camila San <hello@camila.codes>
 2018-07-30 22:05:59 +02:00
Camila San
908870ccde Adds notifications to the Activities list. 
Signed-off-by: Camila San <hello@camila.codes>
 2018-07-30 22:05:57 +02:00
Roeland Jago Douma
24efdd3b45 Fix E2E query 
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2018-07-03 11:40:58 +02:00
Roeland Jago Douma
6c11c1aa73 Fix query 
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2018-07-03 10:33:26 +02:00
Olivier Goffart
d114212333 OwnSql: Fixup after feedback for #6388 2018-07-03 10:33:26 +02:00
Olivier Goffart
779969f865 OwnSql: Put the SQL queries next to their use. 
This avoid haivng to modify 4 places when we want to add a query
 2018-07-03 10:33:26 +02:00
Olivier Goffart
518fb90757 OwnSql: Some refactoring 
Use QByteArray for the query so we don't have to convert twice.
Automatically finish the query when the DB close, so we don't
have to call reset
 2018-07-03 10:33:26 +02:00
Christian Kamm
d549c77af6 Issues: Show link to conflicts doc if there are some #6396 
The link url is themed.
 2018-07-03 10:18:18 +02:00
Roeland Jago Douma
0d70b05b65 Set Accept-language header for webview requests 
This way the server will properly translate it for you if it has
translations.

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2018-07-03 07:45:02 +02:00
Camila Ayres
9627aad04c Merge branch 'master' into fix/458/do_not_show_webview_by_default 2018-07-02 22:01:03 +02:00
Christian Kamm
70b5d54082 Proxy settings: Fix bad behavior with empty host 
Fixes f6a075ef54 for #5885

When no host is given it shouldn't just *appear* that there is no
proxy, there actually shouldn't be a proxy set then.
 2018-07-02 21:15:30 +02:00
Roeland Jago Douma
34d964fc80 Do not force to show the webview on construct 
Should fix #458

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2018-07-02 20:09:30 +02:00
Roeland Jago Douma
08abc71acb gui Q_UNUSED 
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2018-07-02 13:02:15 +02:00
Roeland Jago Douma
ce545b1e47 propage*encrypted Q_UNUSED 
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2018-07-02 12:45:44 +02:00
Roeland Jago Douma
e871359453 Remove unneeded ; 
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2018-07-02 11:03:58 +02:00
Roeland Jago Douma
b952fa64ee Restore logger installation 
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2018-07-02 11:01:52 +02:00
Roeland Jago Douma
d2b75cabb2 Remove default trademark text 
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2018-06-29 21:36:18 +02:00
Roeland Jago Douma
595cbfaa16 Update urls 
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2018-06-28 12:46:47 +02:00
Camila San
4c7b7dfcaa Restores previous text in the about section. 
Signed-off-by: Camila San <hello@camila.codes>
 2018-06-28 12:33:40 +02:00
Olivier Goffart
c5ace2338c Theme: unify ownCloudTheme and Theme classes 
The goal is to avoid confusion described in issue #6422 by removing
duplicates between the Theme and owncloudTheme.

 - Use the about from ownCloudTheme everywhere
 - Create default applicationIcons() and condifFileName() that should work
   everywhere
 - trayFolderIcon was removed as it is not used
 - the helpUrl from the default Theme now points to the owncloud client
   documentation. Before there was no help entry by default for branded
   client if the function was not overriden.
 - Do not merge functions that would otherwise break compatibility with
   theme that did not override them. For example colors or customMedia.
 2018-06-28 12:33:39 +02:00
Camila San
e69a9c61d0 Windows: moves translation files to /i18n. 
Signed-off-by: Camila San <hello@camila.codes>
 2018-06-26 23:56:34 +02:00
Roeland Jago Douma
9eb950bdcf Merge pull request #438 from nextcloud/bugfix/413/hide-decrypt-option 
Hide decrypt option since it does only work for empty folders
 2018-06-23 21:20:46 +02:00
Julius Härtl
92480ec8fb Hide decrypt option since it does only work for empty folders 
Signed-off-by: Julius Härtl <jus@bitgrid.net>
 2018-06-22 12:13:04 +02:00
Julius Härtl
e42f5648bd Add indicator to e2e folders 
Signed-off-by: Julius Härtl <jus@bitgrid.net>
 2018-06-22 11:21:30 +02:00
Julius Härtl
655a43db10 Use custom mnemonic dialog 
Signed-off-by: Julius Härtl <jus@bitgrid.net>
 2018-06-22 10:42:01 +02:00
Roeland Jago Douma
48a6ef37b2 Add a button to E2E accounts to show the mnemonic 
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2018-06-21 19:52:27 +02:00
Roeland Jago Douma
30b211381f More fixes for the OSX daily builds 
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2018-06-21 15:22:53 +02:00
Julius Härtl
4ba40a6ce1 Move information icon to warning icon 
Signed-off-by: Julius Härtl <jus@bitgrid.net>
 2018-06-20 16:06:19 +02:00
Roeland Jago Douma
f7bf8c7577 Thread local storage don't work properly on OSX 
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2018-06-14 21:26:07 +02:00
Christian Kamm
ca8f569371 SocketAPI: Remove SHARE_STATUS 
It was never used by a shell integration.
 2018-06-11 19:35:17 +02:00
Christian Kamm
2bec587d4d SocketAPI: Allow opening share dialog if contents still syncing #4608 
With the previous changes the "Share..." action was shown but it didn't
work yet.
 2018-06-11 19:35:16 +02:00
Christian Kamm
d304fcbda7 Rename local discovery option for clarity 
It's using full relative filepaths, not just dir paths.
 2018-06-11 14:50:01 +02:00
Christian Kamm
77fcff5bdf Conflicts: Change tags to be more user friendly #6365 
From "_conflict-user-yyyymmdd-hhmmss"
to   " (conflicted copy user yyyy-mm-dd hhmmss)"
 2018-06-11 14:40:40 +02:00
Roeland Jago Douma
dc41f8a16e Fix windows build 
* Reorder openssl header import
* not => !

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2018-06-08 16:53:56 +02:00
Christian Kamm
e65caee9cf Notify if an explicitly excluded folder is created #6222 2018-06-08 14:49:26 +02:00
Christian Kamm
a1d6af60f0 AccountWizard: Reserve space for error label #6546 2018-06-07 15:32:52 +02:00
Olivier Goffart
7c9ec4a55a Credentials: Retry fetching from the keychain in case the keychain is still starting 
When owncloud is restored, at boot time, it might be started before the
crendential manager. So if we detect an error, wait 10 seconds and hopefully
it'd be loaded by then.

Issues: #4274, #6522
 2018-06-07 15:18:40 +02:00
Julius Härtl
689ab5b8b3 Merge branch 'master' into upstream/owncloudsynclog 2018-06-07 14:38:49 +02:00