summary refs log tree commit diff
path: root/src/ui (follow)
Commit message (Collapse)AuthorAgeFilesLines
* Use the styles default delay for tooltipsNicolas Werner2021-12-312-0/+12
| | | | | | | This makes them less annoying when scrolling or accessing the popup menu. See also #860
* Try to reduce CPU overhead of animated images a bitNicolas Werner2021-12-301-4/+8
|
* Prevent copies when querying themeNicolas Werner2021-12-293-17/+37
|
* Cache supported animated image formatsNicolas Werner2021-12-291-1/+2
|
* Reserve size of some containers we are fillingNicolas Werner2021-12-293-13/+16
|
* Reduce allocations required for the paletteNicolas Werner2021-12-291-34/+40
|
* Reduce allocations using QStringLiteralNicolas Werner2021-12-299-40/+40
|
* use more literalsNicolas Werner2021-12-291-2/+2
|
* Fix more warnings and remove dead codeNicolas Werner2021-12-2821-516/+184
|
* Remove unused button classNicolas Werner2021-12-282-131/+0
|
* Some qt6 prepNicolas Werner2021-12-285-4/+5
|
* Make clang-format <13 and clang-format >=13 behave the sameNicolas Werner2021-11-226-12/+1
| | | | | I think old clang-format is just buggy in those cases, so we should reenable those blocks, once everyone has 13 or up.
* Support exif rotation on received videosNicolas Werner2021-11-152-16/+39
| | | | fixes #674
* Fix some colors switched to yellow by accidentNicolas Werner2021-11-131-0/+2
|
* Merge remote-tracking branch 'nheko-im/master' into video_player_enhancementsJoseph Donofry2021-11-081-0/+2
|\
| * Improve fetching of device keys after loginNicolas Werner2021-11-081-0/+2
| |
* | Fix syntax issueJoseph Donofry2021-11-031-1/+1
| |
* | PlayableMediaMessage fixes on macOSJoseph Donofry2021-11-031-2/+31
|/
* Fix registration on matrix.orgNicolas Werner2021-11-032-5/+158
| | | | | | | | This was a bit of a journey: https://github.com/matrix-org/matrix-doc/pull/3471 But it should work now and we now use the UIAHandler everywhere. fixes #670
* Prompt user when there are unverified devicesNicolas Werner2021-11-012-1/+6
|
* Allow changing device names, display last seen time and IPThulinma2021-10-202-1/+23
|
* Use allow list for URI schemesNicolas Werner2021-10-171-1/+11
|
* move device verification management to its own fileNicolas Werner2021-10-171-2/+2
|
* Move voip and encryption stuff into their own directoriesNicolas Werner2021-10-172-2/+2
|
* Add support for listing devices that do not support encryption, add support ↵Thulinma2021-10-172-1/+80
| | | | | | for logging out devices. Ticks off another box in #23!
* Merge pull request #741 from LorenDB/qmlJoinRoomDlgDeepBlueV7.X2021-10-112-8/+3
|\ | | | | QML the join room dialog
| * QML the join room dialogLoren Burkholder2021-10-092-8/+3
| |
* | Merge pull request #755 from Nheko-Reborn/bootstrappingDeepBlueV7.X2021-10-092-0/+176
|\ \ | |/ |/| Support bootstrapping crosssigning
| * Support bootstrapping crosssigningNicolas Werner2021-10-092-0/+176
| | | | | | | | | | Showing the bootstrap state and showing there are unverified devices is still missing.
* | Merge pull request #743 from LorenDB/qmlLogoutDeepBlueV7.X2021-10-092-3/+6
|\ \ | |/ |/| QML the logout dialog
| * make lintLoren Burkholder2021-10-091-1/+1
| |
| * QML the logout dialogLoren Burkholder2021-10-052-3/+6
| |
* | Simplify device list refresh logicDeepBlueV7.X2021-10-071-3/+1
| |
* | Remove duplicated verification status calculationNicolas Werner2021-10-072-48/+50
| |
* | Added support for refreshing the device list, marking current device with a ↵Thulinma2021-10-062-0/+14
|/ | | | checkmark instead of a lock
* Change indentation to 4 spacesNicolas Werner2021-09-1852-3368/+3314
|
* Improvements for linking to eventsThulinma2021-09-161-42/+2
| | | | | | - Fixes scrolling to an event not being reliable - Adds new /goto command that can open URLs, go to events, or go to message indexes. - Refactored ChatPage::handleMatrixUri() to contain the handling originally in Nheko::openLink(), and makes it return a boolean based on whether the URL was handled internally or not.
* Remove unused structLoren Burkholder2021-09-111-7/+0
|
* Add jdenticon supportLoren Burkholder2021-09-111-1/+2
|
* More profile improvements:Thulinma2021-09-081-2/+1
| | | | | | | | | - Now scrolls entire profile instead of only device list, improving the experience on smaller screens - Fixed centering of room name - Allow profile to be sized smaller to match the new scrolling behavior - Silenced warning about room being null for global profiles - Matrix URLs now open global profiles instead of room-specific profiles if the user is not in the currently opened room - Opening global profile from room specific profile now uses openGlobalUserProfile function instead of reinventing the wheel
* Improvements to user profiles:Thulinma2021-09-052-1/+10
| | | | | | | | - Set a minimum width on the profile window (avatar size + margins) - Made avatar editing a separate button, so you can zoom in on your own avatars - Added hover text to avatar/displayname change buttons, which clarify where they will apply for global/room-specific profiles - Added display of room name for room-specific profiles, with hover text that explains what that means. - Added way to open global profile for users from their room-specific profiles (globe button next to room name)
* Fix another leak when creating an animated image without an imageNicolas Werner2021-08-291-1/+6
|
* Fix memory leak of animated image texturesNicolas Werner2021-08-291-1/+3
|
* Add option to only play animated images on hoverNicolas Werner2021-08-292-1/+20
|
* Support animated imagesNicolas Werner2021-08-293-2/+245
| | | | fixes #461
* Use in memory media player instead of storing unencrypted files on diskNicolas Werner2021-08-292-0/+222
|
* Allow accepting knocks in the timelineNicolas Werner2021-08-172-1/+33
| | | | As well as selecting more join rules.
* Fix window placement on wayland and add close buttonsNicolas Werner2021-08-042-0/+10
| | | | | | We explicitly set a parent. We can't assign to ApplicationWindow.transientParent though, only to Window.transientParent, so we just call setTransientParent in C++.
* QML the raw message dialogLoren Burkholder2021-07-311-0/+5
|
* Remove Avatar classLoren Burkholder2021-07-292-216/+0
| | | | RIP
* Remove version checks for unsupported Qt versionsNicolas Werner2021-07-262-18/+2
|
* Remove additional key requests preference codeJoe2021-07-242-9/+0
|
* Merge master and fix conflictsJoe2021-07-241-1/+1
|\
| * Add menu to enable or disable stickers globallyNicolas Werner2021-07-231-1/+1
| |
* | Remove 'respond to key requests' functionalityJoseph Donofry2021-07-152-8/+0
|/
* Use coeurl for networkingNicolas Werner2021-06-301-1/+1
| | | | | Something is still wrong on shutdown, need to debug that. And CI will fail.
* Increase contrast of dark theme secondary colors slightlyNicolas Werner2021-06-251-1/+1
|
* Don't read avatarUrl from local profile, if no global avatar is setNicolas Werner2021-06-121-5/+3
|
* Port remaining sidebar actions to qmlNicolas Werner2021-05-302-0/+31
|
* Move currentRoom/timeline handling to roomlistNicolas Werner2021-05-281-1/+1
|
* Reenable invitesNicolas Werner2021-05-242-1/+6
|
* Reenable userInfo settings menuNicolas Werner2021-05-222-0/+6
|
* Fix device list not showing up and UserProfile blocking the windowNicolas Werner2021-05-223-3/+6
|
* Make roomlist look niceNicolas Werner2021-05-212-5/+12
|
* Basic header and footer of room listNicolas Werner2021-05-157-120/+156
|
* Reorganize TimelineView to prepare porting the room listNicolas Werner2021-05-141-0/+7
|
* Move global avatarSize propertyNicolas Werner2021-05-131-0/+3
|
* Move openLink to Nheko globalsNicolas Werner2021-05-132-0/+57
|
* Make palette global in QmlNicolas Werner2021-05-132-0/+52
|
* Show verification status next to messagesNicolas Werner2021-05-072-6/+8
|
* Only show actions, when you have permissions to do themNicolas Werner2021-05-021-0/+2
|
* Escape html in topics and show line breaks in the settingsNicolas Werner2021-04-191-2/+3
|
* Remove some more allocationsNicolas Werner2021-03-141-1/+1
|
* Fix unused variableNicolas Werner2021-03-051-1/+0
|
* fix lintingNicolas Werner2021-03-051-3/+1
|
* Remove tweenyNicolas Werner2021-03-052-14/+26
|
* Merge pull request #505 from Nheko-Reborn/license-headersDeepBlueV7.X2021-03-0548-48/+192
|\ | | | | License headers
| * Update license headersNicolas Werner2021-03-0548-48/+192
| |
* | Fix lintingJoseph Donofry2021-03-041-3/+4
| |
* | Properly format matrix errors in spdlog statementsJoseph Donofry2021-03-041-2/+2
|/
* Linkify topic in room settings and use non-deprecated MessageDialogNicolas Werner2021-02-221-2/+2
|
* Replace rowlayouts with gridlayout and fix room settings initializer listJedi182021-02-141-2/+2
|
* Merge branch 'master' into room_settings_qmlAkhil Nair2021-02-143-13/+62
|\
| * Fix hover handling in the timelineNicolas Werner2021-02-142-0/+51
| |
| * Fix lintingNicolas Werner2021-02-091-11/+11
| |
| * Remove unused variablesNicolas Werner2021-02-091-3/+1
| |
* | replaced with togglebutton using qtquickcontrols2Jedi182021-02-131-4/+4
| |
* | added room topicJedi182021-02-132-18/+34
| |
* | added changing of name through edit modal, removed old roomsettingsJedi182021-02-122-1/+204
| |
* | fix avatar update on timeline syncJedi182021-02-112-3/+0
| |
* | shifted room avatar changingJedi182021-02-112-12/+190
| |
* | added roomversion, roomid etcJedi182021-02-112-0/+24
| |
* | added notifications and encryption for the new roomsettingsJedi182021-02-112-1/+285
| |
* | ui almost looks the same, midway between transition from old room settings ↵Jedi182021-02-102-0/+58
|/ | | | to new room settings
* Merge branch 'master' into avatar_username_featureDeepBlueV7.X2021-02-031-2/+2
|\
| * Fix unused capture warningNicolas Werner2021-02-021-2/+2
| |
* | fixed global avatar updation in the dialogJedi182021-02-022-11/+28
| |
* | add loading indicatorJedi182021-02-022-10/+38
| |
* | add error message and update avatars on avatar change in timeline and user ↵Jedi182021-02-022-3/+5
| | | | | | | | profile dialog
* | update room and global avatar through user profileJedi182021-02-012-12/+97
|/
* shifted isUsernameEditingAllowed to qml from c++Jedi182021-01-292-23/+2
|
* made requeste changesJedi182021-01-292-6/+6
|
* fix linting 2Jedi182021-01-292-3/+3
|
* Shifted fetching of global username fom timeline model to user profileJedi182021-01-292-6/+33
|
* fix lintingJedi182021-01-282-5/+5
|
* Changed edit method from double clicking to an edit buttonJedi182021-01-282-4/+7
|
* Username can be edited by double clicking on text, added global user profile ↵Jedi182021-01-282-33/+59
| | | | menu action in user info widget
* update room specific username from userprofileJedi182021-01-272-0/+40
|
* Make it easier to understand, what button to click for verification from profileNicolas Werner2021-01-122-6/+20
|
* Handle matrix schemeNicolas Werner2021-01-101-6/+1
| | | | | | Link opening only works on Linux for now. See https://github.com/matrix-org/matrix-doc/pull/2312
* Improve Register page (#346)Kirillpt2020-11-302-6/+22
| | | | | | | | | | | | | | | | | | | | | | | | | * add username error label, add word wrapping for error labels * make lint * last commits * remove font, and remove some lambdas * add QRegularExpression for regex * improve review things * add isModified() for checkFields() * add check isModified() for all fields in checkFields * Update src/RegisterPage.cpp Co-authored-by: DeepBlueV7.X <nicolas.werner@hotmail.de> * remove emit call for showError Co-authored-by: DeepBlueV7.X <nicolas.werner@hotmail.de>
* change Toggle behaviorkirillpt2020-11-261-0/+1
|
* fix validation feature in TextInput, it was trouble in password field in the ↵kirillpt2020-11-261-0/+1
| | | | login page
* Merge pull request #339 from Kirillpt/issue_331DeepBlueV7.X2020-11-251-1/+1
|\ | | | | fix #331
| * maybe fix toggle work in codekirillpt2020-11-251-1/+1
| |
* | Merge pull request #335 from Nheko-Reborn/qml-text-inputDeepBlueV7.X2020-11-252-0/+69
|\ \ | |/ |/| Qml text input
| * Implement Qml drag and dropNicolas Werner2020-11-252-0/+69
| |
* | Update src/ui/TextField.cppDeepBlueV7.X2020-11-251-1/+1
| |
* | move error_matrixid label below matrixid input, made hide/show for the ↵kirillpt2020-11-232-1/+16
|/ | | | label, made red underline for invalid input, add to TextField class isValid() setValid() for custom validation
* Simplify PainterHighQualityEnabler codeMayeul Cantan2020-11-071-11/+3
| | | | | There is no need to iterate over a list, flags can be applied and stored simultaneously.
* Smooth avatars in widgetsMayeul Cantan2020-11-071-1/+3
|
* Optimize buildNicolas Werner2020-10-272-8/+2
|
* Calculate verification status from cross-signing sigs and update dynamicallyNicolas Werner2020-10-082-107/+46
|
* Make steps in verification flow explicitNicolas Werner2020-10-052-40/+25
|
* Clean up verification and key cache a bitNicolas Werner2020-10-021-43/+27
|
* Fix Wrong Emojis Issue in Room VerificationChethan2k12020-09-041-1/+1
|
* Fix catch by value warningNicolas Werner2020-09-031-3/+3
|
* Small FixesCH Chethan Reddy2020-08-291-4/+5
|
* Verify signatures and find trusted devicesCH Chethan Reddy2020-08-251-64/+117
|
* Cache FixCH Chethan Reddy2020-08-241-66/+111
|
* [WIP] Room Verification Works!CH Chethan Reddy2020-08-181-2/+3
|
* [WIP] Room-Verification MessagesCH Chethan Reddy2020-08-092-21/+41
|
* Adding Room Key Verification StuffCH Chethan Reddy2020-07-302-0/+38
|
* Updating keys of outdated encrypted usersCH Chethan Reddy2020-07-302-12/+8
|
* Adding icons to UserProfileCH Chethan Reddy2020-07-302-6/+9
|
* Refactor UserProfileNicolas Werner2020-07-304-178/+143
|
* Some issue with UserProfileCH Chethan Reddy2020-07-304-68/+109
|
* [WIP] Add Caching for usersCH Chethan Reddy2020-07-302-46/+64
|
* Add some Userprofile buttonsCH Chethan Reddy2020-07-302-1/+32
|
* Add C++ Model for DeviceListCH Chethan Reddy2020-07-304-31/+132
|
* Adding DeviceList for userprofileChethan2k12020-07-302-17/+59
|
* Rewrite UserProfile in qmlCH Chethan Reddy2020-07-302-0/+87
|
* Correct a typo in SnackBar.cppFelix Yan2020-06-221-1/+1
|
* Fix Qt5.15 issuesNicolas Werner2020-06-053-1/+4
| | | | fixes #214
* Improve Login and Register page hintingNicolas Werner2020-05-091-1/+4
|
* Fix high CPU usage on high dpi screensNicolas Werner2020-04-292-15/+23
| | | | Fixes #180
* Clean up unused avatar functionsNicolas Werner2020-03-223-19/+4
|
* Fix avatar layering in room listNicolas Werner2020-03-032-7/+0
|
* Fix high dpi scaling of avatarsNicolas Werner2020-02-282-10/+31
|
* remove setStyleSheet calls directly from widget codeAdasauce2020-02-212-21/+0
| | | | | | | | | | | | | | | removed from: - emoji panel scrollbars - emoji category labels - splitter image handles - textfield setTextColor impl small change to the category separator label for better contrast / readability in dark mode. removed setTextColor completely from TextField. Doesn't appear to be in use anywhere, and focus going more toward qss themeing from qproperty setting.
* modernize: use overrideNicolas Werner2020-02-044-5/+5
|
* modernize: use nullptrNicolas Werner2020-02-0411-20/+20
|
* Remove more unneeded headersNicolas Werner2020-01-313-97/+95
|
* Optimize includes a bitNicolas Werner2020-01-319-107/+127
|
* Fix misc ci errorsNicolas Werner2020-01-261-1/+1
|
* Remove use of deprecated enumNicolas Werner2020-01-191-2/+1
|
* Implement avatars in qml timelineNicolas Werner2019-11-231-1/+1
|
* ran make lint to apply style guidelinesAidan Hahn2019-09-021-7/+4
|
* Merge branch '0.7.0-dev' of https://github.com/Nheko-Reborn/nheko into ↵Aidan Hahn2019-09-012-27/+23
|\ | | | | | | 0.7.0-dev-bugfix-71
| * Fix usage of deprecated findNicolas Werner2019-08-281-1/+0
| |
| * Remove unused variablesNicolas Werner2019-08-261-2/+0
| |
| * Try to reduce memory usage by reusing avatar pixmapsNicolas Werner2019-08-262-25/+24
| |
* | Refactored Avatar and RoomInfoListItem to access rounding settings in placeAidan Hahn2019-09-012-19/+8
| |
* | add controll bits for avatar roundingAidan Hahn2019-08-282-2/+3
| |
* | rounding options for Avatar classAidan Hahn2019-08-281-1/+1
| |
* | added logic in avatar class to determine rounding typeAidan Hahn2019-08-272-5/+25
|/
* Try to localise timestampsNicolas Werner2019-07-281-6/+7
| | | | | | | | I'm not sure, if that is the right way, but Qt doesn't really have a way to format custom localised dates, so I tried to find the closest approximations to what we currently have. Relates to #69
* Fix support for Qt versions < 5.11Joseph Donofry2019-07-042-3/+20
|
* Fix formatting issuesJoseph Donofry2019-07-041-3/+2
|
* Fix deprecated function call issues with Qt 5.13Joseph Donofry2019-07-043-13/+19
| | | | Update to mtxclient 0.3.0
* Adjustments for the minimized sidebarKonstantinos Sideris2018-10-071-5/+0
|
* Remove ScrollbarKonstantinos Sideris2018-10-062-113/+0
|
* Enable debug logsKonstantinos Sideris2018-09-301-1/+1
|
* Remove pixel value from fontsKonstantinos Sideris2018-09-304-19/+16
|
* Don't clear selection when a context menu is requestedKonstantinos Sideris2018-09-262-0/+40
|
* Move TextLabel into its own fileKonstantinos Sideris2018-09-262-0/+133
|
* Improvements on the system themeKonstantinos Sideris2018-09-191-11/+9
|
* Remove custom stylesheet for qmenuKonstantinos Sideris2018-09-081-16/+5
|
* Simplify dialog creationKonstantinos Sideris2018-08-114-14/+20
|
* Use repaint instead of update on the loading animationKonstantinos Sideris2018-07-251-1/+1
|
* Improve the style of snackbar a bitKonstantinos Sideris2018-07-252-52/+42
|
* Show device list in user profile & add option to create 1-1 chatKonstantinos Sideris2018-07-201-1/+1
|
* Create user profile modalKonstantinos Sideris2018-07-202-5/+10
|
* Move all files under src/Konstantinos Sideris2018-07-1739-2/+1577
|
* Add a timeline message when encryption is enabledKonstantinos Sideris2018-07-071-0/+79
|
* Don't download dependencies during buildKonstantinos Sideris2018-07-041-1/+1
| | | | fixes #346
* Use the correct avatar size for HiDPI displaysKonstantinos Sideris2018-05-111-6/+4
|
* Add scrollbar in the settings menuKonstantinos Sideris2018-05-091-1/+0
|
* Hide SnackBar initially & guard against access of an empty listKonstantinos Sideris2018-05-081-15/+19
|
* Add member listKonstantinos Sideris2018-05-011-1/+1
|
* Fix CI & adjust snackbar animationKonstantinos Sideris2018-03-171-2/+2
|
* Add fancy snackbar animationKonstantinos Sideris2018-03-161-14/+14
|
* Remove opacity animation from the scrollbarKonstantinos Sideris2018-03-161-49/+1
| | | | fixes #270
* Remove QPropertyAnimation from modals to work around a regression on Qt ↵Konstantinos Sideris2018-02-171-33/+2
| | | | 5.10.1 (#87)
* Fix transparency issue on custom dialogsKonstantinos Sideris2018-02-171-2/+0
| | | | fixes #87
* Remove empty destructorsKonstantinos Sideris2018-02-107-28/+4
|
* Don't dismiss the loading overlay by clickingKonstantinos Sideris2018-01-221-1/+1
|
* Handle surrogate pairs in avatarsKonstantinos Sideris2018-01-121-2/+2
|
* Dismiss modal by clicking on the overlayKonstantinos Sideris2018-01-111-0/+8
|
* Initial support for read receiptsKonstantinos Sideris2018-01-031-0/+11
|
* Add menu to invite usersKonstantinos Sideris2017-12-101-1/+3
|
* Add gui option for joining rooms (#25)Konstantinos Sideris2017-12-101-0/+3
|
* Add style colors for the ScrollBarKonstantinos Sideris2017-12-051-5/+2
|
* Update system themeKonstantinos Sideris2017-11-251-4/+4
|
* Use system color scheme (using a Qt stylesheet) #104Max Sandholm2017-11-163-3/+11
| | | | | | | The color scheme of nheko obeys the default color theme of Qt (i.e. the system theme). It uses a Qt stylesheet to accomplish this, which means replacing the color theme with a custom theme would only be a matter of writing a new style sheet and loading it into the app.
* Use C++11 braced list style (#121)Benjamin Saunders2017-11-054-15/+21
|
* Add dummy settings menuKonstantinos Sideris2017-11-021-0/+212
|
* Save the changes between syncs in cacheKonstantinos Sideris2017-10-282-2/+2
| | | | | | - Fixes high cpu issues caused by the serialization of the whole in-memory state. - Display name changes are now visible in the timeline.
* Clean up headersKonstantinos Sideris2017-10-283-4/+0
|
* Add scroll-down buttonKonstantinos Sideris2017-10-271-0/+95
|
* LintKonstantinos Sideris2017-10-231-4/+1
|
* Make sidebar topic expand on click and fix html formatting of elided text. (#96)Rokas Kupstys2017-10-201-0/+44
| | | Fixes #95
* Add /join command supportKonstantinos Sideris2017-10-081-1/+1
|
* Add snackbarKonstantinos Sideris2017-10-081-0/+143
|
* Remove extra clang-format optionsKonstantinos Sideris2017-10-018-35/+15
|
* Manually remove KDE acceleratorsKonstantinos Sideris2017-09-241-4/+19
| | | | fixes #14
* Merge branch 'images'Konstantinos Sideris2017-09-102-201/+86
|\
| * Implement image uploads (#24)Konstantinos Sideris2017-09-102-201/+86
| |
* | Style change againKonstantinos Sideris2017-09-1013-1082/+1094
|/
* Small style changeKonstantinos Sideris2017-08-2013-233/+357
|
* macOS: Get rid of text field's focus borderKonstantinos Sideris2017-08-121-4/+7
|
* Use pixels to specify the font sizesKonstantinos Sideris2017-07-152-2/+2
| | | | | | | Basically reverts the last font related commits since pointSize isn't as reliable as pixelSize. Also some layout values (margins, spacings) have been moved out to Config.h.
* Slow down spinnerKonstantinos Sideris2017-07-021-5/+6
|
* Show confirmation dialog on logoutKonstantinos Sideris2017-06-021-1/+2
| | | | | | Minor stylistic refactoring closes #29
* Add custom scrollbar on the timelineKonstantinos Sideris2017-05-241-0/+106
|
* Use strongly typed enumsKonstantinos Sideris2017-05-083-22/+22
|
* Add spinner to hide uninitialized layout after loginKonstantinos Sideris2017-04-263-5/+266
|
* Add full emoji supportKonstantinos Sideris2017-04-231-5/+5
|
* Add initial support for unread message countKonstantinos Sideris2017-04-151-7/+24
| | | | - Add border width on Badge
* Decrease button's animation durationKonstantinos Sideris2017-04-111-2/+2
|
* Remove halo animationKonstantinos Sideris2017-04-112-106/+0
|
* Add travis CIKonstantinos Sideris2017-04-091-1/+1
|
* Initial commitKonstantinos Sideris2017-04-0610-0/+1847