chylex/Nextcloud-Desktop
1
0
Fork 0
mirror of https://github.com/chylex/Nextcloud-Desktop.git synced 2026-08-15 09:30:05 +02:00
Code Activity
16,931 Commits 4 Branches 173 Tags
stable-3.3-lnk
Commit Graph
87 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Camila AyresandGitHub f52f9f0abe Merge pull request #1212 from nextcloud/cmake-simplify 
Simplify cmake command to make copy-pastable.
 2019-04-21 19:41:52 +02:00
Camila AyresandGitHub f520d7364d Merge pull request #1118 from tuchfarber/tuchfarber/fix_empty_file_error_wording 
Fix empty file wording in error log (small)
 2019-04-12 17:08:27 +02:00
Camila AyresandGitHub 4d61a7c263 Merge branch 'master' into tuchfarber/fix_empty_file_error_wording 2019-04-12 16:51:36 +02:00
Camila AyresandGitHub ac6ef500cc Merge pull request #1201 from nextcloud/bugfix/popup-empty-folder 
Uses configuraion to determine if it should show empty folder popup.
 2019-04-12 16:38:51 +02:00
Camila AyresandGitHub 936bdd04a8 Merge pull request #1185 from tintou/master 
libcloudproviders: Add missing check for Qt5DBus
 2019-04-12 16:09:31 +02:00
Camila AyresandGitHub 33baf40061 Merge branch 'master' into master 2019-04-12 15:50:55 +02:00
Camila AyresandGitHub 1ea8b18893 Merge branch 'master' into tintou/i18n 2019-04-11 13:54:18 +02:00
Camila AyresandGitHub 44c265e2a7 Merge pull request #1153 from nextcloud/enh/512/ci 
Add Qt-5.12 to CI
 2019-03-21 17:56:27 +01:00
Camila AyresandGitHub 1d37e96999 Merge pull request #1119 from nextcloud/typo 
Fix typo in translation string
 2019-03-01 12:18:34 +01:00
Camila AyresandGitHub a20ac05357 Merge pull request #1071 from nextcloud/enh/invalid_certificate_messagebox 
Add invalid certiticate messagebox
 2019-02-05 10:50:20 +01:00
Camila AyresandGitHub 9931977266 Merge pull request #1062 from nextcloud/enh/notifications/do_not_show_dismissed 
Do not display dismissed notifications
 2019-02-04 20:43:42 +01:00
Camila AyresandGitHub d4a77be3f8 Merge branch 'master' into enh/notifications/do_not_show_dismissed 2019-02-04 20:27:44 +01:00
Camila AyresandGitHub 79dd8397d7 Merge pull request #1069 from nextcloud/rakekniven-patch-1 
Fixed l18n issue. Added space for separating string
 2019-02-04 17:50:45 +01:00
Camila AyresandGitHub 840904d527 Merge pull request #778 from jpnurmi/background 
Add a command line option to launch the client in the background
 2018-12-06 09:53:19 +01:00
Camila AyresandGitHub f91678ef24 Merge branch 'master' into background 2018-12-06 09:35:15 +01:00
Camila AyresandGitHub b97d8ba6db Merge pull request #898 from nextcloud/nautilus-integration-name 
Fix appname for Nautilus integration script.
 2018-11-28 12:21:27 +01:00
Camila AyresandGitHub 72901a4ed8 Merge branch 'master' into background 2018-11-26 21:07:14 +01:00
Camila AyresandGitHub b1d68f311d Merge pull request #798 from alexcustos/issues_openssl_1_1 
Removed explicit initialization; Fixed RAND_bytes not found
 2018-11-08 10:26:47 +01:00
Camila AyresandGitHub c99a35a8a5 Merge pull request #732 from st4ll1/master 
Fix cmake command for linux in README too
 2018-10-21 11:50:28 +02:00
