nikrozman/element-web
1
0
Fork 0
Code Issues Actions 3 Packages Projects Releases Wiki Activity
11,920 Commits 258 Branches 582 Tags
d58ff90ec1a584c4cab4a938cc13564c30b337cc
Commit Graph

5649 Commits

Author SHA1 Message Date
Travis Ralston
d58ff90ec1 Merge branch 'develop' into travis/permalink-routing 2018-10-25 15:23:33 -06:00
David Baker
85bb8392c4 Merge pull request #2247 from matrix-org/dbkr/fix_emoji_replacement 
Fix emoji replacement in composer
 2018-10-25 16:23:13 +01:00
David Baker
5e81e5b8b8 Fix variable scope 2018-10-25 15:07:19 +01:00
David Baker
401f6333ed Do...while loops are a thing 2018-10-25 14:54:32 +01:00
Travis Ralston
6ee495b912 Merge remote-tracking branch 'origin/develop' into travis/permalink-routing 2018-10-24 16:36:39 -06:00
Will Hunt
def0b2d8fb Add developertools option to UserSettings 2018-10-24 18:20:16 +01:00
Will Hunt
8118a9c71a Wall devtools button behind a setting 2018-10-24 18:15:35 +01:00
Will Hunt
44a41b589d Comma on strings and styling button 2018-10-24 17:50:27 +01:00
Will Hunt
79d467c551 Add button to open devtools in roomsettings 2018-10-24 17:36:58 +01:00
David Baker
78d8d22457 Fix emoji replacement in composer 
* Re-scan the slate document tree on each emoji replacement since
   doing a replacement will invalidate all the offsets we have.
 * Reset the emoji regex each time we use it.

Fixes https://github.com/vector-im/riot-web/issues/7550
 2018-10-24 16:46:06 +01:00
Travis Ralston
d7367a7cfd Merge branch 'develop' into travis/permalink-routing 2018-10-24 09:12:14 -06:00
Aaron Raimist
fe901142aa Split long string over two lines 
Signed-off-by: Aaron Raimist <aaron@raim.ist>
 2018-10-23 17:20:57 -05:00
Aaron Raimist
92bfb42784 Use one string instead of two 
Signed-off-by: Aaron Raimist <aaron@raim.ist>
 2018-10-23 13:11:36 -05:00
Aaron Raimist
a6c78ace4f Add warning when administrator leaves community 
Signed-off-by: Aaron Raimist <aaron@raim.ist>
 2018-10-23 12:25:12 -05:00
David Baker
5206719663 Merge pull request #2223 from matrix-org/travis/fix-group-members 
Show the group member list again
 2018-10-23 10:18:06 +01:00
Travis Ralston
8ff1da11ed Merge pull request #2237 from aaronraimist/camel-case 
lint: make colorScheme camel case
 2018-10-22 22:44:14 -06:00
Aaron Raimist
1aa3085958 Oh right, can't change these 
Signed-off-by: Aaron Raimist <aaron@raim.ist>
 2018-10-22 23:33:38 -05:00
Aaron Raimist
cb033bcadd Why not change it everywhere while we're at it 
Signed-off-by: Aaron Raimist <aaron@raim.ist>
 2018-10-22 23:16:07 -05:00
Aaron Raimist
4b3c865959 lint: make colorScheme camel case 
Signed-off-by: Aaron Raimist <aaron@raim.ist>
 2018-10-22 23:07:47 -05:00
Aaron Raimist
41bd6e4366 Change leave room button text, OK -> Leave 
Signed-off-by: Aaron Raimist <aaron@raim.ist>
 2018-10-22 20:55:24 -05:00
Travis Ralston
78f527cf95 Remove unused classes 2018-10-22 15:14:21 -06:00
David Baker
9976c4eba5 Merge pull request #2231 from matrix-org/travis/dialog-buttons 
Move all dialog buttons to the right and fix their order
 2018-10-22 15:00:35 +01:00
David Baker
c677dd8a24 Merge pull request #2225 from matrix-org/travis/join-room-text 
Add a bit of text to explain the purpose of the RoomPreviewSpinner
 2018-10-22 13:11:09 +01:00
David Baker
b8153dcec7 Merge pull request #2219 from matrix-org/travis/login-register-composer 
Move the login box from the left sidebar to where the composer is
 2018-10-22 13:05:19 +01:00
Travis Ralston
9582c1e65a Move all dialog buttons to the right and fix their order 
Fixes https://github.com/vector-im/riot-web/issues/5689

Some dialogs had their own CSS that prevented the buttons from being placed in the right spot. This has been fixed by using a generic standard for the buttons. The only strange dialog that needed more CSS was the devtools dialog due to the header.

Not all dialogs have been checked - I spot-checked about half of them and verified the CSS manually on an established account. It's hard to get at all the dialogs without convoluted testing.
 2018-10-19 15:33:23 -06:00
