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

1696 commits

This branch
This branch
All branches
Author SHA1 Message Date
David Baker
4bc4292ceb Rooms may not have aliases 2016-06-23 11:12:25 +01:00
David Baker
cbb72c2f29 Merge pull request #1685 from vector-im/dbkr/fix_room_directory 
Fix joining rooms by typing the alias
 2016-06-23 10:21:03 +01:00
David Baker
5f477b313b Unused variable 2016-06-23 10:20:11 +01:00
David Baker
d45e44d01c Fix joining rooms by typing the alias 
Fixes regression introduced by https://github.com/vector-im/vector-web/pull/1680
 2016-06-23 10:11:46 +01:00
Richard van der Hoff
c12839dc7b Merge pull request #1680 from vector-im/dbkr/delete_alias 
Add ability to delete an alias from room directory
 2016-06-22 17:25:27 +01:00
David Baker
c35c9f7c3a PR feedback 2016-06-22 16:20:06 +01:00
David Baker
ff5c7072d7 Mark the room as private (unlisted) too 
Also clean up RoomDirectory a bit and just pass the room object around rather than the name / alias, so now we don't have to look up the room by ID again.
 2016-06-22 14:52:55 +01:00
Matthew Hodgson
eca453ee5a reposition Login spinner 2016-06-21 19:49:55 +01:00
David Baker
ad2541299f Add ability to delete an alias from room directory 
Hidden behind shift-click for now, but we're going to need to do this a lot to moderate the public room list.
 2016-06-21 16:47:40 +01:00
David Baker
9556795611 Merge pull request #1678 from vector-im/rav/olmify_develop_again 
package.json: add olm as optionalDependency
 2016-06-20 15:28:06 +01:00
Richard van der Hoff
4c6fa740f3 package.json: add olm as optionalDependency 
Add olm as an optionalDependency to vector, so that the webpack config can find
it and include it in the bundle.
 2016-06-20 15:10:19 +01:00
David Baker
f4a3e9a39b Merge pull request #1675 from vector-im/rav/olmify_develop 
Another go at enabling olm on vector.im/develop
 2016-06-20 14:38:00 +01:00
Richard van der Hoff
bb820bebd1 README: fix some lies 
Take out a few misleading things from the readme.
 2016-06-20 14:36:40 +01:00
Richard van der Hoff
664f809362 webpack: Use require to look for olm 
Since https://github.com/matrix-org/matrix-js-sdk/pull/141, the jenkins build
does pull in the olm module, but because it's using npm v2, buries it deep in
node_modules. Rather than using the `fs` module to hunt for it, just try to
`require` it in the webpack config.
 2016-06-20 14:35:33 +01:00
Matthew Hodgson
654429dbdb improve wording on 'search room names' 2016-06-18 21:12:32 +01:00
David Baker
607923b58f Fix test since we peek by room ID, not alias 2016-06-17 17:49:36 +01:00
David Baker
895fb63d5d Merge pull request #1661 from vector-im/rav/unverify_device 
CSS for unverify button
 2016-06-17 17:00:26 +01:00
David Baker
b172018d08 Merge pull request #1660 from vector-im/rav/crypto_css_fix 
CSS fix for rooms with crypto enabled
 2016-06-17 16:58:47 +01:00
Richard van der Hoff
95a0bc92d6 CSS for unverify button 
(supports change in react-sdk)
 2016-06-17 16:25:39 +01:00
Matthew Hodgson
a90492e393 fix CSS 2016-06-17 16:14:14 +01:00
David Baker
42b7410a5d Merge pull request #1652 from vector-im/rav/fix_karma_olm_warning 
Karma: fix warning by ignoring olm
 2016-06-16 11:16:00 +01:00
Richard van der Hoff
4cfcdfa040 Merge pull request #1639 from vector-im/dbkr/fix_peeking 
Update for react-sdk dbkr/fix_peeking branch
 2016-06-16 11:13:29 +01:00
Richard van der Hoff
795986f146 Karma: fix warning by ignoring olm 
If olm is not installed, the webpack build for the karma tests gives an ugly
error. None of the tests currently care if olm is installed or not, so fix this
for now by just ignoring the olm module.
 2016-06-16 07:41:34 +01:00