Camila AyresandGitHub 53cc6a1611 Merge branch 'master' into gitignore 2018-10-14 16:17:13 +02:00
Camila AyresandGitHub 4e3b408c50 Merge branch 'master' into patch-1 2018-10-14 16:14:43 +02:00
Camila AyresandGitHub aa388b86c0 Merge branch 'master' into owncloud 2018-10-14 16:13:01 +02:00
Camila AyresandGitHub 45ffc0ae09 Merge pull request #710 from kevin147147/patch-1 
Rename INSTALL to INSTALL.md for Preview :)
 2018-10-08 22:00:22 +02:00
Camila AyresandGitHub 714a4090a7 Merge pull request #668 from nextcloud/update-qtmacgoodies 
Updates submodule qtmacgoodies.
 2018-09-11 16:41:45 +02:00
Camila Ayres 0a5f890bf9 Adds bug_report template. 
Signed-off-by: Camila San <hello@camila.codes>
 2018-09-10 16:58:27 +02:00
Camila AyresandGitHub eaa4e77626 Merge pull request #652 from ivaradi/nautilus-plugin-python-fix 
Use encode()/decode() with Python 3 only.
 2018-09-10 15:29:10 +02:00
Camila AyresandGitHub bddc573c54 Merge branch 'master' into fix/279/abstract_webflow_qnam 2018-09-05 12:42:56 +02:00
Camila AyresandGitHub 1a73d3323a Merge pull request #625 from hiiamok/mac-app-icon 
Mac Application Icon
 2018-09-05 12:41:09 +02:00
Camila AyresandGitHub b19abe9c86 Merge pull request #614 from Titan-C/host_link 
In setup wizard put link to nextcloud installation.
 2018-09-02 13:18:00 +02:00
Camila AyresandGitHub 44026763b8 Merge branch 'master' into host_link 2018-09-02 12:55:44 +02:00
Camila AyresandGitHub 617cd6dfdb Merge pull request #615 from Titan-C/webview_scale 
Web view scales vertically.
 2018-09-02 12:54:41 +02:00
Camila AyresandGitHub 3a489b73f9 Merge branch 'master' into webview_scale 2018-09-02 12:23:44 +02:00
Camila AyresandGitHub 07013783ea Merge pull request #405 from nextcloud/sync-hidden-files 
Sync hidden files by default.
 2018-09-02 12:23:29 +02:00
Camila AyresandGitHub 7c77864396 Merge branch 'master' into sync-hidden-files 2018-09-02 12:01:07 +02:00
Camila AyresandGitHub bfd8897f22 Merge branch 'master' into windows-large-app-icon 2018-08-30 17:05:04 +02:00
Camila AyresandGitHub 8c19be7213 Merge pull request #599 from Titan-C/unpause_resume 
Rename Unpause To Resume.
 2018-08-30 17:03:58 +02:00
Camila AyresandGitHub 4a47d1c8ef Merge branch 'master' into unpause_resume 2018-08-30 16:47:28 +02:00
Camila AyresandGitHub e3d7c9f1ea Merge branch 'master' into icon-name-fix 2018-08-30 16:45:52 +02:00
Camila AyresandGitHub fbd8438072 Merge pull request #603 from Titan-C/login_button 
Hide login button on setup screen.
 2018-08-30 16:43:41 +02:00
Camila AyresandGitHub efc2f0eded Merge branch 'master' into login_button 2018-08-30 14:33:00 +02:00
Camila AyresandGitHub 3e839b2e44 Merge branch 'master' into unpause_resume 2018-08-30 13:31:34 +02:00
Camila AyresandGitHub 678e2c873e Merge pull request #601 from Titan-C/activity_hover_notooltip 
Drop the ToolTipRole from the activity list.
 2018-08-30 13:26:47 +02:00
Camila AyresandGitHub 881c7f804f Merge branch 'master' into activity_hover_notooltip 2018-08-30 12:33:40 +02:00
Camila AyresandGitHub cafdcf77cb Merge pull request #597 from Titan-C/readmes 
Improves README documentation.
 2018-08-29 16:08:01 +02:00
