gaja-group
/
element-web
forked from matrix/element-web
2
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity
3,798 Commits 964 Branches 0 Tags 74 MiB
Commit Graph

3798 Commits

Author SHA1 Message Date
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
turt2live 9124c1475a Change redact -> remove to improve clarity 
Addresses #2814

Non-technical users may not understand what 'redact' means and can more easily understand what 'Remove' does. See discussion on vector-im/riot-web#2814 for more information.

Signed-off-by: Travis Ralston <travpc@gmail.com>
 2017-04-24 12:48:32 -06: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
David Baker 5326faa0b8 v0.9.9-rc.2 2017-04-24 18:26:20 +01:00
David Baker 7f2fa09d4c Prepare changelog for v0.9.9-rc.2 2017-04-24 18:26:19 +01:00
David Baker b6435502fc New version of react-sdk 2017-04-24 18:25:13 +01:00
David Baker 1701ea43a4 Remove spurious changelog entries 2017-04-24 18:22:23 +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
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
Matthew Hodgson 38fa9f78f1 prefix localstorage key as per the convention 2017-04-22 02:17:22 +01:00
Matthew Hodgson 8a9b750b31 apply focus filter to normal buttons too 2017-04-22 01:55:57 +01:00
Matthew Hodgson 26ebd20956 improve logo cosmetics 2017-04-22 01:19:11 +01:00
turt2live e877ad2e63 Remember acceptance for unsupported browsers. 
Addresses #3624.

This stores the flag in localStorage, after checking if localStorage is available. If localStorage is not available, the user will be prompted just like before this commit.

Signed-off-by: Travis Ralston <travpc@gmail.com>
 2017-04-21 16:08:49 -06:00
Michael Telatynski dd7f9e2d5f argh, fix eslint false positives 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2017-04-21 19:00:24 +01:00
David Baker 141aafd18e v0.9.9-rc.1 2017-04-21 18:40:25 +01:00
David Baker 8aed52ece9 Prepare changelog for v0.9.9-rc.1 2017-04-21 18:40:24 +01:00
David Baker ce5a7ba48a Rewind version to try again, again 2017-04-21 18:39:11 +01:00
David Baker 95647fb7a1 v0.9.9-rc.1 2017-04-21 18:35:15 +01:00
David Baker d0c0eeac0a Prepare changelog for v0.9.9-rc.1 2017-04-21 18:35:14 +01:00
David Baker f25612198e 0.9.8, not 0.9.9 2017-04-21 18:33:53 +01:00
David Baker ca6d9063fd Back up release version to try again 2017-04-21 18:32:55 +01:00
David Baker eec0c274d2 v0.9.9-rc.1 2017-04-21 18:26:29 +01:00