mirrors/element-web
1
0
Fork 0
mirror of https://github.com/element-hq/element-web.git synced 2024-12-14 00:22:13 +03:00
Code Issues Projects Releases Packages Wiki Activity
1927 commits 219 branches 562 tags 474 MiB
Commit graph

1396 commits

Author SHA1 Message Date
wmwragg
37a7ce809a Added two new icons for notifications states 2016-07-27 10:40:19 +01:00
wmwragg
15f9f5dbe8 Doing the state change via onClick events rather than radio buttons, as they were causeing untraceable react errros for some reason 2016-07-26 17:24:45 +01:00
wmwragg
187818aaa0 Radio buttons now added, and only none guests can modify notfication state 2016-07-26 10:34:03 +01:00
wmwragg
30b1e7078f Contextual menu restyling 2016-07-25 18:04:16 +01:00
wmwragg
791980cd1f Menu context dohickey now sticks when menu shown 2016-07-25 17:19:06 +01:00
wmwragg
6c19504c8b Merge branch 'wmwragg/mention-state-indicator-round-3' into wmwragg/mention-state-menu 
# resolved Conflicts:
#	src/skins/vector/css/vector-web/views/rooms/RoomTooltip.css
 2016-07-25 16:45:25 +01:00
wmwragg
497ebce88a Corrected vertical alignment of membership button 2016-07-25 13:16:51 +01:00
wmwragg
2768cd2010 Initial unstyled mentions state notifier context menu 2016-07-22 17:30:09 +01:00
wmwragg
204e42494a The default props doesn't seem to be working, hardcoded 'LABEL' for now. OnClick closes menu 2016-07-22 16:11:42 +01:00
wmwragg
72b4a86eed Tweaked the tooltip to be better aligned. Also added the fading of the room name if too long 2016-07-22 14:59:02 +01:00
wmwragg
ce5311191f Tweaked tooltip z-index 2016-07-22 11:30:41 +01:00
wmwragg
7eff6d968e Tweak to z-index as the tooltip was occasionally getting occluded. 2016-07-22 11:16:04 +01:00
wmwragg
24e021b91f Badge dohickey shown on name hover and badge hover 2016-07-21 18:19:52 +01:00
wmwragg
e988f5ca3b Badge visual tweaks 2016-07-21 17:54:33 +01:00
wmwragg
633a3f4867 New component for testing 2016-07-21 17:44:05 +01:00
wmwragg
df163d8cb7 Clean up of the CSS, and refactor to better match current code 2016-07-21 14:33:27 +01:00
wmwragg
73bb317925 Slight tweak to the name padding so there is a little less space above and below the name 2016-07-21 12:19:11 +01:00
wmwragg
ad74d264a3 Selected room highlight teaked to better fit previous design 2016-07-21 11:37:40 +01:00
wmwragg
e9db975d7d Redone assets, with lighter weight to match design 2016-07-21 10:25:42 +01:00
wmwragg
f3586a79c2 Final CSS tweaks for the hover and collapsed states 2016-07-20 17:10:23 +01:00
wmwragg
882d09bf85 Initial reworking of the RoomTile CSS 2016-07-20 12:46:44 +01:00
Matthew Hodgson
25eb2e2daf Merge pull request #1822 from vector-im/wmwragg/spinner-fix 
Wmwragg/spinner fix
 2016-07-19 12:54:15 +01:00
Matthew Hodgson
d8d9912f2d Merge pull request #1823 from vector-im/wmwragg/mention-state-indicator 
Wmwragg/mention state indicator
 2016-07-19 12:19:36 +01:00