Camila AyresandGitHub 647df7bcee Merge pull request #580 from nextcloud/issues/activities 
Fixes #538: correctly checks for local sync actitivities.
 2018-08-24 14:54:42 +02:00
Camila AyresandGitHub 6a7a08bd01 Merge pull request #567 from nextcloud/issues/share-dialog 
Fixes issues in the share dialog
 2018-08-21 23:23:04 +02:00
Camila AyresandGitHub ff9177edc3 Merge pull request #571 from nextcloud/issues/mac-build 
Fixes mac build.
 2018-08-21 22:47:41 +02:00
Camila AyresandGitHub 0d9de74726 Merge pull request #562 from ivaradi/qaction2 
Further QAction constructor fixes
 2018-08-15 17:32:43 +02:00
Camila AyresandGitHub fa5143a66d Merge pull request #556 from ivaradi/qaction 
Provide parent to QAction
 2018-08-14 21:10:56 +02:00
Camila AyresandGitHub e9ae10ba6c Merge pull request #559 from nextcloud/issues/517 
Fixes #517: changes QPalette for more readability in the activities list.
 2018-08-14 17:12:48 +02:00
Camila AyresandGitHub 29c11618b3 Merge pull request #558 from nextcloud/issues/518 
Fixes #518: adds more margin for the text in the activity
 2018-08-14 16:59:54 +02:00
Camila AyresandGitHub ef9c302b5e Merge pull request #550 from nextcloud/issues/533 
Fixes #533: Removes the copy activities/notifications button
 2018-08-14 16:31:14 +02:00
Camila AyresandGitHub b50db09b01 Merge pull request #554 from nextcloud/feature/noid/enable_providers_by_default 
Enable providers by default
 2018-08-13 20:24:27 +02:00
Camila AyresandGitHub ef71e6b0f7 Merge pull request #551 from nextcloud/issues/494 
Issue #494: removes close button from the settings.
 2018-08-13 18:25:20 +02:00
Camila AyresandGitHub 8e8a619ee1 Merge branch 'master' into issues/494 2018-08-13 17:42:53 +02:00
Camila AyresandGitHub 27076c0f28 Merge pull request #552 from nextcloud/removes-notificationwidget 
Removes unused NotificationWidget class.
 2018-08-13 17:42:38 +02:00
Camila AyresandGitHub 92aaa09643 Merge pull request #541 from nextcloud/bugfix/noid/wizard-external-links 
Make links open in an external browser
 2018-08-13 12:03:31 +02:00
Camila AyresandGitHub 534a92b709 Merge branch 'master' into bugfix/noid/wizard-external-links 2018-08-13 11:40:45 +02:00
Camila AyresandGitHub 176a2e6f84 Merge branch 'master' into ubuntu-compat 2018-08-13 09:03:26 +02:00
Camila AyresandGitHub 647d16c792 Merge branch 'master' into bugfix/noid/wizard-external-links 2018-08-13 09:02:21 +02:00
Camila AyresandGitHub 3ad33a368a Merge branch 'master' into master 2018-08-13 08:58:26 +02:00
Camila AyresandGitHub 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
Camila AyresandGitHub 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 AyresandGitHub 2fd6f3583b Merge branch 'master' into fix-navigation-apps 2018-08-01 15:20:33 +02:00
Camila AyresandGitHub 720960f0be Merge pull request #497 from nextcloud/readme-updates 
Updates the README with build instructions.
 2018-07-16 12:35:23 +02:00
Camila AyresandGitHub d70e2d5c02 Merge pull request #490 from nextcloud/nickvergessen-patch-1 
Link IRC to webchat so people without a client can do something.
 2018-07-11 09:37:53 +02:00
Camila AyresandGitHub f1c4b76669 Merge branch 'master' into upstream/pr/6388 2018-07-04 10:12:42 +02:00
Camila AyresandGitHub b18c62dc41 Merge pull request #472 from nextcloud/feature/noid/loginflow_accept_language 
Set Accept-language header for webview requests
 2018-07-03 08:52:11 +02:00
