Matrix/element-web-Github
1
0
Fork 0
mirror of https://github.com/vector-im/element-web.git synced 2024-11-15 20:54:59 +08:00
Code Issues Packages Projects Releases Wiki Activity
3,149 Commits 206 Branches 552 Tags 518 MiB
7676fd960e
Commit Graph

3149 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Michael Telatynski
7676fd960e Merge branch 'develop' into forward_message 2017-04-30 12:35:52 +01:00
Matthew Hodgson
67efb8bde2 Add date tooltip to timestamps 2017-04-29 00:00:37 +01:00
David Baker
4eb0ca63a9 Revert commits acciderntally put on develop 2017-04-28 11:22:05 +01:00
David Baker
73fb2c859e Remove now-redundant grey CSS 2017-04-28 11:20:55 +01:00
David Baker
431b8aaefa Make left panel more friendly to new users 
https://github.com/vector-im/riot-web/issues/3609
 2017-04-28 11:10:41 +01:00
David Baker
b637ab33cc Merge pull request #3751 from vector-im/luke/room-directory-improve 
Improve Room Directory Look & Feel
 2017-04-27 18:28:25 +01:00
Luke Barnard
afb4b79d81 Improve Room Directory Look & Feel 
By adding an icon next to the title.
Requires https://github.com/matrix-org/matrix-react-sdk/pull/848
 2017-04-27 18:04:41 +01:00
Luke Barnard
5defd0bb74 Merge branch 'develop' of github.com:vector-im/vector-web into develop 2017-04-27 16:46:21 +01:00
Luke Barnard
e6f694307d add word-break to RoomDirectory 2017-04-27 16:46:14 +01:00
David Baker
beefcfcb8c Merge pull request #3742 from vector-im/luke/fix-emotes-rrs 
Fix emote RRs alignment
 2017-04-26 18:25:27 +01:00
Luke Barnard
44d0e7dcba Fix emote RRs alignment 2017-04-26 18:00:51 +01:00
Luke Barnard
71685b5eab Merge pull request #3741 from vector-im/dbkr/remove_unused_droptarget_placeholder 
Remove unused `placeholder` prop on RoomDropTarget
 2017-04-26 16:46:47 +01:00
David Baker
7b3719bc3c Remove unused placeholder prop on RoomDropTarget 2017-04-26 16:27:25 +01:00
David Baker
c070e86c1f Merge pull request #3732 from vector-im/luke/css-improve-country-dd 
Modify CSS for matrix-org/matrix-react-sdk#833
 2017-04-26 10:28:07 +01:00
Luke Barnard
78cabed0bf Modify CSS for matrix-org/matrix-react-sdk#833 2017-04-25 16:24:00 +01:00
David Baker
bf88620581 Merge pull request #3727 from vector-im/dbkr/warn_when_single_instance_quit 
Warn when exiting due to single-instance
 2017-04-25 11:18:19 +01:00
David Baker
e24ef2bb5c Warn when exiting due to single-instance 
This lost me a fair bit of time trying to figure out why Riot was
starting and then immediately quitting.
 2017-04-25 10:18:17 +01:00
Matthew Hodgson
4dd6ee681d fix /config.json in .gitignore 2017-04-25 00:14:24 +01:00
Matthew Hodgson
ef057e4693 Merge pull request #3709 from t3chguy/electron_notification_causes_weirdness_onclick 
Electron forgets it was maximized when you click on a notification
 2017-04-25 00:10:20 +01:00
Matthew Hodgson
f53b238c24 Merge pull request #3719 from turt2live/travis/h1-h2-to-h3 
CSS to make h1 and h2 the same size as h1.
 2017-04-25 00:08:07 +01:00
Matthew Hodgson
7957eeba10 Merge pull request #3721 from vector-im/luke/css-fix-long-room-names 
Prevent long room names/topics from pushing UI of the screen
 2017-04-25 00:07:41 +01:00
Matthew Hodgson
95931918dc Merge pull request #3717 from vector-im/luke/css-disable-dd-highlight 
Disable dropdown highlight on focus
 2017-04-25 00:07:13 +01:00
Michael Telatynski
0a1ebc2487 Don't show for anything that doesn't have a msgtype and body 
otherwise the server will just reject it anyway

Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2017-04-24 22:43:02 +01:00
Michael Telatynski
2eb715002f Merge branch 'develop' of https://github.com/vector-im/riot-web into forward_message 
Conflicts:
	.gitignore
 2017-04-24 18:38:52 +01:00
