David Baker
6f65128928
Disable edit button again
...
until we have an API to edit group profile info
2017-07-17 17:18:46 +01:00
David Baker
1cd79fc918
Rename group settings to 'Edit Group'
2017-07-17 17:17:18 +01:00
Luke Barnard
29757fcf11
Merge branch 'luke/feature-matrixto-timeline-pills' into pills
2017-07-17 16:43:46 +01:00
Luke Barnard
897ff05d87
Implement composer completion user/room pill insertion
...
This modifies the composer completion such that completing a room or user will insert an IMMUTABLE matrix.to LINK Entity for the range that was replaced. Display names will not have a colon after their name anymore as it seemed strange that we would insert one after a pill.
2017-07-17 15:53:29 +01:00
Luke Barnard
0e71ea7a5a
Make some adjustments to mx_UserPill and mx_RoomPill
...
So that they can appear correctly in the body of a text message.
2017-07-17 14:52:08 +01:00
Luke Barnard
b1e3dc406c
Decorate matrix.to anchor tags as mx_UserPill and mx_RoomPill
...
Requires https://github.com/vector-im/riot-web/pull/4597 to look OK
2017-07-17 14:50:45 +01:00
David Baker
a32113ad97
Add onChange handlers & tabIndexes
2017-07-17 14:40:38 +01:00
Luke Barnard
31290f3377
Remove redundant, unused decorators from RTE
...
These have since been replaced by decorators that operator whether in MD mode or otherwise. This might not be optimal because LINK entities do not appear in MD mode at all at the moment, but instead you see the ()[] md notation version.
2017-07-17 14:27:50 +01:00
Lauris Mierkalns
57be0cf23d
Added translation using Weblate (Latvian)
2017-07-17 03:12:22 +00:00
František Šindelář
faa9fa8db9
Added translation using Weblate (Czech)
2017-07-15 13:26:27 +00:00
Richard Lewis
6aa0f68ee9
Show beta testing icon and help message for widgets tile.
2017-07-14 23:31:57 +01:00
Richard Lewis
f272961fbd
Styling for beta testing icon.
2017-07-14 23:30:47 +01:00
Weblate
ac0d29dc06
Merge remote-tracking branch 'origin/develop' into develop
2017-07-14 17:04:10 +00:00
Luke Barnard
cb4f57eb4a
Merge pull request #4583 from vector-im/luke/feature-rte-pills
...
CSS for decorated matrix.to links in the composer
2017-07-14 18:04:05 +01:00
Luke Barnard
a1b4b9992e
Use $accent-fg-color instead of #fff
2017-07-14 17:59:53 +01:00
Luke Barnard
18a6ee5a52
white -> #fff
2017-07-14 17:52:11 +01:00
Luke Barnard
de0fd588b6
Add $rte-room-pill-color: #aaa
2017-07-14 17:51:25 +01:00
Luke Barnard
ee5117525c
Merge pull request #1225 from matrix-org/luke/feature-rte-pills
...
Decorate http://matrix.to links in the composer as pills
2017-07-14 17:47:16 +01:00
David Baker
54f44af494
Make editing prettier
2017-07-14 17:23:44 +01:00
Luke Barnard
38899c6011
CSS for decorated matrix.to links in the composer
2017-07-14 17:23:16 +01:00
David Baker
f6f80bf9ce
Remove now unused 'edit' block
...
And add some css classes
2017-07-14 17:22:17 +01:00
David Baker
3aed1a6293
Merge pull request #1224 from matrix-org/rav/upload_progress
...
Fix file uploading
2017-07-14 17:18:48 +01:00
Luke Barnard
434660166c
Decorate http://matrix.to links in the composer as pills
...
Any links in the composer that are recognised as matrix.to links will be decorated as `<span>`s with CSS classes (one of mx_UserPill or mx_RoomPill). This implementation has the nice bonus that switching to markdown (and back) will Just Work.
This will have some CSS changes coming to better match the design.
2017-07-14 17:04:28 +01:00
Richard van der Hoff
ad085a6273
Fix file uploading
...
File uploading no longer supports the .progress API; we now need to pass a
callback to get updates on the upload.
2017-07-14 17:01:03 +01:00
Weblate
dd77147313
Merge remote-tracking branch 'origin/develop' into develop
2017-07-14 15:43:17 +00:00
David Baker
1690f875ca
Merge pull request #4579 from vector-im/rav/wait_longer_for_client
...
Deflake the joining test
2017-07-14 16:43:13 +01:00
Richard van der Hoff
66ddf25977
Deflake the joining test
...
Just give the client longer to get started (it seems to be taking a long time
to get started talking to indexeddb)
2017-07-14 16:14:42 +01:00
Weblate
c24b04d19b
Merge remote-tracking branch 'origin/develop' into develop
2017-07-14 14:43:00 +00:00
Richard van der Hoff
0c31c62a62
build fix: bump to mock-request 1.1
...
This should have happened with 32ef273f
2017-07-14 15:41:13 +01:00
David Baker
8c9afc2dfd
Make GroupView more consistent with RoomView
2017-07-14 15:39:46 +01:00
Weblate
bd06a1c393
Merge remote-tracking branch 'origin/develop' into develop
2017-07-14 14:05:12 +00:00
Kegsay
40a47f8c7a
Allow Riot to load up different configs depending on the domain ( #4575 )
...
Initially try to load `config.$domain.json` and only if that fails, load
`config.json`. Configs are not muxxed in any way, it either entirely uses
the domain config, or entirely uses `config.json`.
2017-07-14 15:05:07 +01:00
Weblate
8516c9d5b5
Merge remote-tracking branch 'origin/develop' into develop
2017-07-14 13:55:25 +00:00
David Baker
caa5751d50
Merge pull request #4577 from vector-im/rav/bump_react_versions
...
Bump react to 15.6 to fix build problems
2017-07-14 14:55:21 +01:00
Richard van der Hoff
2a52c902e2
Merge pull request #1223 from matrix-org/rav/roomsettings_promise_usage
...
Fix RoomSettings save
2017-07-14 14:47:14 +01:00
Richard van der Hoff
01d954e4ab
Bump react to 15.6 to fix build problems
...
matrix-react-test-tools requires react 15.6 or later, so make sure we require
it in riot-web too.
2017-07-14 14:45:44 +01:00
Richard van der Hoff
9df1fb91ff
Fix RoomSettings save
...
Looks like saving RoomSettings had been broken since 0d7cc59
2017-07-14 14:24:42 +01:00
Tong Hui
f6f461c571
Translated using Weblate (Chinese (Simplified))
...
Currently translated at 100.0% (207 of 207 strings)
Translation: Riot Web/riot-web
Translate-URL: https://translate.riot.im/projects/riot-web/riot-web/zh_Hans/
2017-07-14 12:22:30 +00:00
Brendan Abolivier
e1e7492f17
Translated using Weblate (French)
...
Currently translated at 100.0% (207 of 207 strings)
Translation: Riot Web/riot-web
Translate-URL: https://translate.riot.im/projects/riot-web/riot-web/fr/
2017-07-14 12:15:20 +00:00
Kegsay
5274cf59a0
Hook up the edit widget button ( #1218 )
...
* Hook up the edit widget button
* Review comments
2017-07-14 11:17:59 +01:00
Luke Barnard
1db2431c9f
Merge pull request #1222 from matrix-org/luke/fix-rte-allow-split-code-block
...
Add code-block to the list of blocks where hitting return will split-…
2017-07-14 09:48:47 +01:00
Weblate
ea85a3c3d9
Merge remote-tracking branch 'origin/develop' into develop
2017-07-13 17:46:57 +00:00
Richard Lewis
c0830b48d0
Merge pull request #4567 from vector-im/rxl881/widgetButtons
...
Improve AppTile menu bar button styling.
2017-07-13 18:46:53 +01:00
Luke Barnard
219c00bbc3
Add code-block to the list of blocks where hitting return will split-block
...
Hitting return in a code-block will now split the block into two code blocks. (Holding shift will still insert a soft newline into the current block).
We still need to make it a bit more obvious that consecutive code-blocks
are not contiguous - https://github.com/vector-im/riot-web/issues/4535
2017-07-13 18:42:37 +01:00
David Baker
e60bf48134
CSS for start of group edit support
2017-07-13 18:42:14 +01:00
David Baker
381f685013
Start on editing groups
2017-07-13 18:41:51 +01:00
Luke Barnard
7945abe6b9
Merge pull request #1219 from matrix-org/luke/fix-autcompleter-promises
...
Fix Autocompleter promises
2017-07-13 18:11:45 +01:00
Luke Barnard
33df4fafaa
Merge pull request #1221 from matrix-org/luke/feature-rte-autoemoji
...
Implement disabled-by-default setting for auto-replacement of plainte…
2017-07-13 17:51:34 +01:00
Luke Barnard
dcc4db53f9
Async functions now return bluebird promises, remove redundant Promise.resolve
2017-07-13 17:51:14 +01:00
Luke Barnard
c47398e7fe
Merge branch 'develop' into luke/fix-autcompleter-promises
2017-07-13 17:48:10 +01:00
