OpenCloud
/
riot-web
mirror of https://github.com/vector-im/riot-web
1
0
Fork 0
Code Issues Releases Wiki Activity
5,657 Commits
228 Branches
566 Tags
501 MiB
Commit Graph

107 Commits (e3dcaebe9b187ab3ccbe08911764675c41425a90)

Author SHA1 Message Date
Luke Barnard 11b0cc8211 Merge branch 'develop' into luke/feature-tag-panel-tile-context-menu 2018-02-13 17:00:19 +00:00
David Baker e67147213b
Merge pull request #6096 from vector-im/luke/room-list-flux 
Make room tagging flux-y
 2018-02-13 14:18:50 +00:00
Luke Barnard d47c9d8b6e Add context menu to TagPanel 
See https://github.com/matrix-org/matrix-react-sdk/pull/1743
 2018-02-12 18:02:55 +00:00
David Baker d904212033 Merge branch 'release-v0.13.5' into develop 2018-02-09 12:28:26 +00:00
David Baker 62e90ceb0d Sanity check URLs with isUrlPermitted 
Thanks to walle303 for letting us know these weren't being checked.
 2018-02-09 12:20:31 +00:00
lukebarnard 662942ec29 Use dispatch to change room tags from RoomTileContextMenu 2018-02-06 11:52:39 +00:00
lukebarnard 83996c09d9 General delint, cleanup 2018-02-06 11:51:46 +00:00
Matthew Hodgson 8855cc294e converge on 'noisy' to mean noisy notifs 2018-01-19 16:52:54 +00:00
Michael Telatynski 17c4839029
only show reply button on REAL (not pending) m.room.message events 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2018-01-11 19:21:02 +00:00
Michael Telatynski 2961e1949f
delint 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2017-12-16 19:07:32 +00:00
Michael Telatynski 304d281ed2
change reply to be its own thing 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2017-12-16 19:01:56 +00:00
Michael Telatynski 54a9ccdee7
throw new quoting behind flags 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2017-12-12 23:36:10 +00:00
Michael Telatynski 10c6f24a83
CSS and Context Menu tweaks for Rich Quoting/Replies 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2017-12-10 12:52:00 +00:00
Travis Ralston a583c2b658 Merge branch 'develop' into travis/granular 2017-11-14 19:16:35 -07:00
Travis Ralston f6177cd7b5 Use granular settings instead of synced settings 
Signed-off-by: Travis Ralston <travpc@gmail.com>
 2017-10-29 01:51:02 -06:00
Travis Ralston ef5fc7347a Don't update presence status if the user is clicks twice 
Signed-off-by: Travis Ralston <travpc@gmail.com>
 2017-10-15 20:20:43 -06:00
Travis Ralston deb50b2d43 Add presence context menu and styling 
Signed-off-by: Travis Ralston <travpc@gmail.com>
 2017-10-14 23:15:26 -06:00
Travis Ralston 6926c96f36 Hide pinning messages behind a labs settings 
Signed-off-by: Travis Ralston <travpc@gmail.com>
 2017-10-14 16:41:44 -06:00
Travis Ralston 3e066d3aef Merge branch 'develop' into travis/pinned_messages 2017-10-14 16:11:17 -06:00
Travis Ralston 2d153a72c1 Split up CSS; use .catch instead of .then 
Signed-off-by: Travis Ralston <travpc@gmail.com>
 2017-09-29 13:33:14 -06:00
Travis Ralston 965a25ba84 Fix bug where rooms missing m.room.pinned_events could not pin messages 
Signed-off-by: Travis Ralston <travpc@gmail.com>
 2017-09-29 11:08:22 -06:00
Travis Ralston f7389b70aa Hide the pin option in the context menu if the user can't pin messages 
Signed-off-by: Travis Ralston <travpc@gmail.com>
 2017-09-29 11:01:17 -06:00
Travis Ralston 774c3dbd38 Pin/unpin message option in a message's context menu 
Signed-off-by: Travis Ralston <travpc@gmail.com>
 2017-09-29 10:42:58 -06:00
Stefan Parviainen 3cff8c1230 Mark some strings as translatable 
Signed-off-by: Stefan Parviainen <pafcu@iki.fi>
 2017-09-23 13:46:51 +02:00
