Skip to content

Commit eaeac12

Browse files
t3chguyt3chguy
committed
Merge branch 'develop' of github.com:vector-im/riot-web into forward_message
2 parents 7777be8 + b886215 commit eaeac12

311 files changed

Lines changed: 674 additions & 720 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎.gitignore‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@
55
/key.pem
66
/lib
77
/node_modules
8+
/electron/node_modules
89
/packages/
910
/webapp
1011
/.npmrc
@@ -14,3 +15,4 @@ electron/dist
1415
electron/pub
1516
/.idea
1617
/config.json
18+
/src/component-index.js

‎.modernizr.json‎

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,8 @@
99
"test/css/flexbox",
1010
"test/es5/specification",
1111
"test/css/objectfit",
12-
"test/storage/localstorage"
12+
"test/storage/localstorage",
13+
"test/workers/webworkers",
14+
"test/indexeddb"
1315
]
14-
}
16+
}

‎CHANGELOG.md‎

Lines changed: 21 additions & 0 deletions

‎README.md‎

Lines changed: 1 addition & 1 deletion

‎config.sample.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
"brand": "Riot",
55
"integrations_ui_url": "https://scalar.vector.im/",
66
"integrations_rest_url": "https://scalar.vector.im/api",
7-
"bug_report_endpoint_url": "https://vector.im/bugs",
7+
"bug_report_endpoint_url": "https://riot.im/bugreports/submit",
88
"enableLabs": true,
99
"roomDirectory": {
1010
"servers": [

‎electron/img/riot.ico‎

-21.1 KB
Binary file not shown.

‎electron/img/riot.png‎

-14.3 KB
Binary file not shown.

‎electron/riot.im/config.json‎

Lines changed: 0 additions & 73 deletions
This file was deleted.

electron/build/icon.icns renamed to electron_app/build/icon.icns

File renamed without changes.

electron/build/icon.ico renamed to electron_app/build/icon.ico

File renamed without changes.

0 commit comments

Comments
 (0)