OpenCloud
/
riot-web
mirror of https://github.com/vector-im/riot-web
1
0
Fork 0
Code Issues Releases Wiki Activity
3,387 Commits
203 Branches
553 Tags
456 MiB
Commit Graph

3387 Commits (0f8ab99158a9565c714132c2b39b07deeab26f41)

Author SHA1 Message Date
Luke Barnard 0f8ab99158 Have COLOR_REGEX constant 2017-03-02 17:02:00 +00:00
Luke Barnard b951713f7f Remove custom attribs as consumed 2017-03-02 11:39:40 +00:00
Luke Barnard 36795fa192 Use data-mx[-bg]-color instead of stripping style 
This has the benefit of not needing a spec for custom CSS. Instead we rigourously sanitise the values for custom data attributes that are transformed to CSS equivalents. `data-mx-color` translates to CSS `color` for example.
 2017-03-02 11:36:56 +00:00
Luke Barnard 5fc828f24c Allow span, and only allow style attrib 2017-02-27 11:32:57 +00:00
Luke Barnard 886b0a3f13 Sanitise for *, fix style issues 2017-02-27 11:23:37 +00:00
Luke Barnard ae03244e6e Merge branch 'develop' into luke/feature-css-msg-colors 2017-02-09 13:14:15 +00:00
David Baker 7ba9e27893 Merge pull request #682 from matrix-org/luke/fix-typing-notif 
Fix typing notif and status bar
 2017-02-09 10:46:37 +00:00
Luke Barnard dd22e57a38 Merge pull request #681 from matrix-org/luke/rts-matrix-org 
Consider emails ending in matrix.org as a uni email
 2017-02-09 10:34:02 +00:00
Luke Barnard 103710728f Do not show "+1 other" 
Instead show a user name or avatar.
 2017-02-09 10:30:06 +00:00
Luke Barnard 553054409f Use (props,state) ordering of arguments 
There was a bug here that meant that sometimes arguments were given in the wrong order; presumably leading to the status bar not appearing for calls etc.
 2017-02-09 10:01:59 +00:00
Luke Barnard cc69e982a7 Use single state to set both avatars and typing notif 2017-02-09 10:01:51 +00:00
Luke Barnard 40658494b4 Consider emails ending in matrix.org as a uni email 
For the purposes of testing (and having a team page)
 2017-02-09 09:29:55 +00:00
Matthew Hodgson ad2710ec5d fix CSS for import/export buttons 2017-02-09 02:00:58 +00:00
Matthew Hodgson ea50acfc87 fix dark theme for uploadbar 2017-02-09 01:26:53 +00:00
Matthew Hodgson 231997dd63 unbreak /markdown off 2017-02-09 01:18:09 +00:00
Luke Barnard 449519dc32 Merge pull request #679 from matrix-org/luke/rts-email-verif-referrer 
Set referrer qp in nextLink
 2017-02-08 22:05:49 +00:00
David Baker f1288d85ba Merge pull request #678 from matrix-org/luke/rts-fix-undefined-team-token 
Do not set team_token if not returned by RTS on login
 2017-02-08 18:08:12 +00:00
Luke Barnard c2d5b72d68 Set referrer qp in nextLink 
This is so that when the verification link is clicked from an email, the referrer is set on the new instance of riot when /rts/register is hit
 2017-02-08 17:58:40 +00:00
Luke Barnard 260cb62438 Do not set team_token if not returned by RTS on login 2017-02-08 16:49:33 +00:00
David Baker fe17e2452b Merge pull request #676 from matrix-org/luke/rts-team-token-login 
Get team_token from the RTS on login
 2017-02-08 10:54:24 +00:00
