Commit Graph

62585 Commits

Author SHA1 Message Date
Luke Barnard
0c253e2437 Merge pull request #4643 from vector-im/luke/fix-room-tile-dnd
Use `catch` instead of `fail` to handle room tag error
2017-07-19 14:27:37 +01:00
Luke Barnard
53ae42ed68 Use catch instead of fail to handle room tag error
Because bluebird doesn't support fail
2017-07-19 14:11:22 +01:00
Luke Barnard
871c9e6d3e Add bing mention pill CSS
Useful with https://github.com/matrix-org/matrix-react-sdk/pull/1234
2017-07-19 11:02:51 +01:00
Luke Barnard
b131637a11 Add mx_UserPill_me class to user pills that match credentials.userId 2017-07-19 11:00:26 +01:00
Luke Barnard
ccc30fb52e Apply CSS to <pre> tags to distinguish them from each other 2017-07-19 09:25:53 +01:00
Richard van der Hoff
4998d1b359 Prepare for asynchronous e2e APIs
the js-sdk is making some of its APIs asynchronous, and adding an `initCrypto`
method which you have to call.

Particular methods we need to worry about are:

* `getStoredDevice`
* `getStoredDevicesForUser`
* `getEventSenderDeviceInfo`
* `isEventSenderVerified`
2017-07-18 23:47:36 +01:00
Luke Barnard
98ca937fef Interpret backspace at start of style block as block style toggle
Part of fixing https://github.com/vector-im/riot-web/issues/4580
2017-07-18 17:52:04 +01:00
Weblate
745b803d28 Merge remote-tracking branch 'origin/develop' into develop 2017-07-18 16:45:25 +00:00
Matthew Hodgson
bd693768cc deliberately de-theme pre tags 2017-07-18 17:45:17 +01:00
Luke Barnard
b185f43d3d Use _uniq instead of _sortedUniq for return unique matched results
_sortedUniq claims to be like _uniq but optimised for sorted arrays - https://lodash.com/docs/4.17.4#sortedUniqBy. But in practice this isn't quite true, so stick with the unoptimised version.
2017-07-18 16:23:54 +01:00
Weblate
6e1c40ea0f Merge remote-tracking branch 'origin/develop' into develop 2017-07-18 14:50:34 +00:00
Matthew Hodgson
b45108d80d ooooops, fix dark theme code blocks correctly 2017-07-18 15:50:28 +01:00
Weblate
ec68c54644 Merge remote-tracking branch 'origin/develop' into develop 2017-07-18 14:33:48 +00:00
erciccione
4e5e5dd6b3 Translated using Weblate (Italian)
Currently translated at 96.1% (199 of 207 strings)

Translation: Riot Web/riot-web
Translate-URL: https://translate.riot.im/projects/riot-web/riot-web/it/
2017-07-18 14:33:48 +00:00
Matthew Hodgson
e7ba618bbe fix text in code blocks on dark theme 2017-07-18 15:33:41 +01:00
David Baker
8a818d250f Merge remote-tracking branch 'origin/develop' into dbkr/groupview_edit 2017-07-18 11:34:48 +01:00
David Baker
b9dfaf777e Merge pull request #1230 from matrix-org/dbkr/fix_multi_invite
Fix inviting multiple people to a room
2017-07-18 11:34:33 +01:00
David Baker
7cfef04c1f Remove other promise notify 2017-07-18 11:27:21 +01:00
David Baker
fc470cd20d Merge remote-tracking branch 'origin/develop' into dbkr/groupview_edit 2017-07-18 11:14:27 +01:00
David Baker
b261c89a63 Fix inviting multiple people to a room
Removes the promise notify as bluebird doesn't support it. It's
also not used anywhere now.

Fixes https://github.com/vector-im/riot-web/issues/4614
2017-07-18 11:11:42 +01:00
Alexey Murz Korepov
c6bc20cd2a Fix menu on change keyboard language issue #4345
Fix activating menu when changing keyboard language / layout  via Alt-Shift, Alt-Ctrl, Alt-CapsLock, and Alt-Space
2017-07-18 09:23:32 +03:00
Luke Barnard
d207ee5244 Expand groups into variables with readable names 2017-07-17 19:31:36 +01:00
David Baker
cd418a5525 Retest 2017-07-17 18:16:50 +01:00
David Baker
859239f881 Lint / comment out line correctly 2017-07-17 18:13:20 +01:00
David Baker
7041106bf2 Merge remote-tracking branch 'origin/develop' into dbkr/groupview_edit 2017-07-17 17:23:02 +01:00
David Baker
65b9086f18 Add group header button css 2017-07-17 17:20:11 +01:00
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