Richard van der Hoff
d38c338f89 Merge pull request #1641 from vector-im/dbkr/update_readme 
Update README.md
 2016-06-15 17:10:02 +01:00
David Baker
a373849b5b Give better instructions for modifying config. 2016-06-15 11:03:52 +01:00
Richard van der Hoff
8cd4637316 Merge pull request #1643 from vector-im/dbkr/fix_karma 
Fix karma tests
 2016-06-14 16:38:14 +01:00
David Baker
0635a6f562 Fix karma tests 
As we now use draft-js: https://github.com/facebook/fbjs/issues/133#event-617440260
 2016-06-14 16:32:07 +01:00
David Baker
a8cee87c08 js-sdk doesn't have a build step 2016-06-14 15:53:13 +01:00
David Baker
a7598ea815 Mention copying sample file here too 2016-06-14 15:52:03 +01:00
David Baker
22cef7a6a0 Copy config.json first 2016-06-14 15:41:55 +01:00
David Baker
e507339324 Merge pull request #1553 from aviraldg/feature-rte 
Rich Text Editor
 2016-06-14 15:27:35 +01:00
David Baker
b643d8ff6a Update README.md 
To reflect the fact that you can now sensibly deploy from a package (ie. be able to configure the app). Make the first thing be downloading a prebuilt package so people who only read the first part don't end up running npm start in production and complain about needing npm.
 2016-06-14 15:12:35 +01:00
David Baker
3547bd8d00 Update for react-sdk dbkr/fix_peeking branch 
With the react-sdk update, this does nothing functionally since the room ID would just
have been ignored, but update this to correctly supply only one of ID/alias.
 2016-06-14 13:02:34 +01:00
Aviral Dasgupta
ab1f37b0bb Merge pull request #1 from pferreir/pr/1553 
Basic Markdown highlighting
 2016-06-12 04:55:05 +05:30
Pedro Ferreira
eb37032d8a Markdown: styles for bold/italics 2016-06-12 01:04:22 +02:00
Aviral Dasgupta
f6ed21559a RTE mode switch styling & cleanup 2016-06-11 15:54:43 +05:30
Richard van der Hoff
a5986ade51 Merge pull request #1615 from vector-im/dbkr/directory_join_by_alias 
Fix RoomDirectory to join by alias whenever possible.
 2016-06-10 15:23:07 +01:00
David Baker
d7504aeda5 Switch to new view_room 2016-06-10 15:13:41 +01:00
Aviral Dasgupta
b2459b2dc6 Merge branch 'develop' of github.com:vector-im/vector-web into feature-rte 2016-06-10 04:43:06 +05:30
Aviral Dasgupta
819e06e2cd MessageComposer styling for Draft 2016-06-10 04:41:59 +05:30
David Baker
b7f1a3db57 gitignore config.json now it isn't versioned 2016-06-09 18:51:25 +01:00
David Baker
a030e46c69 Use join_room_by_alias in RoomDirectory 
This still doesn't actually cause the room to be joined by alias though, so still need to fix that
 2016-06-09 17:13:02 +01:00
David Baker
f61cfbc542 Fix RoomDirectory to join by alias whenever possible. 2016-06-09 16:41:01 +01:00
Richard van der Hoff
c4b7571c45 Merge pull request #1612 from vector-im/dbkr/optional_config 
Make the config optional
 2016-06-09 10:40:58 +01:00
Richard van der Hoff
4dd477e064 index.js: fix comment typo 
Fix dave's typo for him
 2016-06-09 10:38:51 +01:00
David Baker
f595f6f141 This check shouldn't be here with the || 2016-06-09 10:25:49 +01:00
David Baker
24602119c5 This doesn't actually need to be global 
(because the rendering isn't in a render method here)
 2016-06-09 09:59:37 +01:00
David Baker
3040d0a474 Comment typo 2016-06-09 09:57:44 +01:00
David Baker
e4ea00ca23 Return here, else we'll call resolve too 2016-06-09 09:56:57 +01:00
David Baker
4fc311da90 Style fix 2016-06-09 09:56:11 +01:00