Matthew Hodgson 8fea4c27cb fix NPE 2017-02-07 22:00:56 +00:00
Luke Barnard 3d30db81e0 Only init RTS if configured correctly 2017-02-07 15:24:57 +00:00
Luke Barnard 3f9f59bb73 Import RtsClient at top 2017-02-07 15:23:23 +00:00
David Baker 96539a4054 Merge pull request #666 from matrix-org/luke/rts-welcome-pages 
RTS Welcome Pages
 2017-02-07 13:42:47 +00:00
Luke Barnard d5f6ecdc49 Use teamToken, not config when doing screen fallback 2017-02-07 13:23:58 +00:00
Luke Barnard c93b6c3c34 Style, fixes 2017-02-07 13:15:40 +00:00
Luke Barnard af19ea8bb7 Document login API 2017-02-07 12:01:44 +00:00
David Baker c0d2fe19ef Merge pull request #677 from matrix-org/rav/logging_for_send_fail 
Logging to try to track down riot-web#3148
 2017-02-06 16:46:54 +00:00
Richard van der Hoff 484d9d708e Logging to try to track down riot-web#3148 
Since I can't figure out how this is happening, add a shedload of logging to
try to pin it down.
 2017-02-06 16:01:25 +00:00
Richard van der Hoff 77f76db68b UserSettings: s/vector-web/riot-web/ 
vector is dead, long live riot
 2017-02-06 09:50:14 +00:00
Richard van der Hoff 6d8dcd97af Merge branch 'master' into develop 
(Keep js-sdk on develop)
 2017-02-04 10:42:31 +00:00
Richard van der Hoff a9cd1bfd4b v0.8.6 2017-02-04 10:30:16 +00:00
Richard van der Hoff 04bbf0a26b Prepare changelog for v0.8.6 2017-02-04 10:30:15 +00:00
Richard van der Hoff 39488f294b bump to js-sdk 0.7.5 2017-02-04 10:23:56 +00:00
Richard van der Hoff 19b0f956d2 v0.8.6-rc.3 2017-02-03 15:32:37 +00:00
Richard van der Hoff aa164bf54c Prepare changelog for v0.8.6-rc.3 2017-02-03 15:32:37 +00:00
Richard van der Hoff c52ae8ff01 Bump to js-sdk 0.7.5-rc.3 2017-02-03 15:28:03 +00:00
Richard van der Hoff 1334e0ae0d Prep changelog 2017-02-03 15:27:51 +00:00
Luke Barnard 4f3549cc37 Fix: actually get the team token 2017-02-03 14:42:22 +00:00
Richard van der Hoff fd0a66ab99 Unpin js-sdk 2017-02-03 14:37:58 +00:00
Luke Barnard 173e80a5de Get team_token from the RTS on login 
Use the /login endpoint of the RTS to get the team token when the user has successfully logged in.
 2017-02-03 14:34:24 +00:00
Richard van der Hoff 827b5a6811 Fix deviceverifybuttons 
Use DeviceInfo from deviceVerificationChanged event rather than calling
non-existent getStoredDevice
 2017-02-03 14:34:19 +00:00
David Baker 41936a957f v0.8.6-rc.2 2017-02-03 13:07:11 +00:00
David Baker 08276aefa7 Prepare changelog for v0.8.6-rc.2 2017-02-03 13:07:10 +00:00
David Baker 66e22d1d26 Bump js-sdk 2017-02-03 13:04:42 +00:00
David Baker bded0a7e8e v0.8.6-rc.1 2017-02-03 12:13:42 +00:00
David Baker aa1a3db7fe Prepare changelog for v0.8.6-rc.1 2017-02-03 12:13:42 +00:00
David Baker 25876837f5 released js-sdk 2017-02-03 12:11:24 +00:00
Luke Barnard efae5f6bf1 Use localStorage team token with fall-back on query parameter 2017-02-03 11:48:24 +00:00
Richard van der Hoff 5df5fed6f5 Merge pull request #675 from matrix-org/dbkr/fix_timeline_notifs_empty 
Fix timeline & notifs panel spuriously being empty
 2017-02-03 11:35:28 +00:00