12766 commits

This branch

This branch

All branches

Author	SHA1	Message	Date
Roeland Jago Douma	0e2cd30ea1	Merge branch 'master' into bugfix/noid/wizard-external-links	2018-08-13 11:43:42 +02:00
Roeland Jago Douma	bc44c62471	Merge pull request #524 from ivaradi/ubuntu-compat ... Some Ubuntu compilation fixes	2018-08-13 11:43:26 +02:00
Roeland Jago Douma	2434523f33	Merge pull request #532 from ShinjiLE/master ... rearange CMake find_package OpenSSL	2018-08-13 11:42:35 +02:00
Camila Ayres	534a92b709	Merge branch 'master' into bugfix/noid/wizard-external-links	2018-08-13 11:40:45 +02:00
Roeland Jago Douma	233e10ecb1	Merge branch 'master' into master	2018-08-13 11:21:05 +02:00
Roeland Jago Douma	cefc6b531c	Merge pull request #549 from nextcloud/ci/noid/bump_imagesx ... Bump ci images	2018-08-13 11:20:50 +02:00
Roeland Jago Douma	5c7c92157f	Bump images ... Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>	2018-08-13 10:56:18 +02:00
Camila Ayres	176a2e6f84	Merge branch 'master' into ubuntu-compat	2018-08-13 09:03:26 +02:00
Camila Ayres	647d16c792	Merge branch 'master' into bugfix/noid/wizard-external-links	2018-08-13 09:02:21 +02:00
Camila Ayres	3ad33a368a	Merge branch 'master' into master	2018-08-13 08:58:26 +02:00
Nextcloud bot	951096f569	[tx-robot] updated from transifex	2018-08-13 00:49:31 +00:00
Nextcloud bot	489c0529c4	[tx-robot] updated from transifex	2018-08-12 00:48:32 +00:00
Julius Härtl	3576fbb2a5	Remove unused subclass of QWebEngineView ... Signed-off-by: Julius Härtl <jus@bitgrid.net>	2018-08-11 17:47:40 +02:00
Julius Härtl	8dedb9084e	Make links open in an external browser ... Signed-off-by: Julius Härtl <jus@bitgrid.net>	2018-08-11 17:38:08 +02:00
Nextcloud bot	f6ef11a5c9	[tx-robot] updated from transifex	2018-08-11 00:47:25 +00:00
Nextcloud bot	1d868eb809	[tx-robot] updated from transifex	2018-08-09 00:48:49 +00:00
Julius Härtl	c3aafa722a	Merge pull request #536 from nextcloud/3rdpart/remove_uneeded ... Remove nlohmann/json.hpp	2018-08-08 21:34:48 +02:00
Roeland Jago Douma	b85bad0566	Remove nlohmann/json.hpp ... Not used so no need to have it lying around Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>	2018-08-08 20:03:04 +02:00
Nextcloud bot	a4507db31a	[tx-robot] updated from transifex	2018-08-08 00:50:18 +00:00
Nextcloud bot	e551b89ba7	[tx-robot] updated from transifex	2018-08-07 00:46:53 +00:00
Ronny	7cbca28eb7	Merge branch 'master' into master	2018-08-05 11:35:53 +02:00
Nextcloud bot	a1967d551d	[tx-robot] updated from transifex	2018-08-05 00:49:39 +00:00
Ronny Kunze	2b825a1748	rearange CMake find_package OpenSSL ... the command seems to be malformed . The keyword VERSION is not valid . And the version should follow direct after the packagename.	2018-08-04 16:53:06 +02:00
Nextcloud bot	5110f9618a	[tx-robot] updated from transifex	2018-08-04 00:47:26 +00:00
István Váradi	d30f8b9094	Merge branch 'master' into ubuntu-compat	2018-08-03 17:16:20 +02:00
Camila Ayres	e0f49971f9	Merge pull request #525 from nextcloud/feature/132/about_dialog ... Add legal notice button to about dialog	2018-08-02 22:32:56 +02:00
Roeland Jago Douma	c4d7f97e00	Add legal notice button to about dialog ... Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>	2018-08-02 22:17:11 +02:00
Roeland Jago Douma	30fc87daea	Merge pull request #344 from nextcloud/fix-share-dialog ... Fix share dialog	2018-08-02 22:13:30 +02:00
Roeland Jago Douma	aa4ff0c083	Fix include order ... Because why not :S Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>	2018-08-02 21:19:57 +02:00
István Váradi	758c2ad9ac	Merge branch 'master' into ubuntu-compat	2018-08-02 21:08:54 +02:00
Camila San	9d087b920b	Inserts ShareDialogStartPage in the correct position in the share dialog. ... - With the new UI this had to be adapted. Signed-off-by: Camila San <hello@camila.codes>	2018-08-02 20:23:26 +02:00
Camila San	2cd32261a2	Checks if share link exists before settings password. ... Signed-off-by: Camila San <hello@camila.codes>	2018-08-02 20:22:37 +02:00
Camila San	8e0398426d	Replaces 'more' (3 dots) png icon for svg in buttons of the share ... dialog. Signed-off-by: Camila San <hello@camila.codes>	2018-08-02 20:21:11 +02:00
Camila San	44865e0107	Adjustes sizes and margins in the share dialog and its widgets. ... - Adds TODO's in commented out code. Signed-off-by: Camila San <hello@camila.codes>	2018-08-02 19:57:17 +02:00
Camila San	c2c2fe3ce3	Changes Share User/Group widget UI to match the server share UI. ... - Display list of permissions in the tool button menu. Signed-off-by: Camila San <hello@camila.codes>	2018-08-02 19:57:17 +02:00
Camila San	25ff932a0b	Fixes edit permission on share link for files and folders. ... Signed-off-by: Camila San <hello@camila.codes>	2018-08-02 19:57:17 +02:00
Camila San	5b7970fed7	Updates client.qrc with new icon 'copy' for share link menu options. ... Signed-off-by: Camila San <hello@camila.codes>	2018-08-02 19:57:17 +02:00
Camila San	b14aa11c29	Changes share link layout so it looks like the UI on the server. ... - Adds icons to Share link and to save password on share dialog. - Changes wording of the menu options for sharing link. - Adds functionality to the new menu (mostly permissions). - More widget size and size policy adjustments. Signed-off-by: Camila San <hello@camila.codes>	2018-08-02 19:57:16 +02:00
Camila San	a19904657a	Switches order of widgets in share dialog: share link comes first. ... - First text input to search for users,then share link and then the list of users. - Adjusts size and scroll bar for sharees list. - Adds option 'can share' to 3 dots menu in share user/group widget. Signed-off-by: Camila San <hello@camila.codes>	2018-08-02 19:52:28 +02:00
Camila San	7aff1e27c0	Fixes share users/groups widget. ... - Existing sharees where not being displayed. Signed-off-by: Camila San <hello@camila.codes>	2018-08-02 19:52:28 +02:00
Camila San	55b0b46bb6	Changes size, size policy, content and margins of the share dialog and its widgets. ... - Adds select with permissions to share dialog on the user/group search. - Changes order of widgets, removes excess of text and do not display empty widgets. - Share user/group widget: replaces combo box for tool button with permissions. - Using Fixed as size policy it gives a much smoother user experience when windows size dinamically changes. Signed-off-by: Camila San <hello@camila.codes>	2018-08-02 19:52:27 +02:00
Camila San	4ecfab4bf3	Improves share dialog. ... - Removes the tabs: adds items to a vertical layout. - Fix spacing and alignment. - Removes extra text. Signed-off-by: Camila San <hello@camila.codes>	2018-08-02 19:48:42 +02:00
Nextcloud bot	34acc095c7	[tx-robot] updated from transifex	2018-08-02 00:48:46 +00:00
István Váradi	c919b7e069	Merge branch 'master' into ubuntu-compat	2018-08-01 16:28:48 +02:00
Camila Ayres	00e2d4ef93	Merge pull request #523 from nextcloud/fix-navigation-apps ... Fixes crash on mac OS and linux.	2018-08-01 15:45:06 +02:00
Camila Ayres	2fd6f3583b	Merge branch 'master' into fix-navigation-apps	2018-08-01 15:20:33 +02:00
Nextcloud bot	49be437bfa	[tx-robot] updated from transifex	2018-08-01 00:46:14 +00:00
Camila San	0ac532f5c9	Fixes crash on mac OS and linux. ... - The crash was happening when the user could not connect and it would crash on trying to retrieve and display the navigation apps. - Checks AccountStatePtr earlier in the function slotNavigationAppsFetched. - Cast of pointer stored in QVariant to QMenu was not done correctly - qvariant_cast works best for user type defined or QMetaType known to QVariant. Signed-off-by: Camila San <hello@camila.codes>	2018-08-01 00:28:25 +02:00
István Váradi	be3640dc51	Depend on libqt5svg5-dev	2018-07-31 16:24:16 +02:00
István Váradi	343402740f	Make the Bionic control file the default one	2018-07-31 16:22:02 +02:00