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

1928 commits

This branch
This branch
All branches
Author SHA1 Message Date
Matthew Hodgson
446f74b3dd Merge pull request #1776 from vector-im/wmwragg/typography-updates 
Wmwragg/typography updates
 2016-07-14 11:00:40 +01:00
wmwragg
d2391f999e Adding back in .DS_Store, but to ignore in any directory 2016-07-14 10:42:39 +01:00
wmwragg
e1779ca8bc Deleteing .DS_Store files before adding to gitignore 2016-07-14 10:41:41 +01:00
wmwragg
65371c9a39 Adding ignoring of mac .DS_Store files to all directories 2016-07-14 10:32:30 +01:00
wmwragg
a4dc844338 Added truetype font fallback for browsers that don't support WOFF2 format, i.e. safari 2016-07-14 10:24:16 +01:00
wmwragg
0a4af647c8 Header and footer buttons updated to new versions 2016-07-13 17:46:07 +01:00
wmwragg
503bf541c7 Tweak to the close button css to keep the close button inline with the search box 2016-07-13 14:34:20 +01:00
wmwragg
1fbc249de5 Updated Filter room icon 2016-07-13 14:23:46 +01:00
wmwragg
959dcd0c49 Updated BottomLeftMenu buttons to the new ones 2016-07-13 14:10:44 +01:00
wmwragg
ef4f2f10d9 Updated that RightPanel members icon, highlight and numbers 2016-07-13 13:56:59 +01:00
David Baker
19dbd85d44 Merge pull request #1766 from vector-im/rav/use_right_olm 
webpack: always use the olm from vector-web
 2016-07-13 09:48:08 +01:00
Richard van der Hoff
ef4b604caf webpack: always use the olm from vector-web 
Fixes an error when matrix-js-sdk is symlinked into node_modules, which meant
that we would (try to) use the version of olm from js-sdk instead of
vector-web (https://github.com/vector-im/vector-web/issues/1765).
 2016-07-12 23:10:53 +01:00
Aviral Dasgupta
74f459f8a4 feat: bump emoji-body font-size down to 48px 2016-07-12 20:37:51 +05:30
Matthew Hodgson
fef81748bb major update to dev guidelines 2016-07-11 18:25:58 +01:00
Richard van der Hoff
3e53879adc Bump to olm 1.0.0 
Fixes https://github.com/vector-im/vector-web/issues/1719
 2016-07-11 14:53:51 +01:00
David Baker
145e61b00f Merge pull request #1718 from aviraldg/feature-emojione 
feat: large emoji support
 2016-07-05 10:08:15 +01:00
Aviral Dasgupta
49dd93ffab feat: large emoji support 2016-07-05 04:04:34 +05:30
David Baker
7174879ac9 Merge pull request #1717 from aviraldg/feature-autocomplete 
Autocomplete
 2016-07-04 18:16:22 +01:00
Matthew Hodgson
486adb717b Merge pull request #1670 from Half-Shot/patch-1 
#1664 Set a maximum height for codeblocks
 2016-06-24 19:16:50 +01:00
David Baker
773f592c3f Merge pull request #1688 from vector-im/rav/device_blocking 
CSS for device blocking
 2016-06-23 18:24:40 +01:00
Richard van der Hoff
2ca9d87b95 CSS for device blocking 
A bunch of updates to the device info:

* format as a table
* make the buttons green, because the old way was super confusing
* instead make the status indicator red/orange/green.
 2016-06-23 17:32:33 +01:00
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
Aviral Dasgupta
dc840fdf48 updated selection styling 2016-06-21 19:02:18 +05:30
Aviral Dasgupta
510bb5785e Merge branch 'develop' into feature-autocomplete 2016-06-21 04:09:23 +05:30
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
Aviral Dasgupta
034c045b37 Styling for autocomplete 2016-06-20 13:53:18 +05:30
Matthew Hodgson
4dfb0e9a90 Merge branch 'develop' into matthew/scalar 2016-06-19 22:40:58 +01:00
Matthew Hodgson
654429dbdb improve wording on 'search room names' 2016-06-18 21:12:32 +01:00
Will Hunt
c7d0214aaa #1664 Set a maximum height for codeblocks 2016-06-18 12:21:34 +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
Aviral Dasgupta
ec7067e7bd Autocomplete style 2016-06-17 04:58:39 +05:30
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