Travis Ralston
49efefa630 Fix an error where React doesn't like value=null on a select 
This only happens when there are no canonical aliases for a room.
 2018-10-19 14:18:05 -06:00
Travis Ralston
7383133846 Support parsing matrix.to links in the timeline with ?via= in them 
This ends up being translated to ?server_name= in the matrix-js-sdk, although that has a bug at the time of writing. It converts `server_name: ['a', 'b']` to `?server_name=a,b` instead of `?server_name=a&server_name=b`

For reference: the `viaServers` option is routed through the 'join_room' action to RoomViewStore#_joinRoom which is passed directly to the js-sdk http-api#joinRoom function.

Next steps:
* Fix the js-sdk parsing
* Make the SDK generate matrix.to links with ?via=
 2018-10-19 13:31:18 -06:00
Travis Ralston
af8dfda9a7 Add a bit of text to explain the purpose of the RoomPreviewSpinner 
Fixes https://github.com/vector-im/riot-web/issues/5869
 2018-10-17 13:53:12 -06:00
Travis Ralston
fbadb588e1 Merge pull request #2221 from matrix-org/travis/tos-register 
Support m.login.terms during registration
 2018-10-16 09:47:48 -06:00
Travis Ralston
06764c2bab Merge pull request #2220 from matrix-org/travis/peek-invite-nag 
Don't show the invite nag bar when peeking
 2018-10-16 09:30:09 -06:00
Travis Ralston
b929c36222 Documentation++ 2018-10-16 09:19:36 -06:00
Travis Ralston
d87ab8aac0 Support m.login.terms during registration 
Fixes https://github.com/vector-im/riot-web/issues/7168
Requires https://github.com/matrix-org/synapse/pull/4004
 2018-10-15 16:39:59 -06:00
Travis Ralston
6323d78b0c Move tinter init to MatrixChat 
This is a much better place for it to live
 2018-10-15 14:41:00 -06:00
Travis Ralston
2d62fda862 Don't show the invite nag bar when peeking 2018-10-15 14:35:36 -06:00
Travis Ralston
94aac62f25 Move the login box from the left sidebar to where the composer is 
Fixes https://github.com/vector-im/riot-web/issues/4227

This includes removing the collapse button that isn't needed anymore.
 2018-10-15 14:26:24 -06:00
Aaron Raimist
9f1b1d2028 Fix more lint errors 
Signed-off-by: Aaron Raimist <aaron@raim.ist>
 2018-10-11 22:50:24 -05:00
Aaron Raimist
a66dbccef8 Fix lint errors in MessageComposerInput.js 
Signed-off-by: Aaron Raimist <aaron@raim.ist>
 2018-10-11 22:46:55 -05:00
Aaron Raimist
1287d9c49b Fix lint errors in Notifications.js 
Signed-off-by: Aaron Raimist <aaron@raim.ist>
 2018-10-11 22:44:02 -05:00
Aaron Raimist
d452dd2b74 Fix lint error in LazyLoadingResyncDialog.js 
Signed-off-by: Aaron Raimist <aaron@raim.ist>
 2018-10-11 22:32:25 -05:00
Aaron Raimist
58488c076e Fix more lint errors 
Signed-off-by: Aaron Raimist <aaron@raim.ist>
 2018-10-11 21:54:55 -05:00
David Baker
9c8e5119ba Merge pull request #2206 from matrix-org/dbkr/slate_update_fix_quote 
Fix quote post slate update
 2018-10-11 11:09:25 +01:00
David Baker
3efc09586b More API changes 2018-10-11 10:47:36 +01:00
David Baker
4d1f2cdfa9 Fix quote post slate update 
Missed API update
 2018-10-11 10:29:55 +01:00
Bruno Windels
bba04a6820 Merge pull request #2205 from matrix-org/dbkr/lazy_load_check_before_sync 
Handle InvalidStoreError from js-sdk
 2018-10-10 18:35:36 +02:00
David Baker
655627209a unused function 2018-10-10 17:25:32 +01:00
David Baker
0abcb5c78d Handle InvalidStoreError from js-sdk 
js-sdk now emits sync state ERROR with an InvalidStoreError if the
store needs to be cleared before it can be used.

Requires https://github.com/matrix-org/matrix-js-sdk/pull/759
 2018-10-10 17:07:17 +01:00
Bruno Windels
dfb4c594a8 Merge pull request #2204 from matrix-org/bwindels/rrfallbackavatars 
Fall back to default avatar in RR when member isn't loaded yet
 2018-10-10 16:58:59 +02:00
Bruno Windels
5128386160 allow read receipts without an existing member in MessagePanel 2018-10-10 16:15:20 +02:00
Bruno Windels
0767c278e7 put userId next to member in read receipt, fall back when member missing 2018-10-10 16:14:09 +02:00
David Baker
97ed4ed0bb Merge pull request #2202 from matrix-org/dbkr/update_slate 
Update to new version of slate
 2018-10-10 11:10:20 +01:00