Michael Telatynski
92b52a61e7 don't show forward option for things we cannot decrypt 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2017-04-24 18:33:25 +01:00
Luke Barnard
69f5833c9f Prevent long room names/topics from pushing UI of the screen 
This was causing the "save" button in RoomSettings to be obscured when room names were set to long strings without spaces

Fixes https://github.com/vector-im/riot-web/issues/1729
 2017-04-24 16:05:49 +01:00
turt2live
61bba6c31f CSS to make h1 and h2 the same size as h1. 
Addresses #1772

Signed-off-by: Travis Ralston <travpc@gmail.com>
 2017-04-24 08:44:53 -06:00
Luke Barnard
c067800a4f Disable dropdown highlight on focus 2017-04-24 10:00:39 +01:00
Matthew Hodgson
af105b1920 moar padding for _TopUnreadMessagesBar.scss 2017-04-24 01:17:17 +01:00
Matthew Hodgson
a414352661 re-add img to _TopUnreadMessagesBar.scss 2017-04-24 01:13:24 +01:00
Matthew Hodgson
57f91086e6 add bullseye icon for 'Jump to first unread message' 2017-04-24 01:08:09 +01:00
Michael Telatynski
b3c9229aee DRY code and change double quotes to single 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2017-04-23 09:59:00 +01:00
Michael Telatynski
2139fb74bb change show logic to same as that of the tray icon 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2017-04-23 09:56:43 +01:00
Matthew Hodgson
8b4ab4bcdd update room directory icon to something that looks like a room list 2017-04-23 03:14:41 +01:00
Matthew Hodgson
40eceaf9bc show err.message in errors if present 2017-04-23 02:22:31 +01:00
Matthew Hodgson
ab5ec04507 oops 2017-04-23 01:01:38 +01:00
Matthew Hodgson
b1ff0b9e65 hook up keyb shortcuts for roomdir 2017-04-23 01:00:25 +01:00
Matthew Hodgson
be52787473 better solution to incomingcallbox weirdness 2017-04-22 17:37:16 +01:00
Matthew Hodgson
b3431bb750 fix incoming call box 2017-04-22 17:28:09 +01:00
Matthew Hodgson
4864716abb Merge pull request #3564 from t3chguy/t3chguy/malformed-notifications-gnome-kde 
Escape HTML Tags from Linux Notifications (electron)
 2017-04-22 16:45:04 +01:00
Matthew Hodgson
8a6283fedf Merge pull request #3651 from t3chguy/t3chguy/show_access_token 
styling for spoilerized access token view in Settings
 2017-04-22 16:22:48 +01:00
Matthew Hodgson
634cf528b4 Merge pull request #3690 from t3chguy/fix_webpack_config 
Fix Webpack conf
 2017-04-22 16:14:19 +01:00
Michael Telatynski
0da6ca8aea add more comment to explain this weirdness 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2017-04-22 16:05:08 +01:00
Michael Telatynski
08fb20a0df use a character class for brevity 
add a comment so this madness has meaning

Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2017-04-22 14:02:18 +01:00
Michael Telatynski
a8e4a2158a move styling to correct place 
NOTE TO SELF
1:1 mapping between react component to scss file.
Makes sense...

Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2017-04-22 04:33:47 +01:00
Matthew Hodgson
2f3e389a68 Merge pull request #3599 from coletivoEITA/develop 
Add config.json to .gitignore
 2017-04-22 03:11:17 +01:00
Matthew Hodgson
fb3ef89b50 Merge pull request #3641 from t3chguy/t3chguy/electron_launch_hidden 
add command line arg (--hidden) for electron app
 2017-04-22 03:02:48 +01:00
Matthew Hodgson
523b315985 Merge pull request #3640 from t3chguy/t3chguy/lightbox_download_button 
fix ImageView Download functionality
 2017-04-22 02:59:17 +01:00
Matthew Hodgson
36f08cf73c Merge pull request #3693 from t3chguy/cross-env 
Add cross-env into the mix
 2017-04-22 02:40:23 +01:00
Matthew Hodgson
5c00af7123 Merge pull request #3694 from turt2live/travis/remember-unsupported-browser 
Remember acceptance for unsupported browsers.
 2017-04-22 02:17:37 +01:00