Matrix/element-web-Github
1
0
Fork 0
mirror of https://github.com/vector-im/element-web.git synced 2024-11-16 21:24:59 +08:00
Code Issues Packages Projects Releases Wiki Activity
3,165 Commits 206 Branches 552 Tags 519 MiB
0deed1b511
Commit Graph

3165 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
David Baker
0deed1b511 Merge pull request #3790 from t3chguy/patch-2 
Fix scope of callback
 2017-05-05 18:25:29 +01:00
David Baker
2c36506342 Merge pull request #3622 from t3chguy/t3chguy/electron-persist-window-layout 
Remember and Recall window layout/position state
 2017-05-05 18:23:15 +01:00
Michael Telatynski
309afdb813 no point installing deps here, builder will do it for us 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2017-05-05 17:08:50 +01:00
Michael Telatynski
1ed1080bf3 Update README with npm run electron 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2017-05-05 17:05:03 +01:00
Michael Telatynski
a09f890619 Merge package.json, match version in electron/package.json 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2017-05-05 17:03:28 +01:00
Michael Telatynski
499b04c254 Only install electron deps when we're bundling/running electron 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2017-05-05 17:01:32 +01:00
Michael Telatynski
8a50207189 Change shebang to bash for string manipulations 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2017-05-05 16:57:18 +01:00
Michael Telatynski
f54708227e Proper two package.json format, release.sh bumps 2nd json ver too 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2017-05-05 16:54:55 +01:00
Luke Barnard
e1cd046c1a Prevent zalgo-like text overflowing MELS summary 2017-05-05 09:54:00 +01:00
Luke Barnard
ae76c76558 Fix #3450 - RM hidden by things 2017-05-04 21:27:33 +01:00
Luke Barnard
8731e46900 Merge pull request #3808 from vector-im/dbkr/remove_babelcheck 
Remove babelcheck
 2017-05-04 17:45:59 +01:00
David Baker
d419024da9 Merge pull request #3809 from vector-im/rav/include_mx_id_in_rageshake 
Include MXID and device id in rageshakes
 2017-05-04 17:30:51 +01:00
Richard van der Hoff
45efdbdd43 Include MXID and device id in rageshakes 
- to make for easier triage
 2017-05-04 17:21:16 +01:00
David Baker
7b320f8fbb Remove babelcheck 
Nobody is likley to be upgrading from babel 5 any more, so this
can go away now.
 2017-05-04 16:51:36 +01:00
David Baker
e6e2e6989a Merge pull request #3791 from t3chguy/patch-3 
import Modal
 2017-05-04 16:35:15 +01:00
Michael Telatynski
9997cc9891 import Modal 
class seems to be referring to Modal but does not import it
 2017-05-02 22:27:30 +01:00
Michael Telatynski
d5009962cd Fix scope of callback 
This may have led to the room list not refreshing on error of deleting alias
 2017-05-02 22:19:32 +01:00
Matthew Hodgson
9f3c1deae6 Merge pull request #3775 from t3chguy/patch-1 
Pin filesize ver to fix break upstream
 2017-04-30 13:11:33 +01:00
Michael Telatynski
4a8ad53bd9 Pin filesize ver to fix break upstream 
https://travis-ci.org/vector-im/riot-web/builds/227340622
avoidwork/filesize.js#87
3.5.7 and 3.5.8 ver released <24h ago and broke stuff for us
 2017-04-30 13:11:01 +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
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
9e2324fb69 don't hook on postinstall, current dev cycle uses (abuses) npm i to build 
so no point making it take longer than it has to for the devs only testing
webapp

build:electron - hook npm run install:electron
install:electron - run npm i for the electron deps
electron - start the app locally for testing

add to README

Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2017-04-23 22:50:58 +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