PrivateCoffee/element-web
4
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 3
11074 commits 1 branch 0 tags 338 MiB
Commit graph

11074 commits

This branch
This branch
All branches
Author SHA1 Message Date
David Baker
7d690d98e3 Rename variable as it's now not just MAU 2018-08-16 10:35:27 +01:00
David Baker
9bde468e30 Shift to M_RESOURCE_LIMIT_EXCEEDED errors 
With support for admin_contact and limit_type fields

For https://github.com/vector-im/riot-web/issues/7091
 2018-08-15 17:03:54 +01:00
Bruno Windels
4c69c8d0f1
Merge pull request #2117 from matrix-org/dbkr/show_room_version 
Show room version number in room settings
 2018-08-15 08:55:38 +02:00
David Baker
c736ae7efb Copyright 2018-08-14 16:53:34 +01:00
David Baker
f20920718a Show room version number in room settings 
Also change wording of the Room ID bit to match

Requires https://github.com/matrix-org/matrix-js-sdk/pull/689
For https://github.com/vector-im/riot-web/issues/7164
 2018-08-14 14:28:30 +01:00
David Baker
d58dc23f7c
Merge pull request #2114 from matrix-org/dbkr/mau_warning_bar 
Warning bar for MAU limit hit
 2018-08-13 15:37:56 +01:00
David Baker
f7f62ba09d Lint 2018-08-13 14:04:08 +01:00
David Baker
d84ecbe97c s/m.server_notices/m.server_notice/ 2018-08-13 13:53:38 +01:00
David Baker
05bf200a72 Don't crash if scrollbars updated before init 
The initialisation here is done on a timer to allow the DOM
elements to be in place before it's run, so it's possible for an
update to happen ebfore the initialisation. Stop & bail out if
there is no this.stickies.
 2018-08-13 13:49:22 +01:00
David Baker
16b7763c0e s/limit/limit_type/ 2018-08-07 17:22:12 +01:00
David Baker
6593ee09d1 Warning bar for MAU limit hit 
Somewhat untested, sorry
 2018-08-07 17:04:37 +01:00
David Baker
f44cc8e66e
Merge pull request #2112 from matrix-org/dbkr/recognise_server_notices_room 
Recognise server notices room(s)
 2018-08-07 09:52:25 +01:00
David Baker
879cf24a50
Merge pull request #2111 from matrix-org/dbkr/room_tags_spec_update 
Update room tags behaviour to match spec more
 2018-08-07 09:52:01 +01:00
Bruno Windels
07083e61b7
Merge pull request #2058 from matrix-org/t3chguy/hide_logout_warning_whilst_logging_out 
while logging out ignore `Session.logged_out` as it is intentional
 2018-08-07 10:31:29 +02:00
David Baker
b5ce1ac5e1 Recognise server notices room(s) 
and put them in their own section at the bottom
 2018-08-06 18:00:40 +01:00
David Baker
b2302af708 Update room tags behaviour to match spec more 
Fix Riot's behaviour with room tags after my cleanup in
https://github.com/matrix-org/matrix-doc/pull/1457 . Although, reading
it again, it's not clear how you're supposed to tell the difference
between a reverse-dns tag name and a legacy freeform text tag
(contains a '.'?) - I've left it detecting these as freeform text
for now.
 2018-08-06 16:58:54 +01:00
Bruno Windels
eb47abc055
Merge pull request #2110 from matrix-org/dbkr/no_connection_lost_on_mau_bar 
Don't show 'connection lost' bar on MAU error
 2018-08-06 16:15:50 +02:00
David Baker
ccdb5fa770 Don't show 'connection lost' bar on MAU error 
We don't need both warning bars

Requires https://github.com/matrix-org/matrix-js-sdk/pull/680
 2018-08-03 18:02:09 +01:00
Bruno Windels
4c6d5f50e9
Merge pull request #2108 from matrix-org/dbkr/chairman_mau_pt_3_sync_error 
Support MAU error on sync
 2018-08-03 18:01:28 +02:00
David Baker
cd18744101 unused import 2018-08-03 16:10:50 +01:00
David Baker
9a2155f1ad Oops, add file to right branch 2018-08-03 16:03:27 +01:00
David Baker
c36779fc15 d'oh, didn't mean to push this to develop 2018-08-03 16:02:51 +01:00
David Baker
0c8943cdc0 Oops, add the file 2018-08-03 16:01:22 +01:00
David Baker
b5d2fa769c Support MAU error on sync 
For https://github.com/vector-im/riot-web/issues/7091
 2018-08-03 14:54:52 +01:00
