 Roeland Jago DoumaandGitHub
|
a6fae36cb2
|
Merge pull request #1536 from nextcloud/ci/bump5.12image/libsecret
Bump Qt5.12 image
|
2019-10-21 20:27:53 +02:00 |
|
|
Roeland Jago DoumaandGitHub
|
c6705ecd9c
|
Merge pull request #1462 from tribut/fix-typo-elided
Fix typo
|
2019-10-01 12:02:36 +02:00 |
|
|
Roeland Jago DoumaandGitHub
|
b8ef78205a
|
Merge pull request #1256 from meskobalazs/master
Marking unused strings as unstranslatable
|
2019-09-04 23:06:08 +02:00 |
|
|
Roeland Jago DoumaandGitHub
|
0cb1f4d14b
|
Merge pull request #1394 from nextcloud/webflow-client-ssl-ca-chain
Windows: Workaround for CredWriteW used by QtKeychain
|
2019-09-04 20:04:45 +02:00 |
|
|
Roeland Jago DoumaandGitHub
|
85a2860e86
|
Merge pull request #1389 from nextcloud/webflow-client-ssl
Adds SSL client cert storage to webflow + Login Flow v2
|
2019-08-28 07:40:39 +02:00 |
|
|
Roeland Jago DoumaandGitHub
|
e0a1d78441
|
Merge pull request #1225 from edent/patch-1
Typo
|
2019-08-19 15:39:10 +02:00 |
|
|
Roeland Jago DoumaandGitHub
|
ea6f3be374
|
Merge pull request #1273 from csware/issue-1266
WebView: Properly handle usernames with spaces and plus signs in it
|
2019-05-23 19:59:49 +02:00 |
|
|
Roeland Jago DoumaandGitHub
|
b6c0f9db5d
|
Merge pull request #1253 from muesli/webview-typo
Fixed typo in "certificate"
|
2019-05-13 07:58:52 +02:00 |
|
|
Roeland Jago DoumaandGitHub
|
50755d0295
|
Merge pull request #1251 from yarons/patch-1
Fixed typo
|
2019-05-13 07:58:29 +02:00 |
|
|
Roeland Jago DoumaandGitHub
|
6a63d8f2b9
|
Merge pull request #1191 from nextcloud/bugfix/1172/share-link
Share link fixing
|
2019-04-12 14:31:11 +02:00 |
|
|
Roeland Jago DoumaandGitHub
|
ac257cd65f
|
Merge pull request #1186 from tintou/tintou/i18n
Fix several memory leaks in cloudproviders and add translation support
|
2019-04-12 14:09:30 +02:00 |
|
|
Roeland Jago DoumaandGitHub
|
088b0817d8
|
Merge branch 'master' into tintou/i18n
|
2019-04-12 13:48:19 +02:00 |
|
|
Roeland Jago DoumaandGitHub
|
b0c75723e2
|
Merge pull request #1200 from nextcloud/new_drone
New drone config
|
2019-04-12 13:47:28 +02:00 |
|
|
Roeland Jago DoumaandGitHub
|
c75cb390dd
|
Merge branch 'master' into tintou/i18n
|
2019-04-12 10:35:02 +02:00 |
|
|
Roeland Jago DoumaandGitHub
|
26f897d22c
|
Merge pull request #1157 from stragu/patch-1
Fix a minor typo
|
2019-03-29 13:33:55 +01:00 |
|
|
Roeland Jago DoumaandGitHub
|
0e3a8856e5
|
Merge pull request #1092 from nextcloud/enh/debug_not_warnings
Be less verbose with logging
|
2019-03-04 10:19:16 +01:00 |
|
|
Roeland Jago DoumaandGitHub
|
28afe8c323
|
Merge pull request #1087 from SimJoSt/patch-1
correct app passwords link
|
2019-02-14 11:51:24 +01:00 |
|
|
Roeland Jago DoumaandGitHub
|
822c386709
|
Merge pull request #1057 from nextcloud/fix/proxy-login-flow
Fix login flow with system proxy
|
2019-01-31 16:11:08 +01:00 |
|
|
Roeland Jago DoumaandGitHub
|
bf81a473af
|
Merge pull request #1054 from nextcloud/enh/no_double_slash
Do not add double slash to login flow url
|
2019-01-30 16:39:52 +01:00 |
|
|
Roeland Jago DoumaandGitHub
|
a46548fc04
|
Merge pull request #1050 from IzabelaBakollari/master
Removed whitespace from string
|
2019-01-30 09:58:15 +01:00 |
|
|
Roeland Jago DoumaandGitHub
|
310266f9fa
|
Merge pull request #1006 from javierllorente/master
Wizard: show an error message if there is no enough free space in the local folder
|
2019-01-14 09:52:51 +01:00 |
|
|
Roeland Jago DoumaandGitHub
|
27298a2056
|
Merge pull request #959 from yan12125/correct-webview-deallocation
Make sure _profile and _page are deleted in the correct order
|
2019-01-07 15:01:23 +01:00 |
|
|
Roeland Jago DoumaandGitHub
|
5ebee92991
|
Merge pull request #1001 from nextcloud/fix/279/handle_username_space
Handle spaces in username properly in login flow
|
2019-01-07 14:21:52 +01:00 |
|
|
Roeland Jago DoumaandGitHub
|
cacf3e9924
|
Merge pull request #923 from ivaradi/disco-support
Support Ubuntu Disco Dingo
|
2019-01-07 09:53:04 +01:00 |
|
|
Roeland Jago DoumaandGitHub
|
dc993d3ebe
|
Merge pull request #981 from yan12125/fix-kde-cmake-warnings
Fix KDEInstallDirs deprecation warnings
|
2019-01-07 09:49:07 +01:00 |
|
|
Roeland Jago DoumaandGitHub
|
6dfe160cef
|
Merge pull request #993 from HuemerGroup/stylesheet-fix
Removed Stylesheet
|
2019-01-07 09:33:53 +01:00 |
|
|
Roeland Jago DoumaandGitHub
|
188125dd88
|
Merge branch 'master' into disco-support
|
2019-01-05 22:08:24 +01:00 |
|
|
Roeland Jago DoumaandGitHub
|
071709ab5e
|
Merge pull request #946 from hiiamok/qt5.12-wizard-webview
Added missing Include
|
2018-12-13 19:34:42 +01:00 |
|
|
Roeland Jago DoumaandGitHub
|
1490b186f9
|
Merge pull request #860 from nextcloud/fix/566/do_not_read_system_exclude
Do not read system exclude list if user exclude is present
|
2018-11-27 11:54:40 +01:00 |
|
|
Roeland Jago DoumaandGitHub
|
8b64db6344
|
Merge branch 'master' into fix/566/do_not_read_system_exclude
|
2018-11-27 11:19:20 +01:00 |
|
|
Roeland Jago DoumaandGitHub
|
ab85dfcd67
|
Merge pull request #880 from nextcloud/fix/873
Write the actual folder to the log
|
2018-11-27 11:16:10 +01:00 |
|
|
Roeland Jago DoumaandGitHub
|
d1b9d100b4
|
Merge pull request #874 from nextcloud/fix_activity_busy_loop
Fix the activity loop
|
2018-11-22 23:09:57 +01:00 |
|
|
Roeland Jago DoumaandGitHub
|
1afaa22ddb
|
Merge pull request #859 from nextcloud/fix/788/no_activity_flood
Do not fetch activities if they are not enabled
|
2018-11-19 23:15:08 +01:00 |
|
|
Roeland Jago DoumaandGitHub
|
bdd5d423ed
|
Merge branch 'master' into fix/788/no_activity_flood
|
2018-11-19 21:29:58 +01:00 |
|
|
Roeland Jago DoumaandGitHub
|
44b5e07a80
|
Merge pull request #847 from jpnurmi/share-dialog-take-2
Share dialog alignment
|
2018-11-19 20:18:30 +01:00 |
|
|
Roeland Jago DoumaandGitHub
|
d8c0fb856c
|
Merge branch 'master' into share-dialog-take-2
|
2018-11-19 19:33:05 +01:00 |
|
|
Roeland Jago DoumaandGitHub
|
1c0fbba98e
|
Merge pull request #854 from nextcloud/enoch85-patch-1
Change link to docs for NC 15
|
2018-11-18 16:34:14 +01:00 |
|
|
Roeland Jago DoumaandGitHub
|
3a50b57b5a
|
Merge pull request #848 from nextcloud/rakekniven-patch-1
Fixed typo
|
2018-11-17 13:08:06 +01:00 |
|
|
Roeland Jago DoumaandGitHub
|
433a059223
|
Merge pull request #843 from Aentfs/master
Change man page names and contents for nextcloud
|
2018-11-16 22:35:22 +01:00 |
|
|
Roeland Jago DoumaandGitHub
|
4febf7c70b
|
Merge pull request #823 from Awesome-Technologies/providers
Fix cmake build using WITH_PROVIDERS=OFF
|
2018-11-14 14:43:42 +01:00 |
|
|
Roeland Jago DoumaandGitHub
|
b8f0721fcb
|
Merge pull request #824 from ivaradi/debian-repo-update
Debian/Ubuntu target repository update
|
2018-11-14 14:30:51 +01:00 |
|
|
Roeland Jago DoumaandGitHub
|
8f95f68f06
|
Merge branch 'master' into providers
|
2018-11-14 13:18:37 +01:00 |
|
|
Roeland Jago DoumaandGitHub
|
88c738dd21
|
Merge pull request #818 from nextcloud/enhancement/809/config-error
More verbose error and proper app name on configuration read error
|
2018-11-13 11:30:18 +01:00 |
|
|
Roeland Jago DoumaandGitHub
|
cc7abc02f4
|
Merge pull request #813 from jpnurmi/action-colors
SettingsDialog: tweak color aware icons
|
2018-11-13 08:16:41 +01:00 |
|
|
Roeland Jago DoumaandGitHub
|
e2c813bfca
|
Merge branch 'master' into action-colors
|
2018-11-13 07:41:53 +01:00 |
|
|
Roeland Jago DoumaandGitHub
|
5695aba5d7
|
Merge pull request #811 from jpnurmi/modernize
libsync: let Clang-Tidy modernize nullptr & override usage
|
2018-11-13 07:41:10 +01:00 |
|
|
Roeland Jago DoumaandGitHub
|
0d9d942ab7
|
Merge branch 'master' into modernize
|
2018-11-12 20:21:13 +01:00 |
|
|
Roeland Jago DoumaandGitHub
|
9de32d2cb7
|
Merge pull request #812 from jpnurmi/settings-dialog-accounts
SettingsDialog: fix a little glitch in the account tool button size
|
2018-11-12 20:10:30 +01:00 |
|
|
Roeland Jago DoumaandGitHub
|
9f6bb617e9
|
Merge pull request #807 from nextcloud/modernize
GUI: let Clang-Tidy modernize nullptr & override usage
|
2018-11-12 15:26:18 +01:00 |
|
|
Roeland Jago DoumaandGitHub
|
c5a4694c74
|
Merge branch 'master' into modernize
|
2018-11-12 14:56:35 +01:00 |
|
|
Roeland Jago DoumaandGitHub
|
0f2294cef4
|
Merge pull request #806 from nextcloud/server-notification-handler
Fixup the port in server notification URLs
|
2018-11-12 14:48:30 +01:00 |
|
|
Roeland Jago DoumaandGitHub
|
778489d445
|
Merge pull request #808 from jpnurmi/slideshow
Improve the slide show
|
2018-11-12 14:47:56 +01:00 |
|
|
Roeland Jago DoumaandGitHub
|
cf0838643f
|
Merge pull request #800 from nextcloud/fix/open_activities_on_conflict
Actually open the activity view on a click for more info
|
2018-11-09 16:36:24 +01:00 |
|
|
Roeland Jago DoumaandGitHub
|
559fd910d8
|
Merge pull request #801 from nextcloud/fix/generated_avatar_not_black
Use a format that supports alpha channels for avatars
|
2018-11-09 15:15:46 +01:00 |
|
|
Roeland Jago DoumaandGitHub
|
9c0e5c2b19
|
Merge pull request #797 from alexcustos/issue_alternative_log_in
Added default scheme when server returns just a host
|
2018-11-09 08:52:39 +01:00 |
|
|
Roeland Jago DoumaandGitHub
|
347f4c8675
|
Merge pull request #796 from nextcloud/settings-dialog-height
SettingsDialog: disable unnecessary wrapping for the about label
|
2018-11-07 21:09:27 +01:00 |
|
|
Roeland Jago DoumaandGitHub
|
1b6e0c5292
|
Merge pull request #794 from jpnurmi/activity-text-colors
Fix ActivityWidget palette
|
2018-11-07 10:13:00 +01:00 |
|
|
Roeland Jago DoumaandGitHub
|
32cf2f2622
|
Merge branch 'master' into activity-text-colors
|
2018-11-07 09:29:15 +01:00 |
|
|
Roeland Jago DoumaandGitHub
|
13e1b6a34a
|
Merge pull request #790 from nextcloud/fix/789/osx_installer_background
Update isntaller background for OSX
|
2018-11-06 11:11:16 +01:00 |
|
|
Roeland Jago DoumaandGitHub
|
5a1fed8e23
|
Merge pull request #785 from nextcloud/we_are_nextcloud
Use Nextcloud
|
2018-11-05 13:57:17 +01:00 |
|
|
Roeland Jago DoumaandGitHub
|
aee0363876
|
Merge pull request #783 from nextcloud/doc/cmake-build
Fix cmake build of documentation
|
2018-11-05 11:26:36 +01:00 |
|
|
Roeland Jago DoumaandGitHub
|
2b760cd63b
|
Merge pull request #781 from ivaradi/qt5.5-compat
Qt 5.5 compatibility patch for Xenial
|
2018-11-04 21:08:44 +01:00 |
|
|
Roeland Jago DoumaandGitHub
|
54b490c8d1
|
Merge branch 'master' into qt5.5-compat
|
2018-11-04 20:41:33 +01:00 |
|
|
Roeland Jago DoumaandGitHub
|
1e6b0b8924
|
Merge pull request #780 from jpnurmi/margins
Margins
|
2018-11-04 20:20:42 +01:00 |
|
|
Roeland Jago DoumaandGitHub
|
ef15534c64
|
Merge branch 'master' into margins
|
2018-11-04 19:40:40 +01:00 |
|
|
Roeland Jago DoumaandGitHub
|
b904d79d8f
|
Merge pull request #776 from nextcloud/feature/migrate_http_to_webflow
Migrate http auth to webflow
|
2018-11-04 14:03:13 +01:00 |
|
|
Roeland Jago DoumaandGitHub
|
0c535872cb
|
Merge branch 'master' into feature/migrate_http_to_webflow
|
2018-11-04 13:47:04 +01:00 |
|
|
Roeland Jago DoumaandGitHub
|
af8a2819be
|
Merge pull request #768 from nextcloud/fix/766/copy_over_old_windows_config
Copy over config file to new location on windows
|
2018-11-02 21:01:22 +01:00 |
|
|
Roeland Jago DoumaandGitHub
|
17d05a2ad4
|
Merge pull request #750 from jpnurmi/slideshow
Setup wizard: implement an animated and interactive slide show
|
2018-11-02 12:21:07 +01:00 |
|
|
Roeland Jago DoumaandGitHub
|
e6f1d7632a
|
Merge branch 'master' into slideshow
|
2018-11-02 10:43:01 +01:00 |
|
|
Roeland Jago DoumaandGitHub
|
40c36a9ed3
|
Merge pull request #756 from jpnurmi/add-button
Make the "Add Folder Sync Connection" button act like a button
|
2018-11-02 10:39:00 +01:00 |
|
|
Roeland Jago DoumaandGitHub
|
67714d33db
|
Merge pull request #744 from jpnurmi/remove-qtsvg-include
Build fix: remove an unused QtSvg/QSvgRenderer include
|
2018-11-02 10:31:01 +01:00 |
|
|
Roeland Jago DoumaandGitHub
|
e01cb108e1
|
Merge pull request #754 from kevin147147/patch-1
theming for general settings ui
|
2018-11-02 10:08:18 +01:00 |
|
|
Roeland Jago DoumaandGitHub
|
3e634dad70
|
Merge pull request #764 from Awesome-Technologies/user_group_widget
Fix warning in ShareUserGroupWidget
|
2018-11-02 10:05:14 +01:00 |
|
|
Roeland Jago DoumaandGitHub
|
28fe702e8e
|
Merge pull request #769 from nextcloud/l10n/update
Update to translate strings
|
2018-11-01 16:13:10 +01:00 |
|
|
Roeland Jago DoumaandGitHub
|
899fca12ba
|
Merge pull request #721 from storca/patch-1
Inform user that configuration is not writable
|
2018-11-01 11:44:37 +01:00 |
|
|
Roeland Jago DoumaandGitHub
|
0f1395fdf0
|
Merge pull request #758 from nextcloud/self-signed-login-flow
Allow to use the login flow with a self signed certificate
|
2018-11-01 11:43:54 +01:00 |
|
|
Roeland Jago DoumaandGitHub
|
b30a8528bd
|
Merge pull request #645 from nextcloud/upstream/wizard
Wizard enhancement
|
2018-11-01 09:30:19 +01:00 |
|
|
Roeland Jago DoumaandGitHub
|
bb4c180c89
|
Merge branch 'master' into upstream/wizard
|
2018-11-01 08:32:12 +01:00 |
|
|
Roeland Jago DoumaandGitHub
|
a23dd9dfb3
|
Merge pull request #646 from nextcloud/upstream/pr/6656
FolderMan::checkPathValidityForNewFolder: make sure to work when fold…
|
2018-11-01 08:31:36 +01:00 |
|
|
Roeland Jago DoumaandGitHub
|
3b5d8f0277
|
Merge branch 'master' into upstream/pr/6656
|
2018-11-01 08:07:55 +01:00 |
|
|
Roeland Jago DoumaandGitHub
|
fd2293b067
|
Merge pull request #655 from nextcloud/upstream/pr/6671
Do not require server replies to contain an mtime
|
2018-10-31 22:19:26 +01:00 |
|
|
Roeland Jago DoumaandGitHub
|
5cfdc71ca5
|
Merge branch 'master' into upstream/pr/6671
|
2018-10-31 21:13:10 +01:00 |
|
|
Roeland Jago DoumaandGitHub
|
d3ee6ed9c5
|
Merge pull request #651 from nextcloud/upstream/pr/6616
Update: Report on readdir() errors #6610
|
2018-10-31 21:12:54 +01:00 |
|
|
Roeland Jago DoumaandGitHub
|
b7d0e5672a
|
Merge branch 'master' into upstream/pr/6616
|
2018-10-31 13:51:34 +01:00 |
|
|
Roeland Jago DoumaandGitHub
|
cb4450864e
|
Merge pull request #656 from nextcloud/upstream/pr/6672
Settings: Attempt to fix rename issue on old macOS
|
2018-10-30 23:04:34 +01:00 |
|
|
Roeland Jago DoumaandGitHub
|
ef3aeb65cc
|
Merge pull request #658 from nextcloud/upstream/pr/6698
OAuth: Fix infinite loop when the refresh token is expired
|
2018-10-30 23:04:09 +01:00 |
|
|
Roeland Jago DoumaandGitHub
|
aca75ee982
|
Merge pull request #403 from nextcloud/upstream/pr/6372
Partial local discovery: Fix scheduling logic
|
2018-10-30 23:03:16 +01:00 |
|
|
Roeland Jago DoumaandGitHub
|
326c872ba7
|
Merge pull request #663 from nextcloud/upstream/pr/6707
Windows: Release handle/fd when file open fails #6699
|
2018-10-30 22:40:44 +01:00 |
|
|
Roeland Jago DoumaandGitHub
|
dd39887f2b
|
Merge pull request #641 from nextcloud/upstream/pr/6621
TestOAuth: Don't have global static QObject
|
2018-10-30 22:38:51 +01:00 |
|
|
Roeland Jago DoumaandGitHub
|
8df9746005
|
Merge branch 'master' into upstream/pr/6372
|
2018-10-30 22:37:30 +01:00 |
|
|
Roeland Jago DoumaandGitHub
|
85b9f94a36
|
Merge pull request #748 from caugner/qtkeychain-0.9.1
qtkeychain: 0.8.0 -> 0.9.1
|
2018-10-28 19:45:17 +01:00 |
|
|
Roeland Jago DoumaandGitHub
|
8688fabee3
|
Merge branch 'master' into qtkeychain-0.9.1
|
2018-10-28 19:20:16 +01:00 |
|
|
Roeland Jago DoumaandGitHub
|
8acc5573ff
|
Merge pull request #667 from nextcloud/upstream/pr/6592
SettingsDialog: Show the page for the newly created account
|
2018-10-25 08:23:51 +02:00 |
|
|
Roeland Jago DoumaandGitHub
|
6224f6a1fa
|
Merge branch 'master' into upstream/pr/6592
|
2018-10-25 07:44:04 +02:00 |
|
|
Roeland Jago DoumaandGitHub
|
eb31e9205c
|
Merge branch 'master' into upstream/issues/6696-6610
|
2018-10-24 16:50:39 +02:00 |
|
|
Roeland Jago DoumaandGitHub
|
c8204f1725
|
Merge pull request #640 from nextcloud/upstream/pr/6617
OAuth: Remove the timeout
|
2018-10-24 16:49:59 +02:00 |
|
|
Roeland Jago DoumaandGitHub
|
174f99728f
|
Merge branch 'master' into upstream/pr/6617
|
2018-10-24 16:27:31 +02:00 |
|
|
Roeland Jago DoumaandGitHub
|
dcdf6d966d
|
Merge pull request #717 from tuxmaster5000/gitignore
Add cmake temporary stuff
|
2018-10-24 13:22:56 +02:00 |
|
|
Roeland Jago DoumaandGitHub
|
3e79ebed60
|
Merge pull request #661 from nextcloud/upstream/pr/6712
nautilus: Fix GET_MENU_ITEMS with utf8 filenames #6643
|
2018-10-24 13:22:22 +02:00 |
|