wmwragg
8a28da1986 Fixed white space issues 2016-07-19 12:13:29 +01:00
wmwragg
384425582a Fixed wonky white space 2016-07-19 11:47:32 +01:00
wmwragg
b87b356722 Added fixed SCG assets 2016-07-19 11:43:15 +01:00
Matthew Hodgson
6ae0dda9d3 give FF higher billing 2016-07-18 18:26:03 +01:00
Matthew Hodgson
6c680ff424 improve spacing 2016-07-18 18:25:50 +01:00
Matthew Hodgson
c6b455f470 improve spacing 2016-07-18 18:24:30 +01:00
wmwragg
f6d7052928 Oixel tweak so that it work properly in firefox 2016-07-18 16:38:29 +01:00
wmwragg
2ee1a9c440 Explanatory text about specificity 2016-07-18 16:20:44 +01:00
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
28108476bd Added an overide for the view source so that it behaves correctly with the new Modal. Also tweaked the spinner overide 2016-07-18 10:31:17 +01:00
Matthew Hodgson
722cedc92e CSS for generic user settings at last 2016-07-18 01:33:43 +01:00
Matthew Hodgson
f182e32e3d typo 2016-07-18 01:33:36 +01:00
wmwragg
3cfcc13387 Initial fix for Dialog Spinners 2016-07-17 21:20:11 +01:00
wmwragg
953bb64e0b Some quick initial tweaks to the badge icon 2016-07-17 21:18:47 +01:00
Matthew Hodgson
54f4443428 fix single emoji sizing 2016-07-17 18:30:06 +01:00
Matthew Hodgson
1e963a6c3a Revert "Presentation for inline link" 2016-07-15 16:54:27 +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
wmwragg
707ddc61bf Mergeing up from develop 2016-07-14 12:43:25 +01:00
wmwragg
09e861637f Simplification of the css 2016-07-14 12:04:31 +01:00
wmwragg
1f43f904d5 Search icon updated in header, and all icons spacing and positioning teaked 2016-07-14 11:33:07 +01:00
wmwragg
e1779ca8bc Deleteing .DS_Store files before adding to gitignore 2016-07-14 10:41:41 +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
Aviral Dasgupta
74f459f8a4 feat: bump emoji-body font-size down to 48px 2016-07-12 20:37:51 +05:30
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
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
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
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
895fb63d5d Merge pull request #1661 from vector-im/rav/unverify_device 
CSS for unverify button
 2016-06-17 17:00:26 +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
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
David Baker
e507339324 Merge pull request #1553 from aviraldg/feature-rte 
Rich Text Editor
 2016-06-14 15:27: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
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
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
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
Richard van der Hoff
7894e52529 Merge pull request #1610 from vector-im/rav/device_verification 
CSS support for device verification
 2016-06-08 21:37:35 +01:00
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
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
d976046e6a set email branding whenever emails are added from vector 2016-06-02 13:15:13 +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
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
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
Matthew Hodgson
974a187e74 fix annoying bug where URL previews with very long lines (e.g. vector permalinks) would get clipped 2016-05-03 17:49:42 +01:00
David Baker
efe1c767f0 Un-inline onChange 2016-05-03 11:36:44 +01:00
David Baker
a72d0c5b7f Merge remote-tracking branch 'origin/develop' into dbkr/email_notifs 2016-04-21 10:17:15 +01:00
David Baker
3cb092051e Merge branch 'develop' into dbkr/email_notifs 2016-04-21 10:11:55 +01:00
Richard van der Hoff
02f58ef9e3 Don't relayout scrollpanels every time something changes 
Gemini's habit of reflowing everything everytime anything changes at all makes
for an unresponsive app. Turn it off everywhere we use gemini.
 2016-04-20 12:29:32 +01:00
Richard van der Hoff
a0b460b084 Include react-addons-perf for non-production builds 
This makes it possible to gather a few performance stats
 2016-04-19 15:01:24 +01:00
Matthew Hodgson
aeb438dc62 fix tbody & keying warnings 2016-04-17 17:44:04 +01:00
Matthew Hodgson
10a053019d fix thinkos - thanks @richvdh for posthoc review 2016-04-17 17:35:17 +01:00
Matthew Hodgson
58c431abc2 fix spinner layout bouncing when changing notifs 
all-important s/done/then/ on pushRulesPromise to ensure that the refresh completes before relaying-out the page
s/Loud/Highlight & sound/
 2016-04-17 14:00:20 +01:00
Matthew Hodgson
d512e25cca persist search filter over being hidden 2016-04-17 00:28:33 +01:00
Matthew Hodgson
65d9333104 pointer on roomsublist 2016-04-16 23:49:21 +01:00
Matthew Hodgson
fbd974df55 fix bottomleft bug in chrome canary 2016-04-16 23:49:16 +01:00
Matthew Hodgson
fdf83a5ad5 fix tooltip offset 2016-04-15 22:24:20 +01:00
Matthew Hodgson
c98e06e1aa add cancelButton to simpleHeader 2016-04-15 22:16:06 +01:00
Matthew Hodgson
b58265a69c fix comedy FontAwesome bug 2016-04-15 21:48:09 +01:00