David Baker
bc1d359398
Merge pull request #2106 from matrix-org/dbkr/chairman_mau_pt_2_message_send 
Support active user limit on message send
 2018-08-03 13:14:18 +01:00
David Baker
b322f0b291
Merge pull request #2091 from matrix-org/bwindels/e2e-tests-ci-script 
Run end to end tests as part of Travis build
 2018-08-03 11:42:28 +01:00
Bruno Windels
e2695fb467 now the ci scripts are merged in the test repo, change the branch to fetch them from to master 2018-08-03 11:43:12 +02:00
David Baker
86c5fac030
Merge pull request #2097 from matrix-org/dbkr/remove_package_lock 
Remove package-lock.json for now
 2018-08-03 09:14:24 +01:00
Bruno Windels
74ee7069e2
Merge pull request #2103 from matrix-org/dbkr/chairman_mau_pt_1_login 
Support montly active user limit error on /login
 2018-08-03 09:32:08 +02:00
David Baker
d25fc9d9fb Revert 3f0c948387 
...as hopefully this should work now sanitize-html is fixed?
 2018-08-02 19:37:27 +01:00
David Baker
02019a58b3 Support active user limit on message send 
For https://github.com/vector-im/riot-web/issues/7091
 2018-08-02 17:09:04 +01:00
Bruno Windels
2b5c8282d0
Merge pull request #2105 from matrix-org/dbkr/unpin_sanitize_html 
Unpin sanitize-html
 2018-08-02 17:52:15 +02:00
David Baker
d25ed88b0d Unpin sanitize-html 
1.18.4 is now out which makes it work with webpack again
 2018-08-02 16:20:55 +01:00
David Baker
bb9a3eb33d Support MAU limit error on register too 2018-08-02 16:09:57 +01:00
David Baker
cc58b06226 Support montly active user limit error on /login 
The 'contact your service administrator' should be a link but we
don't have this info from the HS yet.
 2018-08-02 14:25:17 +01:00
Bruno Windels
d1dcd0f374
Merge pull request #2101 from matrix-org/dbkr/pin_sanitize_html 
Pin sanitize-html to 0.18.2
 2018-08-02 12:05:37 +02:00
David Baker
4575710c84 Pin sanitize-html to 0.18.2 
Because 0.18.3 is broken (https://github.com/punkave/sanitize-html/issues/241
 / https://github.com/punkave/sanitize-html/issues/242
 2018-08-02 10:59:26 +01:00
Bruno Windels
3f0c948387 try logging the stack to see where the TypeError on travis occurs exactly 2018-08-01 18:46:40 +02:00
David Baker
de43cc920d Add package-lock to gitignore 2018-08-01 15:07:17 +01:00
David Baker
f0d135d76e Remove package-lock.json for now 
As per https://github.com/vector-im/riot-web/issues/7083

The package-lock file is currently not bringing any of the benefits
it's supposed to bring because we don't do the neccessary things to
massage it during the release process. Remove it until we actually
manage it correctly.
 2018-07-31 11:02:14 +01:00
Bruno Windels
6f60b68ac7 Puppeteer does need it's own chrome after all 
The stable chrome travis provides is not supported.
 2018-07-31 11:00:44 +02:00
Bruno Windels
93f51eb6ce force running scripts in bash, as it's not the default shell on Ubuntu (which is what Travis runs) 2018-07-31 11:00:44 +02:00
Bruno Windels
70f8ee0e87 install synapse prerequisites as part of build 2018-07-31 11:00:44 +02:00
Bruno Windels
e08e09df9a pass location of google-chrome-stable to e2e test runner 2018-07-31 11:00:44 +02:00
Bruno Windels
0ee72a2972 disable tests for now to speed up trying stuff out, run the build as well 2018-07-31 11:00:44 +02:00
Bruno Windels
fd5193b9f4 try to run e2e tests in travis 2018-07-31 10:39:30 +02:00
David Baker
2f13615dd1 Merge branch 'master' into develop 2018-07-30 12:09:07 +01:00
David Baker
3c8fc5a8af v0.13.0 2018-07-30 11:57:53 +01:00
David Baker
1ebcd0f0ec Prepare changelog for v0.13.0 2018-07-30 11:53:15 +01:00
David Baker
2df3580c60 Released js-sdk 2018-07-30 11:46:28 +01:00