summary refs log tree commit diff
path: root/src/timeline (follow)
Commit message (Collapse)AuthorAgeFilesLines
* Show verification status in memberlistNicolas Werner2021-08-132-5/+7
|
* Show if there are unverified devices in a roomNicolas Werner2021-08-132-0/+20
| | | | | Also fixes some issues where nested transactions will poison the verification cache.
* fix sticker packs being uneditable in some roomsNicolas Werner2021-08-111-1/+1
|
* Show encryption errors in qml and add request keys buttonNicolas Werner2021-08-075-150/+136
|
* Basic sticker pack editorNicolas Werner2021-08-062-1/+16
|
* QML the raw message dialogLoren Burkholder2021-07-312-9/+7
|
* Merge pull request #655 from LorenDB/qml-all-the-thingsDeepBlueV7.X2021-07-303-3/+13
|\ | | | | QML all the things, part 2: Read receipts dialog
| * Use a QSortFilterProxyModel instead of resetting the modelLoren Burkholder2021-07-293-5/+5
| |
| * QML the read receipts listLoren Burkholder2021-07-293-3/+13
| | | | | | | | There are probably a few things wrong with this, but I'm going to call it good enough for an initial commit
* | Log how many rooms we loadedNicolas Werner2021-07-301-0/+2
|/
* Merge pull request #651 from LorenDB/qml-all-the-thingsDeepBlueV7.X2021-07-232-0/+8
|\ | | | | Fix a few UI things
| * make lintLoren Burkholder2021-07-221-1/+2
| |
| * Add functionality for loading global user profile where neededLoren Burkholder2021-07-212-0/+7
| | | | | | | | This is so viewing profiles from the invite dialog will work as expected.
* | Add menu to enable or disable stickers globallyNicolas Werner2021-07-232-0/+23
| |
* | Rename image pack modelNicolas Werner2021-07-223-7/+7
|/
* Move various room auxiliary functions to TimelineManagerLoren Burkholder2021-07-214-32/+35
|
* Open room members when member info label clickedLoren Burkholder2021-07-212-3/+3
|
* make lintLoren Burkholder2021-07-201-1/+2
|
* Add property for plain room nameLoren Burkholder2021-07-202-0/+5
|
* Clean up codeLoren Burkholder2021-07-202-11/+3
|
* make lintLoren Burkholder2021-07-201-3/+3
|
* Permissions only needs a roomid to functionLoren Burkholder2021-07-204-6/+7
|
* Make sure to use the default room id if none is specifiedLoren Burkholder2021-07-202-4/+4
|
* make lintLoren Burkholder2021-07-203-56/+27
|
* QML the invite dialogLoren Burkholder2021-07-203-2/+55
| | | | This also adds a property `roomId` to TimelineModel.
* QML the room member listLoren Burkholder2021-07-204-9/+16
|
* Explicitly reload data in delegates, if related events got loadedNicolas Werner2021-07-202-0/+7
|
* Fix replying and editing stickersNicolas Werner2021-07-191-0/+9
|
* Fix only first 7 stickers showing upNicolas Werner2021-07-191-1/+1
|
* Basic sticker supportNicolas Werner2021-07-195-4/+46
|
* Fix replies not reloading after fetching themNicolas Werner2021-07-162-4/+9
|
* Add workaround for TextEdit not rerendering after image loadedNicolas Werner2021-07-152-0/+14
| | | | fixes #541
* Switch to room after joining inviteNicolas Werner2021-07-131-9/+10
|
* Don't allow switching to current roomNicolas Werner2021-07-131-0/+4
| | | | fixes #634
* Fix verification requests showing up on startupNicolas Werner2021-07-121-0/+9
|
* Don't use full dump for repliesNicolas Werner2021-07-122-0/+7
|
* Fix off-by-1 in insertRows when loading room list from initial syncNicolas Werner2021-07-121-2/+3
|
* Prepare for reuseItems in timelineNicolas Werner2021-07-122-13/+18
| | | | The actual reuseItems is still blocked on a few upstream bugs.
* Remove db bottleneck by caching ro txn for 100 requestsNicolas Werner2021-07-102-6/+11
|
* Redesign invites and room preview joinsNicolas Werner2021-07-092-8/+94
|
* Show previews for space roomsNicolas Werner2021-07-042-25/+213
|
* Update translationsNicolas Werner2021-07-021-1/+2
|
* Remove dead code to calculate last messageNicolas Werner2021-07-011-3/+3
|
* Fix too many newlines in reply fallbackNicolas Werner2021-06-301-1/+1
|
* Fix tags going missing if you join communitiesNicolas Werner2021-06-261-1/+1
|
* Apply suggestions from code reviewStuart Mumford2021-06-251-1/+1
|
* Update src/timeline/TimelineModel.cppStuart Mumford2021-06-251-1/+1
|
* Add another regex to match inline img tags using single quotesStuart Mumford2021-06-251-0/+4
| | | | Signed-off-by: Stuart Mumford <stuart@cadair.com>
* Fix spaces showing up with world filterNicolas Werner2021-06-251-25/+44
|
* Don't spam key requests directly after startupNicolas Werner2021-06-253-0/+23
|
* Add a basic 'Space page'Nicolas Werner2021-06-252-0/+11
|
* Fix off by 1 in previousRoom conditionNicolas Werner2021-06-251-1/+1
|
* Hide spaces by default, unless they are in the current space filterNicolas Werner2021-06-254-7/+59
|
* Fix hiding rooms from a spaceNicolas Werner2021-06-253-13/+50
|
* Allow filtering by spaceNicolas Werner2021-06-253-0/+36
|
* Show some spaces in the community sidebarNicolas Werner2021-06-252-9/+37
|
* fixup! Allow editing unsent messagesAlexander Bantyev2021-06-192-1/+7
|
* fixup! Allow editing unsent messagesAlexander Bantyev2021-06-191-0/+1
|
* fixup! Allow editing unsent messagesAlexander Bantyev2021-06-182-7/+21
|
* Allow editing unsent messagesAlexander Bantyev2021-06-182-7/+43
| | | | | | | | | | As of 0db4d71ec2483c7ac5a7b536737fee8fc53a76d7 (Prevent edits of unsent messages), messages that are edits of (or replies to) unsent messages were not allowed. This change was made because otherwise the edits were discarded due to use of txnid rather than mxid in the "m.relates_to" object. Remove this restriction and fix the issue by replacing txnid with mxid in all related events when the message is sent (and we obtain mxid from the server).
* Fix wrong tags in context menuNicolas Werner2021-06-141-0/+10
|
* Fix copy and paste fail for low prio avatarNicolas Werner2021-06-141-1/+1
|
* Merge branch 'master' into qml-roomlistNicolas Werner2021-06-121-2/+1
|\
| * Avoid unnecessary QColor -> QString conversionsJoseph Donofry2021-06-081-2/+1
| |
* | Remove useless captureNicolas Werner2021-06-111-12/+11
| |
* | Reenable tag hidingNicolas Werner2021-06-115-17/+89
| |
* | Enable toggling tagsNicolas Werner2021-06-115-5/+52
| |
* | Render community itemsNicolas Werner2021-06-111-3/+4
| |
* | Basic community list modelNicolas Werner2021-06-096-25/+230
| |
* | Implement switching in narrow modeNicolas Werner2021-06-083-28/+10
| |
* | Try to get rid of an allocationNicolas Werner2021-05-303-11/+9
| |
* | Fix use after free from Qml widgetNicolas Werner2021-05-302-3/+5
| |
* | Fix warningNicolas Werner2021-05-281-1/+1
| |
* | Delete old room listNicolas Werner2021-05-283-0/+34
| |
* | Move currentRoom/timeline handling to roomlistNicolas Werner2021-05-286-111/+110
| |
* | Reimplement room context menusNicolas Werner2021-05-282-0/+78
| |
* | Reenable invitesNicolas Werner2021-05-244-36/+147
| |
* | Fix leaving roomsNicolas Werner2021-05-221-0/+11
| |
* | Fix emoji in new RoomListNicolas Werner2021-05-224-1/+14
| |
* | Sort the room listNicolas Werner2021-05-225-8/+119
| |
* | Make roomlist look niceNicolas Werner2021-05-214-11/+160
| |
* | Some basic room listNicolas Werner2021-05-194-129/+272
| |
* | Reorganize TimelineView to prepare porting the room listNicolas Werner2021-05-141-1/+1
| |
* | Move openLink to Nheko globalsNicolas Werner2021-05-132-53/+0
| |
* | Make palette global in QmlNicolas Werner2021-05-131-0/+5
|/
* Mark unsent events as uneditableNicolas Werner2021-05-091-2/+4
| | | | fixes #574
* Show verification status next to messagesNicolas Werner2021-05-073-0/+19
|
* Only show actions, when you have permissions to do themNicolas Werner2021-05-024-2/+220
|
* Fix crash when you have no rooms and open the profile as well as not ↵Nicolas Werner2021-04-303-5/+5
| | | | rendering rooms without groups
* Copy link to messageNicolas Werner2021-04-293-0/+50
| | | | fixes #499
* Highlight navigated to messageNicolas Werner2021-04-294-0/+69
|
* Fix some encoding issues when translating matrix.to to matrix:Nicolas Werner2021-04-291-6/+4
|
* Make pagination logic slightly more robustNicolas Werner2021-04-291-1/+1
|
* Rewrite matrix.to links to matrix uris and handle them the same wayNicolas Werner2021-04-281-1/+47
|
* Make forward messages a bit more readableNicolas Werner2021-04-272-49/+50
|
* Merge branch 'forward_message_feature' of https://github.com/Jedi18/nheko ↵Nicolas Werner2021-04-244-2/+142
|\ | | | | | | into Jedi18-forward_message_feature
| * fix macos build errortargetakhil2021-04-222-13/+6
| |
| * strip reply fallbacks from forwarded messagetargetakhil2021-04-182-11/+46
| |
| * move detection code to nheko namespace and fix a few other bugstargetakhil2021-04-174-92/+56
| |
| * directly upload old file object and reuse old messagetargetakhil2021-04-173-79/+109
| |
| * remove unused function and set position to center of timeline viewtargetakhil2021-04-152-12/+0
| |
| * show forward menu item only for relevant events, changes to uitargetakhil2021-04-152-0/+12
| |
| * added basic forwardingtargetakhil2021-04-155-9/+127
| |
* | Escape html in topics and show line breaks in the settingsNicolas Werner2021-04-191-4/+9
| |
* | Use one CompletionProxy for everything including EmojiPickerNicolas Werner2021-04-181-3/+5
| |
* | Fix display name referenced for incorrect event typesJoseph Donofry2021-04-181-3/+4
| |
* | change display name wordingtargetakhil2021-04-181-5/+8
|/
* add notice and rainbownotice commandsLordMZTE2021-04-112-0/+34
|
* Fix crash on exitNicolas Werner2021-04-091-4/+12
|
* Don't use direct image response objects anymoreNicolas Werner2021-04-052-28/+40
|
* Fix rainbow replies and add rainbowmeNicolas Werner2021-04-012-7/+9
|
* Merge pull request #535 from LordMZTE/feature/rainbowDeepBlueV7.X2021-03-282-4/+9
|\ | | | | add /rainbow command
| * run formatterLordMZTE2021-03-281-1/+1
| |
| * Update src/timeline/InputBar.cppDeepBlueV7.X2021-03-281-1/+1
| |
| * Use QRegularExpressionDeepBlueV7.X2021-03-281-1/+1
| |
| * fix command parsingLordMZTE2021-03-281-3/+2
| |
| * commands now also work with newline after themLordMZTE2021-03-281-0/+2
| |
| * implement requested changesLordMZTE2021-03-281-1/+1
| |
| * add /rainbow commandLordMZTE2021-03-262-3/+7
| |
* | Add part/leave commandLoren Burkholder2021-03-251-0/+2
|/
* Clean up notification code a bitNicolas Werner2021-03-171-24/+1
|
* Switch readImage to take a reference instead of a pointerLoren Burkholder2021-03-171-1/+1
| | | | There was nowhere that an actual pointer was passed, and I wanted to do references for something else.
* Create function for processing whether a message is a replyLoren Burkholder2021-03-171-1/+1
|
* make lintLoren Burkholder2021-03-171-2/+2
|
* Parse markdown overrides during repliesLoren Burkholder2021-03-171-1/+3
| | | | I apparently missed this when I originally added the overrides.
* Don't send markdown links in bodyNicolas Werner2021-03-152-4/+32
| | | | fixes #422
* Merge pull request #523 from Jedi18/masterDeepBlueV7.X2021-03-151-0/+8
|\ | | | | Fix windows video bug
| * prepend file:// for linux and macostargetakhil2021-03-151-0/+8
| |
* | Remove some more allocationsNicolas Werner2021-03-141-7/+9
|/
* Merge branch 'quickswitcher_qml' of git://github.com/Jedi18/nheko into ↵Nicolas Werner2021-03-134-24/+45
|\ | | | | | | Jedi18-quickswitcher_qml
| * change allowed mistakes, fix minor style issues, remove old completer ↵Jedi182021-03-073-25/+1
| | | | | | | | function from inputbar
| * fix timeline focusJedi182021-02-232-0/+7
| |
| * enter key now works, fix room highlighting and add overlayJedi182021-02-232-0/+7
| |
| * add room alias delegate, fix some quickswitcher ui problemsJedi182021-02-221-0/+5
| |
| * add quick switcher qml file and moved completerFor from inputbar to timeline ↵Jedi182021-02-212-0/+26
| | | | | | | | view class
* | Disable room pings in repliesNicolas Werner2021-03-121-0/+2
| |
* | fix lintingNicolas Werner2021-03-052-109/+113
| |
* | Merge pull request #505 from Nheko-Reborn/license-headersDeepBlueV7.X2021-03-0512-0/+48
|\ \ | | | | | | License headers
| * | Update license headersNicolas Werner2021-03-0512-0/+48
| | |
* | | Fix lintingJoseph Donofry2021-03-042-113/+109
|/ /
* | Fix reply relating to the wrong id of edited eventNicolas Werner2021-03-031-1/+1
| |
* | Fix text input restoring after editsNicolas Werner2021-02-253-20/+25
| |
* | Allow editing via up and down arrowsNicolas Werner2021-02-242-2/+22
|/
* Merge pull request #479 from Jedi18/add_rooms_model_completerDeepBlueV7.X2021-02-191-0/+6
|\ | | | | Add rooms completion model
| * added bool to choose between showing only rooms with aliases and all of the ↵Jedi182021-02-171-2/+2
| | | | | | | | rooms
| * add rooms model, add room delegate for completerJedi182021-02-161-0/+6
| |
* | Merge pull request #474 from Jedi18/room_settings_qmlDeepBlueV7.X2021-02-194-6/+17
|\ \ | | | | | | Shifted Room Settings Dialog to QML
| * | Merge branch 'master' into room_settings_qmlAkhil Nair2021-02-149-55/+253
| |\|
| * | replaced with togglebutton using qtquickcontrols2Jedi182021-02-131-1/+1
| | |
| * | added changing of name through edit modal, removed old roomsettingsJedi182021-02-124-11/+3
| | |
| * | fix avatar update on timeline syncJedi182021-02-114-5/+12
| | |
| * | added notifications and encryption for the new roomsettingsJedi182021-02-112-3/+9
| | |
| * | ui almost looks the same, midway between transition from old room settings ↵Jedi182021-02-102-3/+6
| | | | | | | | | | | | to new room settings
| * | added room settings qmlJedi182021-02-092-2/+5
| | |
* | | Make inline images work a bit betterNicolas Werner2021-02-171-2/+10
| | |
* | | Fix crash from logging unset indices (leftover after debugging)Nicolas Werner2021-02-171-5/+0
| |/ |/|
* | Fix hover handling in the timelineNicolas Werner2021-02-141-1/+3
| |
* | Mark messages as read, when Nheko gets focusedNicolas Werner2021-02-131-3/+3
| | | | | | | | fixes #235
* | Fix crash when editing an edited message pointing to itselfNicolas Werner2021-02-121-7/+9
| |
* | Prevent edits of unsent messagesNicolas Werner2021-02-102-0/+6
| |
* | Fix messages sometimes not being rendered, when they are too largeNicolas Werner2021-02-101-4/+0
| |
* | Fix UI allowing edits of foreign messages in some casesNicolas Werner2021-02-101-4/+6
| |
* | Fix stuck notifications because of editsNicolas Werner2021-02-102-5/+20
| | | | | | | | | | Does not fix the read status yet, for that we need to compare read receipts for all events after the last visible event.
* | Implement message editingNicolas Werner2021-02-094-10/+65
| | | | | | | | | | | | The UI still looks ugly, but I have no good idea atm. fixes #134
* | Display edits correctlyNicolas Werner2021-02-093-10/+60
| |
* | Fix edited repliesNicolas Werner2021-02-091-4/+15
| |
* | Render editsNicolas Werner2021-02-092-4/+54
| |
* | Switch to new relations formatNicolas Werner2021-02-094-31/+36
| |
* | Merge pull request #459 from Jedi18/minor_fixesDeepBlueV7.X2021-02-092-0/+8
|\ \ | | | | | | Fix emoji related issues
| * | focus message input on adding emoji/reacting to a messageJedi182021-02-052-0/+8
| |/
* / Native rendering breaks kerningNicolas Werner2021-02-071-4/+0
|/
* Merge branch 'master' into avatar_username_featureDeepBlueV7.X2021-02-033-5/+23
|\
| * Merge remote-tracking branch 'nheko-im/master' into privacy_screenJoseph Donofry2021-02-016-24/+89
| |\
| | * Merge pull request #431 from Jedi18/avatar_username_featureDeepBlueV7.X2021-02-012-3/+3
| | |\ | | | | | | | | Username editing (room specific and global)
| | * | make lintLoren Burkholder2021-01-291-3/+3
| | | |
| | * | Center user info dialog on the screenLoren Burkholder2021-01-291-0/+4
| | | |
| | * | Fix crash, when keys for no events were requestedNicolas Werner2021-01-271-1/+2
| | | |
| | * | Fix request key loopsNicolas Werner2021-01-271-2/+5
| | | |
| * | | Implement Privacy ScreenJoseph Donofry2021-01-261-2/+12
| | | | | | | | | | | | | | | | | | | | | | | | * Add handles for window focus gained / focus lossed and connect to timer * Clean up some of the PrivacyScreen.qml code * Connect settings to PrivacyScreen visibility
* | | | add loading indicatorJedi182021-02-021-1/+1
| | | |
* | | | add error message and update avatars on avatar change in timeline and user ↵Jedi182021-02-021-1/+4
| |_|/ |/| | | | | | | | profile dialog
* | | made requeste changesJedi182021-01-291-5/+1
| | |
* | | Shifted fetching of global username fom timeline model to user profileJedi182021-01-292-15/+1
| | |
* | | fix lintingJedi182021-01-281-2/+2
| | |
* | | Changed edit method from double clicking to an edit buttonJedi182021-01-282-1/+19
| | |
* | | Username can be edited by double clicking on text, added global user profile ↵Jedi182021-01-281-1/+1
| | | | | | | | | | | | menu action in user info widget
* | | update room specific username from userprofileJedi182021-01-272-3/+3
| |/ |/|
* | Fix old messages being played back after limit resetNicolas Werner2021-01-241-0/+9
| |
* | Merge pull request #406 from rnhmjoj/open-inDeepBlueV7.X2021-01-242-8/+33
|\ \ | | | | | | Add "open in external program" action
| * | Add "open in external program" actionrnhmjoj2021-01-242-8/+33
| | |
* | | Request unknown message indicesNicolas Werner2021-01-231-6/+15
|/ /
* | Merge pull request #393 from LorenDB/mdCommandsDeepBlueV7.X2021-01-232-3/+16
|\ \ | | | | | | Markdown setting override commands
| * | Remove useless parenthesesDeepBlueV7.X2021-01-231-2/+2
| | |
| * | Clarify how markdown is determinedLoren Burkholder2021-01-202-3/+3
| | |
| * | Make lintLoren Burkholder2021-01-202-6/+8
| | |
| * | Add commands to override Markdown settingLoren Burkholder2021-01-202-3/+14
| |/
* / Fix font tags showing up in playable media messagesNicolas Werner2021-01-231-1/+2
|/
* Simplify section handling a bitNicolas Werner2021-01-192-27/+23
|
* Make read markers a bit less confusingNicolas Werner2021-01-161-3/+4
|
* Make it easier to understand, what button to click for verification from profileNicolas Werner2021-01-121-0/+8
|
* Fix timeline becoming corrupted on backfillNicolas Werner2021-01-122-8/+26
| | | | Fixes #273
* Fix call invite declined on another devicetrilene2021-01-101-1/+3
|
* Fix call answered on another devicetrilene2021-01-071-1/+6
|
* Port PlaceCall dialog to Qmltrilene2021-01-072-47/+0
|
* Make call invites less intrusivetrilene2021-01-071-1/+3
|
* Move call-related properties to CallManagertrilene2021-01-073-66/+6
|
* Allow inline replies from notifications on linuxNicolas Werner2021-01-073-1/+16
|
* Fix typing notifications flickering sometimesNicolas Werner2021-01-051-6/+13
|
* lintNicolas Werner2020-12-251-2/+4
|
* Fix some compiler warningsNicolas Werner2020-12-252-6/+6
|
* Store secrets in keychainNicolas Werner2020-12-161-1/+6
|
* React with arbitrary strings via /reactNicolas Werner2020-12-131-0/+6
|
* Merge pull request #347 from kamathmanu/avatarFullViewSupportDeepBlueV7.X2020-11-301-0/+3
|\ | | | | Add support for viewing avatar images in full size
| * Lint codekamathmanu2020-11-301-1/+1
| |
| * Lint codekamathmanu2020-11-301-1/+3
| |
| * Add support for viewing avatar images in full sizekamathmanu2020-11-301-0/+1
| |
* | Properly share and rotate sessions on member and device changesNicolas Werner2020-11-301-74/+10
| |
* | Load sessions lazily from dbNicolas Werner2020-11-301-2/+3
| |
* | Fix variable shadowingNicolas Werner2020-11-261-5/+5
| |
* | Fix race when reading members from dbNicolas Werner2020-11-251-1/+4
| |
* | Fix input focus when pressing reply buttonNicolas Werner2020-11-251-0/+1
| |
* | Implement Qml drag and dropNicolas Werner2020-11-254-0/+22
| |
* | Fix mimetype of media messagesNicolas Werner2020-11-251-0/+1
| |
* | Qml emoji completerNicolas Werner2020-11-251-0/+6
| |
* | Working User completerNicolas Werner2020-11-251-0/+8
| |
* | WIP Qml completerNicolas Werner2020-11-252-0/+8
| |
* | Reimplement message historyNicolas Werner2020-11-252-15/+56
| |
* | Send typing updates from QMLNicolas Werner2020-11-253-2/+56
| |
* | Move calls to new input barNicolas Werner2020-11-254-142/+71
| |
* | Add file uploadingNicolas Werner2020-11-253-2/+358
| |
* | Basic text input in qmlNicolas Werner2020-11-255-90/+169
| |
* | Pasteable textinputNicolas Werner2020-11-254-0/+77
|/
* Merge pull request #320 from trilene/webrtc-videoDeepBlueV7.X2020-11-092-0/+7
|\ | | | | Video calls: add local webcam view
| * Video calls: add local webcam viewtrilene2020-11-092-0/+7
| |
* | Merge pull request #310 from MayeulC/fix-typoDeepBlueV7.X2020-10-311-2/+2
|\ \ | |/ |/| Improve wording in multiple strings.
| * Wording: replace "encrypted room" with "encrypted private chat"Mayeul Cantan2020-10-311-2/+2
| | | | | | | | | | This is for consistency with "Start a private chat", and is more specific.
* | Merge remote-tracking branch 'upstream/master' into webrtc-videotrilene2020-10-283-9/+11
|\ \
| * | Don't pass around empty timelineNicolas Werner2020-10-282-7/+4
| | |
| * | Optimize buildNicolas Werner2020-10-273-2/+7
| |/
* | Merge remote-tracking branch 'upstream/master' into webrtc-videotrilene2020-10-276-233/+106
|\|
| * Fix infinite pagination properly now.Nicolas Werner2020-10-231-1/+4
| |
| * Clean up key requests + autoreloadNicolas Werner2020-10-205-14/+59
| |
| * Share code for sending encrypted olm messagesNicolas Werner2020-10-202-204/+25
| |
| * Store timestamp with olm sessionsNicolas Werner2020-10-203-1/+9
| |
| * Fix crash on exitNicolas Werner2020-10-172-16/+12
| |
* | Support video callstrilene2020-10-272-0/+15
|/
* Try to fix windows buildNicolas Werner2020-10-081-3/+3
|
* Try to please the CI godsNicolas Werner2020-10-081-2/+4
|
* Fix issues with old qt and bump to 5.10Nicolas Werner2020-10-081-5/+7
|
* Merge remote-tracking branch 'origin/master' into cross-signingNicolas Werner2020-10-082-2/+27
|\