gaja-group
/
element-web
forked from matrix/element-web
2
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity
2,249 Commits 964 Branches 0 Tags 74 MiB
Commit Graph

2249 Commits

Author SHA1 Message Date
David Baker f6aa9a7ea4 Make the config optional 
Accept 404 errors from getting the config and start MatrixChat with no config, make other errors display a simple error message to prevent a completely blank page if the config does fail to load.
 2016-06-08 18:46:21 +01:00
David Baker b3ae9cc9d4 Merge pull request #1609 from vector-im/dbkr/SdkConfig 
Don't use SdkConfig
 2016-06-08 17:34:18 +01:00
Richard van der Hoff 5f29729e82 Make unverified encrypted events red and verified ones green 2016-06-08 17:03:54 +01:00
Richard van der Hoff e24851456a CSS for the MemberDeviceInfo view 2016-06-08 17:03:28 +01:00
David Baker 1e40fd750f Don't use SdkConfig 
instead take brand from a prop
 2016-06-08 14:55:47 +01:00
Richard van der Hoff ed1554f4af index.js: fix wording in android popup 2016-06-07 22:01:56 +01:00
David Baker c6cf5febd5 Merge pull request #1516 from vith/static-config-json 
serve config.json statically instead of bundling it
 2016-06-06 19:15:35 +01:00
David Baker f9aaf7d903 Use the SdkConfig interface 
rather than pulling in config.json directly.

json-loader appears to still be necessary due to some horrendous json dependency in the depths of sanitize-html.
 2016-06-06 19:13:30 +01:00
Matthew Hodgson a2e73cceee Merge branch 'develop' into matthew/scalar 2016-06-06 10:24:39 +01:00
Matthew Hodgson c672919d1e 0.7.3 2016-06-03 12:20:05 +01:00
Matthew Hodgson 7ab2449ac1 Prepare changelog for v0.7.3 2016-06-03 12:20:04 +01:00
Matthew Hodgson e68a2b5e1d pin to react sdk 0.6.3 for release 2016-06-03 12:19:04 +01:00
Matthew Hodgson ddc4ac187c dep on react-sdk develop 2016-06-02 23:32:47 +01:00
Matthew Hodgson ded66bbdfc 0.7.2 2016-06-02 19:05:50 +01:00
Matthew Hodgson 1a11c402fa Prepare changelog for v0.7.2 2016-06-02 19:05:50 +01:00
Matthew Hodgson 4ec77eeca7 correctly bump dep on js-sdk and react-sdk 2016-06-02 19:04:22 +01:00
Matthew Hodgson 635fd927cd 0.7.1 2016-06-02 18:41:20 +01:00
Matthew Hodgson 481a7b160d Prepare changelog for v0.7.1 2016-06-02 18:41:20 +01:00
David Baker cadedd2919 Revert presumably accidentally comitted config.json 2016-06-02 14:24:36 +01:00
Richard van der Hoff e0bf23fa7c 0.7.0 2016-06-02 13:42:25 +01:00
Richard van der Hoff a53acb3b58 Prepare changelog for v0.7.0 2016-06-02 13:42:24 +01:00
Richard van der Hoff f6ec858ac9 Bump js-sdk and react-sdk for new releases 
js-sdk 0.5.3
react-sdk 0.6.0
 2016-06-02 13:40:15 +01:00
Matthew Hodgson d976046e6a set email branding whenever emails are added from vector 2016-06-02 13:15:13 +01:00
Matthew Hodgson 1902b631c7 add default branding parameter for email notifs 2016-06-02 11:45:23 +01:00
Matthew Hodgson dda2129354 Merge pull request #1557 from aviraldg/feature-style-selection 
Style selection color.
 2016-05-28 16:30:53 +01:00
Aviral Dasgupta 12157edd62 Style selection color 2016-05-28 12:20:21 +05:30
Aviral Dasgupta 7e563b89c7 initial version of rich text editor 2016-05-27 10:17:01 +05:30
Jason Papakostas 6a6118e136 serve config.json statically instead of bundling it 
issue #1344
 2016-05-24 19:08:09 -05:00
Matthew Hodgson bede9a814b remove spurious top border; fix #1472 2016-05-24 00:30:36 +01:00
Matthew Hodgson d70842c3c7 fix padding of badges 2016-05-24 00:29:48 +01:00
Matthew Hodgson a288c5b85d fix padding of badges 2016-05-20 12:21:45 +01:00
Matthew Hodgson c4d408d095 CSS for IntegrationsManager 2016-05-18 17:02:39 +01:00
Matthew Hodgson ac24d6707f Add integs mgt 2016-05-18 15:02:03 +01:00
Matthew Hodgson e5835d2731 typo 2016-05-18 15:01:36 +01:00
Matthew Hodgson d8c32db14b typos 2016-05-17 20:24:01 +01:00
Matthew Hodgson 2b3606d44d switch to lozenges, and improve overlap behaviour 2016-05-17 19:52:56 +01:00
Matthew Hodgson 5feb31911a better collapsed look & feel 2016-05-17 11:19:04 +01:00
Matthew Hodgson 9483e42508 switch from dots to per-room badges 2016-05-17 11:14:30 +01:00
Matthew Hodgson e640f65640 add close button to room search filter 2016-05-16 23:36:52 +01:00
Matthew Hodgson 8a9c85c97d fix wording 2016-05-16 23:00:17 +01:00
David Baker bbae809012 Merge pull request #1518 from vector-im/kegan/threepids-npe 
Fix NPE when loading the Settings page which infini-spinnered
 2016-05-16 16:09:43 +01:00
Kegan Dougal bc166f19b7 Fix NPE when loading the Settings page which infini-spinnered 2016-05-16 16:04:06 +01:00
Matthew Hodgson 8fb521c83c 302 android to play store 2016-05-13 17:14:01 +01:00
Matthew Hodgson d9077584cd Merge branch 'dbkr/email_notifs' into develop 2016-05-13 15:16:35 +01:00
Matthew Hodgson 8467d5d760 302 to iTunes if you don't have the app installed 2016-05-11 01:48:02 +02:00
David Baker d96e5a55e1 Merge branch 'develop' of github.com:vector-im/vector-web into develop 2016-05-10 17:36:02 +02:00
David Baker 4f64f70a12 Use react-sdk develop as email notifs needs it 2016-05-10 17:35:35 +02:00
Matthew Hodgson 9cd8f7c7f3 Merge pull request #1469 from vector-im/dbkr/email_notifs 
Add option to enable email notifications
 2016-05-10 16:39:50 +02:00
Matthew Hodgson c64f71a3cb refine memberlist cosmetics 2016-05-05 00:35:47 +01:00
Matthew Hodgson af9838408b s/devices/notification targets/ 2016-05-04 11:58:37 +01:00