Commit Graph

1736 Commits (8fd12d530d5beb53526ed1e7781221814478a1d8)

Author SHA1 Message Date
wmwragg 8fd12d530d Added the hightlight badge restyling 2016-07-18 14:57:03 +01:00
wmwragg 3f7bd48c0a Made the collapsed badge smaller than the uncollapsed one, basically the same size as it was originally 2016-07-18 14:27:14 +01:00
wmwragg 953bb64e0b Some quick initial tweaks to the badge icon 2016-07-17 21:18:47 +01:00
Matthew Hodgson a039450d10 Merge pull request #1809 from vector-im/revert-1799-feature-inline-link-preview
Revert "Presentation for inline link"
2016-07-15 16:54:39 +01:00
Matthew Hodgson 1e963a6c3a Revert "Presentation for inline link" 2016-07-15 16:54:27 +01:00
Matthew Hodgson 80ad45df06 spell out that vector should not depend on the public net 2016-07-15 15:57:59 +01:00
Matthew Hodgson 348f133e77 add mx_EventTile_body class for the body span in events, and fix the naming scheme of '.emoji-body' 2016-07-15 15:03:42 +01:00
Matthew Hodgson cd865bbe8f Merge pull request #1806 from vector-im/wmwragg/modal-restyle
Wmwragg/modal restyle
2016-07-15 15:01:01 +01:00
wmwragg e668d7685d Fixed light box colour, reset back to black. 2016-07-15 14:54:15 +01:00
Matthew Hodgson 6607bee91a Merge pull request #1799 from ribot/feature-inline-link-preview
Presentation for inline link
2016-07-15 13:51:54 +01:00
wmwragg 3a89a5af0b Increasing the specificity of the CSS so that primary input submit buttons are styled correctly 2016-07-15 12:33:56 +01:00
Stefan Pearson 35e3621ae7 removes overflow comments 2016-07-15 12:21:05 +01:00
wmwragg 040ef73886 Simple refactor of the primary indicator, now it's a class. Also added a global selector to remove the ugly firefox dotted line highlight 2016-07-15 11:22:10 +01:00
David Baker 74c9ac0872 Merge pull request #1798 from vector-im/dbkr/offline_user_colour
CSS for offline user colours
2016-07-14 18:29:28 +01:00
wmwragg adbad509f4 Updated to highlight the primary button in the dialog, i.e. the first one 2016-07-14 17:59:06 +01:00
David Baker 15a97a653f CSS for offline user colours 2016-07-14 17:43:43 +01:00
Stefan Pearson 9fb97a6b10 presentation for inline link 2016-07-14 17:08:25 +01:00
wmwragg 579f210cfc Initial Modal dialog restyling 2016-07-14 16:55:41 +01:00
wmwragg 2fb1e156ed Modal background restyled 2016-07-14 15:41:23 +01:00
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
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