1
0
mirror of https://github.com/chylex/Nextcloud-Desktop.git synced 2024-11-28 00:42:46 +01:00
Commit Graph

16852 Commits

Author SHA1 Message Date
Camila Ayres
d0e25c230a
Merge pull request #1149 from nextcloud/bugfixing-slideshow
slideshow buttons
2019-09-15 18:52:05 +02:00
Camila Ayres
82a67a44c4
Merge branch 'master' into bugfixing-slideshow 2019-09-15 18:18:46 +02:00
Camila Ayres
233a423e8c
Merge pull request #1420 from nextcloud/e2e-csr-transmit
Fixing E2E CSR transmission failure for new connections
2019-09-15 17:22:49 +02:00
Dominique Fuchs
5e099adb2f
Merge branch 'master' into e2e-csr-transmit 2019-09-15 12:03:16 +02:00
Dominique Fuchs
a35b346e62 Fixed e2e key transmission issue after generation (forgotten content type on sendrequest())
Signed-off-by: Dominique Fuchs <32204802+DominiqueFuchs@users.noreply.github.com>
2019-09-15 11:53:57 +02:00
Dominique Fuchs
7d4406254a
Merge branch 'master' into fix_urlscheme_warning 2019-09-15 09:56:16 +02:00
Nextcloud bot
70091726c9
[tx-robot] updated from transifex 2019-09-15 02:57:10 +00:00
Nextcloud bot
564088680a
[tx-robot] updated from transifex 2019-09-14 02:55:51 +00:00
Dominique Fuchs
1eb61b7949 Fixed unused var
Signed-off-by: Dominique Fuchs <32204802+DominiqueFuchs@users.noreply.github.com>
2019-09-13 20:49:59 +02:00
Dominique Fuchs
f6bac6cfdd Merge branch 'bugfixing-slideshow' of https://github.com/nextcloud/desktop into bugfixing-slideshow 2019-09-13 20:38:16 +02:00
Dominique Fuchs
e8c8fe4223 Added slight svg transparency as requested in ref issue, fixed bg detection logic
Signed-off-by: Dominique Fuchs <32204802+DominiqueFuchs@users.noreply.github.com>
2019-09-13 20:38:03 +02:00
Dominique Fuchs
3659bca0ec
Merge branch 'master' into bugfixing-slideshow 2019-09-13 17:30:25 +02:00
Dominique Fuchs
ace3da841c (Maybe) finished implementation of themed wizard buttons and accessibility refinements and thus implementation of helper fct. to retrieve themed QIcons.
Signed-off-by: Dominique Fuchs <32204802+DominiqueFuchs@users.noreply.github.com>
2019-09-13 17:26:39 +02:00
Kilian Pfeiffer
457b0c3ab1
Merge branch 'master' into master 2019-09-13 08:57:06 +02:00
Dominique Fuchs
544229d1e8 [WIP] themed button implementation
Signed-off-by: Dominique Fuchs <32204802+DominiqueFuchs@users.noreply.github.com>
2019-09-13 08:24:02 +02:00
Dominique Fuchs
af05db895c [WIP] Resource file and include changes as well as new control icons for wizard slide buttons
Signed-off-by: Dominique Fuchs <32204802+DominiqueFuchs@users.noreply.github.com>
2019-09-13 08:08:39 +02:00
Nextcloud bot
2958cf2180
[tx-robot] updated from transifex 2019-09-13 02:57:35 +00:00
Michael Schuster
32c114bd17 Merge branch 'master' of https://github.com/nextcloud/desktop 2019-09-13 02:19:22 +02:00
Dominique Fuchs
1d96b102c0 Layout optimizations and tab access for self-hosting link
Signed-off-by: Dominique Fuchs <32204802+DominiqueFuchs@users.noreply.github.com>
2019-09-12 22:00:43 +02:00
Michael Schuster
d6fce49162
Merge pull request #1414 from nextcloud/fix-double-slashes
Fix double slashes
2019-09-12 21:25:43 +02:00
Dominique Fuchs
ff5bf8634f fix naming for slide navigation, adapted everywhere to be consistent
Signed-off-by: Dominique Fuchs <32204802+DominiqueFuchs@users.noreply.github.com>
2019-09-12 20:59:03 +02:00
Dominique Fuchs
f49cd1850c Restructured layout, as the initial change were too broken (after additions through the last months)
Signed-off-by: Dominique Fuchs <32204802+DominiqueFuchs@users.noreply.github.com>
2019-09-12 20:53:40 +02:00
Dominique Fuchs
d420242fcb Merge branch 'bugfixing-slideshow' of https://github.com/nextcloud/desktop into bugfixing-slideshow 2019-09-12 17:56:30 +02:00
Dominique Fuchs
c873da75e4 Fixed wrong resource paths
Signed-off-by: Dominique Fuchs <32204802+DominiqueFuchs@users.noreply.github.com>
2019-09-12 17:52:31 +02:00
Dominique Fuchs
9b60573d7e
Merge branch 'master' into bugfixing-slideshow 2019-09-12 17:09:26 +02:00
Dominique Fuchs
907f36bfcb Merge branch 'bugfixing-slideshow' of https://github.com/nextcloud/desktop into bugfixing-slideshow 2019-09-12 16:43:54 +02:00
Dominique Fuchs
04fedf83b4 Added newly created next/prev svg's and fixed reduntant layout parts in wizard
Signed-off-by: Dominique Fuchs <32204802+DominiqueFuchs@users.noreply.github.com>
2019-09-12 16:43:24 +02:00
Michael Schuster
f3d774e2e5
Merge branch 'master' into fix-double-slashes 2019-09-12 05:09:21 +02:00
Nextcloud bot
8f40161fa2
[tx-robot] updated from transifex 2019-09-12 02:55:19 +00:00
Dominique Fuchs
febc035063
Merge branch 'master' into ivan/remote-size-retrieved-race-condition 2019-09-11 22:56:34 +02:00
Dominique Fuchs
4902751d02
Merge branch 'master' into bugfixing-slideshow 2019-09-11 22:17:57 +02:00
Dominique Fuchs
45bd869a15
Merge branch 'master' into master 2019-09-11 22:06:22 +02:00
Michael Schuster
905c1532fe
fix comment typo
Signed-off-by: Michael Schuster <michael@schuster.ms>
2019-09-11 17:31:16 +02:00
Michael Schuster
c3d8657619 Merge branch 'master' of https://github.com/nextcloud/desktop 2019-09-11 17:27:49 +02:00
Nextcloud bot
51ff031de5
[tx-robot] updated from transifex 2019-09-11 03:05:21 +00:00
Dominique Fuchs
6b9395a3c5
Merge pull request #916 from nextcloud/icons
Remove outdated (and unused) icons
2019-09-10 16:15:43 +02:00
Dominique Fuchs
b1db012094
Merge branch 'master' into icons 2019-09-10 14:36:40 +02:00
Dominique Fuchs
556e8d39aa
Merge pull request #719 from tuxmaster5000/owncloud
Rename owncloud tests to nextcloud
2019-09-10 14:31:30 +02:00
Dominique Fuchs
cd5ff96904
Merge branch 'master' into owncloud 2019-09-10 13:11:02 +02:00
Dominique Fuchs
24a20ec758
Merge pull request #1039 from javierllorente/master
Add sync date next to "Synchronized with local folder"
2019-09-10 11:38:59 +02:00
Dominique Fuchs
4edab98b58
Merge branch 'master' into owncloud 2019-09-10 11:03:39 +02:00
Dominique Fuchs
dd130ede8f
Merge branch 'master' into master 2019-09-10 10:17:37 +02:00
Dominique Fuchs
81bcb46ef2
Merge pull request #1231 from Zottel92/issue1216/IgnoreEmacsRecoveryFiles
issue1216: added sync-exclude entry for emacs recovery files
2019-09-10 09:46:24 +02:00
Dominique Fuchs
37f532c1f0
Merge branch 'master' into issue1216/IgnoreEmacsRecoveryFiles 2019-09-10 09:02:55 +02:00
Nextcloud bot
04f2bd4baa
[tx-robot] updated from transifex 2019-09-10 03:06:52 +00:00
Dominique Fuchs
07df659a3f
Merge branch 'master' into issue1216/IgnoreEmacsRecoveryFiles 2019-09-09 21:46:39 +02:00
Dominique Fuchs
e89ff9ae61
Merge branch 'master' into msvc-warn-audit 2019-09-09 20:16:52 +02:00
Dominique Fuchs
c662ff1902 fixed wrongly assigned pointer, didn't recognize class
Signed-off-by: Dominique Fuchs <32204802+DominiqueFuchs@users.noreply.github.com>
2019-09-09 20:06:32 +02:00
Dominique Fuchs
a3825080db Use -Wno-gnu-zero-variadic-macro-arguments only for Clang
Signed-off-by: Dominique Fuchs <32204802+DominiqueFuchs@users.noreply.github.com>
2019-09-09 19:35:30 +02:00
Dominique Fuchs
a237493def Q_UNUSED for atm unused parameters
Signed-off-by: Dominique Fuchs <32204802+DominiqueFuchs@users.noreply.github.com>
2019-09-09 19:23:38 +02:00