Camila AyresandGitHub 2361076b75 Merge pull request #471 from nextcloud/fix/458/do_not_show_webview_by_default 
Do not force to show the webview on construct
 2018-07-02 22:22:40 +02:00
Camila AyresandGitHub 9627aad04c Merge branch 'master' into fix/458/do_not_show_webview_by_default 2018-07-02 22:01:03 +02:00
Camila AyresandGitHub 178edb97bc Merge pull request #466 from nextcloud/fix_compile_warnings 
Fix compile warnings
 2018-07-02 13:50:04 +02:00
Camila AyresandGitHub ff23e99a9a Merge pull request #389 from nextcloud/upstream/pr/6426 
Theme: unify ownCloudTheme and Theme classes
 2018-06-28 14:39:17 +02:00
Camila AyresandGitHub acc65cdc4a Merge branch 'master' into organize-windows-translation 2018-06-27 12:29:56 +02:00
Camila AyresandGitHub e3815608ab Merge branch 'master' into ci/clang 2018-06-26 17:26:54 +02:00
Camila AyresandGitHub 959318adf0 Merge pull request #450 from nextcloud/deps/openssl 
We require openssl 1.1
 2018-06-26 17:26:16 +02:00
Camila AyresandGitHub 73969e2515 Merge pull request #436 from nextcloud/feature/noid/e2e-mnemonic-dialog 
Use custom mnemonic dialog.
 2018-06-22 11:09:54 +02:00
Camila AyresandGitHub 4d60dd6516 Merge pull request #431 from nextcloud/fix/webkit-osx 
More fixes for the OSX daily builds.
 2018-06-21 15:37:56 +02:00
Camila AyresandGitHub 4aeec032fe Merge branch 'master' into fix/osx/no_thead_local 2018-06-15 10:29:24 +02:00
Camila AyresandGitHub 122daf4199 Merge pull request #335 from nextcloud/rakekniven-patch-1 
Fixed tiny grammar issue (adds dot to the end of a sentence)
 2018-05-21 17:43:35 +02:00
Camila AyresandGitHub 19ae3e4326 Merge pull request #293 from nextcloud/upstream/pr/6265 
Move remote-deleted files to trash
 2018-05-17 12:20:53 +02:00
Camila AyresandGitHub 3b0b0fea33 Merge pull request #282 from ivaradi/master 
Fix Debian build (another attempt)
 2018-05-06 19:23:31 +02:00
Camila AyresandGitHub 9338dadaab Merge pull request #265 from k1l1/log_files_path 
Put log files somewhere else #221 (name conflict)
 2018-05-02 15:30:34 +02:00
Camila AyresandGitHub 64cbc88474 Merge pull request #251 from nextcloud/clientSideEncryptionV4 
Client side encryption v4.
 2018-04-26 19:56:55 +02:00
Camila AyresandGitHub 25b40cc852 Merge pull request #255 from ad1rie1/FixDeprecatedTR 
Fix Use of Deprecated trUtf8.
 2018-04-20 11:11:05 +02:00
Camila AyresandGitHub 08b33c6f4b Merge pull request #197 from nextcloud/fix-notifications 
Improves notifications:
- Display the actual response text from the notification API in the popups.
- Do not display sync activities messages like how many files were downloaded, only errors.
- Make the notifications section above the activity feed also clickable. e.g open the call, the file that was shared, open the calendar event etc
- Changes "Show desktop notifications" setting to "Show server notifications"
- Show notifications on startup and then show only NEW notifications: uses If-None-Match check to only retrieve notifications once there are new notifications.
 2018-03-13 13:30:44 +01:00
Camila AyresandGitHub eb3b3f02a0 Merge pull request #195 from nextcloud/apps-external-sites-menu 
Adds apps and external sites to menu.
 2018-03-09 11:48:14 +01:00
Camila AyresandGitHub cb5bc61a44 Merge pull request #163 from nextcloud/edit-system-exclude-list 
Edit system exclude list.
 2018-03-01 19:32:18 +01:00