Michael Telatynski 2316f4230e
install and use prop-types over React.PropTypes 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2017-09-13 14:23:35 +01:00
Michael Telatynski 32ea675c92
fix (C) header 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2017-09-06 14:20:12 +01:00
Michael Telatynski 60c2338543
generic contextual menu for tooltip/responses 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2017-09-06 11:27:04 +01:00
Luke Barnard 535e33509b Merge pull request #4688 from vector-im/t3chguy/i18n_analytics 
un-i18n Modal Analytics
 2017-08-10 15:36:04 +01:00
Michael Telatynski 4c6836bc3f
don't track error messages .2 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2017-08-10 15:13:30 +01:00
Michael Telatynski 9c5ceb6775
don't track error messages 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2017-08-10 13:56:01 +01:00
Luke Barnard 57f82c3c9e Quote using innerText 
codep matrix-org/matrix-react-sdk#1289
 2017-08-10 10:18:37 +01:00
Michael Telatynski 5b6dbfb701
Merge branch 'develop' of github.com:vector-im/riot-web into t3chguy/i18n_analytics 2017-07-28 21:02:48 +01:00
Michael Telatynski 93a3c896a4
un-i18n Modal Analytics 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2017-07-27 17:45:02 +01:00
Richard van der Hoff bc2f639aae Fix a couple of minor errors in the room list 
bluebird promises don't support .fail, so some operations didn't work quite
right. We should use .catch instead.
 2017-07-24 17:19:46 +01:00
Richard van der Hoff d5b550f89a replace q method calls with bluebird ones 
```
find src test -name '*.js' |
    xargs perl -i -pe 's/q\.(all|defer|reject|delay|try|isFulfilled)\(/Promise.$1(/'
```
 2017-07-13 00:50:01 +01:00
Richard van der Hoff 10decf95f6 replace imports of `q` with bluebird 
update `package.json`

```
find src test -name '*.js' |
    xargs perl -i -pe 'if (/require\(.[qQ].\)/) { $_ = "import Promise from '\''bluebird'\'';\n"; }'

find src test -name '*.js' |
    xargs perl -i -pe 'if (/import [qQ] /) { $_ = "import Promise from '\''bluebird'\'';\n"; }'
```
 2017-07-13 00:48:31 +01:00
Luke Barnard c1b8879b6b Merge pull request #4500 from vector-im/luke/feature-enable-RTE 
Take RTE out of labs
 2017-07-10 13:56:02 +01:00
Luke Barnard 77a52b02cb Take RTE out of labs 
Goes with https://github.com/matrix-org/matrix-react-sdk/pull/1176
 2017-07-04 16:26:19 +01:00
Michael Telatynski f36c1ca207 fix Quote not closing contextual menu 
also use `this.closeMenu();` over the explicit direct call as the wrapper exists and is a little clearer
 2017-06-27 14:51:18 +01:00
Michael Telatynski 274536bf13 change dispatcher forward_event signature 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2017-06-16 16:11:33 +01:00
Kegan Dougal 162f3872e5 Translate src/components/context_menus|dialogs 2017-05-31 15:40:49 +01:00
Michael Telatynski 6a57742343 managed to eat the eventStatus check, can't redact a local-echo etc 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2017-05-30 14:19:33 +01:00
Michael Telatynski 17c4e7a748 check PL on change as well as on comp load, that way it'll show remove button if PL increases later. 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2017-05-29 23:49:56 +01:00
Michael Telatynski d3f9304598 Merge branch 'develop' of github.com:vector-im/riot-web into t3chguy/show_redact_if_can 2017-05-29 23:17:44 +01:00
Matthew Hodgson da7c6ca856 Merge branch 'develop' into travis/redact-to-remove 2017-05-28 22:41:38 +01:00
Matthew Hodgson 2f71dc9fe5 Merge branch 'develop' into forward_message 2017-05-28 02:37:10 +01:00
David Baker ee85eb961a Bulk change counterpart imports 
to use react-sdk wrapper function, rather than using counterpart
directly.
 2017-05-25 11:39:56 +01:00
David Baker 6b6fa59f3e Squash merge https://github.com/vector-im/riot-web/pull/3636 2017-05-23 14:12:53 +01:00
Michael Telatynski 09f987559b rename action, now forwarding any event is possible, limited by where 
button is shown, i.e easy to modify

Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2017-05-19 01:30:36 +01:00
Michael Telatynski 7777be89ee only for finalised events 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2017-05-18 23:53:37 +01:00