OpenCloud
/
riot-web
mirror of https://github.com/vector-im/riot-web
1
0
Fork 0
Code Issues Releases Wiki Activity
7,937 Commits
228 Branches
566 Tags
501 MiB
Commit Graph

7937 Commits (c93266b6af9ebe632452f2c8c0f3f152881bf8f2)

Author SHA1 Message Date
Richard Lewis c93266b6af Merge branch 'develop' of https://github.com/matrix-org/matrix-react-sdk into rxl881/titleBar 2017-12-11 13:08:49 +00:00
Richard Lewis c1d9df0e1f
Merge pull request #1650 from matrix-org/rxl881/customTitle 
Display custom widget content titles
 2017-12-11 12:00:38 +00:00
Richard Lewis 24db57bfb6 Fix api prefix. 2017-12-08 18:47:00 +00:00
Matthew Hodgson f2d68e4601
Merge pull request #1649 from matrix-org/rxl881/titleBar 
Add maximize / minimize apps drawer icons.
 2017-12-08 19:18:45 +01:00
David Baker bb9376098a
Merge pull request #1654 from matrix-org/dbkr/crypto_store_migrate_warning 
Warn when migrating e2e data to indexeddb
 2017-12-08 16:52:05 +00:00
David Baker ab2fcfb388 re-run the fun^w^wnpm run i18n 2017-12-08 16:36:30 +00:00
David Baker 0d38e7510d
Merge pull request #1600 from matrix-org/dbkr/udd_no_auto_show 
Don't Auto-show UnknownDeviceDialog
 2017-12-08 16:33:25 +00:00
David Baker 21f9549c78 Oops, missed some params 2017-12-08 15:33:03 +00:00
Richard Lewis a9ae4be74c Fix page title variable name. 2017-12-08 15:27:14 +00:00
David Baker 49002c87bc More doc 2017-12-08 15:19:30 +00:00
Richard Lewis 20917e1a07 Set page title from widget data, if available. 2017-12-08 15:12:48 +00:00
Richard Lewis b20667a5a8
Merge pull request #1655 from matrix-org/rxl881/cmc 
Remove logging.
 2017-12-07 15:56:10 +00:00
David Baker 8e7c4c2018
Merge pull request #1648 from matrix-org/rxl881/encWarning 
Add messaging endpoint for room encryption status.
 2017-12-07 10:00:51 +00:00
Richard Lewis df438924a7 Remove logging. 2017-12-07 09:57:53 +00:00
Luke Barnard 4603d593de
Merge pull request #1588 from pvagner/develop 
Add some missing translatable strings
 2017-12-07 09:41:39 +00:00
Richard Lewis ed675fe791 Allow bypass of widget loading screen on hide / show. 2017-12-06 22:54:32 +00:00
David Baker d6688d8f12 Add jsdoc 2017-12-06 19:11:50 +00:00
David Baker 2a01985076 better proptypes 2017-12-06 19:07:12 +00:00
David Baker 0deed4bb88 null guard 2017-12-06 19:05:25 +00:00
David Baker 1a3671d241 remove stray param 2017-12-06 19:04:29 +00:00
David Baker 5bca5a7a8e More underscore 2017-12-06 19:02:26 +00:00
David Baker aa99b898ce Add that it might not work now either 
also a comma
 2017-12-06 18:57:48 +00:00
Richard Lewis e20db416f2 Add field to bypass riot widget loading screen. 2017-12-06 16:44:41 +00:00
David Baker 4462694438 lint 2017-12-06 16:06:33 +00:00
David Baker 65c210cdde Warn when migrating e2e data to indexeddb 2017-12-06 15:28:20 +00:00
Peter Vágner 802abe7091 Merge branch 'develop' of https://github.com/matrix-org/matrix-react-sdk into develop 2017-12-06 11:07:01 +01:00
Richard Lewis 3206527d73 Remove logging. 2017-12-05 21:59:44 +00:00
Richard Lewis d62520482a fix typo. 2017-12-05 21:57:28 +00:00
Richard Lewis fc3287c49f Fix error message. 2017-12-05 21:56:35 +00:00
Richard Lewis 7f86ed35a3 Only show custom title if different from app name. 2017-12-05 21:49:11 +00:00
Richard Lewis 1415a83a61 Merge branch 'rxl881/titleBar' of https://github.com/matrix-org/matrix-react-sdk into rxl881/customTitle 2017-12-05 21:42:47 +00:00
Richard Lewis d5d5397959 Set custom widget title. 2017-12-05 21:41:44 +00:00
Richard Lewis 9fd8deb16d Add maximize / minimize apps drawer icons. 2017-12-05 18:18:51 +00:00
Richard Lewis 9eb334a1d4
Merge pull request #1640 from matrix-org/rxl881/widgetTitle 
Add widget -> riot postMessage API
 2017-12-05 12:02:57 +00:00
David Baker 130c056ed9
Merge pull request #1646 from matrix-org/dbkr/nullchecks4u 
Add some null checks
 2017-12-05 11:59:24 +00:00
Richard Lewis 597a71fa9d Add messaging endpoint for room encryption status. 2017-12-05 11:59:02 +00:00
David Baker 87c808a088 semicolon 2017-12-05 11:53:49 +00:00
David Baker fec2e31b41 oops, actual null check 2017-12-05 11:38:25 +00:00
David Baker c23a3fd7fe Add some null checks 2017-12-05 11:14:55 +00:00
Richard Lewis ac36f93c3f Remove logging. 2017-12-05 11:00:38 +00:00
Richard Lewis 59f9e388d4 Remove logging. 2017-12-05 00:11:01 +00:00
Richard Lewis 49a2985515 Register message endpoints. 
Store endpoint origins only.
 2017-12-05 00:08:17 +00:00
Richard Lewis 8595053d28 Update API data docs. 2017-12-04 18:06:05 +00:00
Richard Lewis df1fa80ff6 Use global object for listener count and messaging endpoints. 2017-12-04 17:54:00 +00:00
Luke Barnard 4f58b92a14 Merge branch 'master' into develop 2017-12-04 12:24:56 +00:00
Luke Barnard 1a283f90f5 v0.11.3 2017-12-04 12:24:21 +00:00
Luke Barnard d2cb46159b Prepare changelog for v0.11.3 2017-12-04 12:24:21 +00:00
Luke Barnard 50e227f5c0 Bump js-sdk dep. to 0.9.2 2017-12-04 12:15:19 +00:00
Luke Barnard aee04e41a6 Bump js-sdk dep. to 0.9.2 2017-12-04 11:59:01 +00:00
Richard Lewis dd7358cbb4 Use strict equality. 2017-12-01 16:39:07 +00:00