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

1934 Commits

Author SHA1 Message Date
Richard van der Hoff 7ceaabb166 RightPanel: remove superfluous divs 2017-02-03 12:00:33 +00:00
Richard van der Hoff 67e14ff363 Merge branch 'develop' into rav/hotkey-ux 2017-02-03 11:43:32 +00:00
Matthew Hodgson 0050e1557d fix darktheme for close button 2017-02-03 02:06:50 +00:00
Matthew Hodgson 654a025a9f fix button width for unkdevdialog 2017-02-03 02:06:50 +00:00
Richard van der Hoff a64e1cb936 Merge pull request #3118 from vector-im/dbkr/network_dropdown_mxc 
Allow mxc: URLs for icons in the NetworkDropdown
 2017-02-02 19:53:46 +00:00
David Baker 3903954bf2 Allow mxc: URLs for icons in the NetworkDropdown 
For https://github.com/vector-im/riot-web/issues/3086
 2017-02-02 19:35:36 +00:00
Matthew Hodgson 4c3a723aa8 make TopRightMenu more intuitive 
should fix https://github.com/vector-im/riot-web/issues/2827
 2017-02-02 18:42:03 +00:00
Matthew Hodgson c4a590f6af CSS for empty timelinepanels 2017-02-02 16:18:20 +00:00
David Baker 00c26088b1 Merge pull request #3110 from vector-im/luke/css-reg-icons 
Handle icons with width > height
 2017-02-02 14:29:23 +00:00
Luke Barnard e77709bc71 Merge branch 'develop' into luke/rts-welcome-pages 
Conflicts:
	src/skins/vector/css/matrix-react-sdk/views/rooms/_RoomPreviewBar.scss
 2017-02-02 14:03:21 +00:00
Luke Barnard a2622a556c Remove SdkConfig dep 2017-02-02 14:01:12 +00:00
Luke Barnard 6a9e5deb7b Remove commented code 2017-02-02 14:00:21 +00:00
Luke Barnard 20a7e3adf9 Migrate existing pages over to RTS 
See matrix-org/riot-team-server#14
 2017-02-02 13:58:22 +00:00
Matthew Hodgson c6def48fe0 try to make joining rooms more obvious 2017-02-02 13:32:36 +00:00
Luke Barnard f2e62ff439 Use RTS URL passed through 2017-02-02 11:58:20 +00:00
Luke Barnard 874e32699a Handle icons with width > height 
Icons with width > height will now only assume a max-height of 100% as opposed to a height of 100%. This is so they don't overflow the width of 300px.
 2017-02-02 11:30:14 +00:00
Luke Barnard 4a34bee2dc Use localStorage `mx_team_token` to decide welcome page 2017-02-02 11:12:43 +00:00
Matthew Hodgson b137c82a7a tweak CSS for UnknownDeviceDialog to support scrollable content 2017-02-02 00:25:18 +00:00
Matthew Hodgson 23060a6833 fix ugly blue border on roomtiles 2017-02-01 22:24:23 +00:00
Luke Barnard 40609d7da3 then->done 2017-02-01 11:39:23 +00:00
Luke Barnard 1f3ab4425a Merge branch 'develop' into matthew/homepages 
Conflicts:
	src/component-index.js
	src/skins/vector/css/matrix-react-sdk/views/rooms/_RoomPreviewBar.scss
 2017-02-01 11:34:24 +00:00
Matthew Hodgson 6369d76a74 poor man's dark theme for MD codeblocks 2017-01-27 18:18:23 +01:00
Luke Barnard 6374526f3c Merge pull request #3081 from vector-im/luke/css-login-support 
Add CSS for a support box in login
 2017-01-27 16:36:53 +00:00
Luke Barnard 78105bb4db Merge pull request #3082 from vector-im/luke/feature-optional-custom-login-logo 
Allow a custom login logo to be displayed on login
 2017-01-27 16:34:39 +00:00
Luke Barnard 87db89b67a Replace inline styles for logos with css 
Also, give .mx_Login_logo a height so that if the image has not loaded yet, it will not change height (thanks @dbkr)
 2017-01-27 16:30:44 +00:00
Luke Barnard 02d6a10f67 Allow a custom login logo to be displayed on login 
This is to allow team logos to be shown when a user registers with a team email.
 2017-01-27 16:08:14 +00:00
Luke Barnard 029602fc73 Fix the width of input fields within login/reg box 
This is so they do not expand outside of the login area. (280px = 300px - 2px - 18px, 2px for borders, 18px for padding)
 2017-01-27 16:04:24 +00:00
Luke Barnard 5aa9592c71 Add CSS for a support box in login 
This box can be used to provide useful hints during registration/login.
 2017-01-27 16:02:33 +00:00
David Baker bb70622b55 Merge pull request #3057 from vector-im/luke/fix-avatar-image-background-colour 
Set BaseAvatar_image bg colour = #fff
 2017-01-26 16:34:01 +00:00
Kegan Dougal b16fa4171a Close the dialog box after sending bugs 2017-01-26 13:42:37 +00:00
David Baker 7850f7e505 Fix badge spam: attempt 2 (#3073) 2017-01-26 12:58:29 +00:00
Richard van der Hoff f29e0bfe6d Revert "Merge pull request #3067 from vector-im/matthew/fix-badge-spam" 
This reverts commit f9db7f017d, reversing
changes made to 71b149de76.

This caused `number is not defined`
 2017-01-26 12:16:44 +00:00
David Baker f9db7f017d Merge pull request #3067 from vector-im/matthew/fix-badge-spam 
only recalculate favicon if it changes
 2017-01-26 11:44:11 +00:00
David Baker 71b149de76 Merge pull request #3064 from vector-im/dbkr/invite_look_up_emails 
CSS tweak for email address lookup
 2017-01-26 11:34:51 +00:00
Matthew Hodgson ba5e7d4013 fix event-encrypting-color in dark theme 2017-01-26 00:54:00 +01:00
Matthew Hodgson 9797c2fb4b fix electron too 2017-01-26 00:31:52 +01:00
Matthew Hodgson 972a391296 only recalculate favicon if it changes 2017-01-26 00:28:22 +01:00
David Baker 4e41accc56 CSS tweak for email address lookup 
CSS tweak for https://github.com/matrix-org/matrix-react-sdk/pull/653
 2017-01-25 18:52:21 +00:00
Kegan Dougal 0a9f02abcc Glue the dialog to rageshake: honour sendLogs flag. 2017-01-25 16:51:26 +00:00
Luke Barnard 0021fb37f3 Set BaseAvatar_image bg colour = #fff 2017-01-25 14:27:25 +00:00
Kegsay 80c1ec0502 Merge pull request #3000 from vector-im/kegan/rageshake 
Implement bug reporting logic
 2017-01-25 10:34:05 +00:00
Kegan Dougal eaff0abfb0 Add link to Chrome issue status for fixing line numbers 2017-01-25 10:28:13 +00:00
Kegan Dougal e225d3e370 Preserve ordering of flush()es by not letting subsequent flush()es race 2017-01-24 17:05:01 +00:00
Kegsay 9a933e2ce5 Merge pull request #3045 from vector-im/kegan/rageshake-ui 
Add css for bug report dialog
 2017-01-24 15:47:49 +00:00
Kegan Dougal efbea0e942 Add css for bug report dialog 2017-01-24 14:45:16 +00:00
Luke Barnard 307c4f3dd1 Increase the max-height of the expanded status bar 
This will ensure that errors, unsent messages, etc. will be allowed enough height to display their contents from within the status bar without being chopped.

Fixes #3041
 2017-01-24 14:02:44 +00:00
Kegan Dougal 6f3b70dbb0 Use Q promises and isPending to make logic simpler 2017-01-24 12:43:18 +00:00
David Baker 6db5329d9c Merge pull request #2971 from vector-im/dbkr/add_searching_known_users 
CSS for 'searching known users'
 2017-01-24 10:51:13 +00:00
Luke Barnard ea82b90d35 Merge pull request #2981 from vector-im/luke/feature-animated-status-bar 
Animate status bar max-height and margin-top
 2017-01-23 23:08:23 +00:00
Matthew Hodgson 706ffbec3c add riot logos 2017-01-23 19:01:35 +01:00
Kegan Dougal f3df86872b Fix tightlooping when flush()ing without any logs 
The promise would resolve immediately, nulling out `flushPromise`. This would
then immediately be set from `new Promise((resolve, reject) => {...})` turning
it back into non-null `flushPromise`. The resolve handler was called so the
next `flush()` would see "oh yes, there is a non-null `flushPromise`" then
promptly try to set `flushAgainPromise` which chains off the resolved
`flushPromise` which relied on `flushPromise` being `null`ed out after
`resolve()`, causing the chained `flush()` to see "oh yes, there is a non-null
`flushPromise`" which... ad infinitum.

This PR fixes it by making the nulling out asynchronous but the fact it took
me this long to debug this issue indicates to me that this is a terrible piece
of code. Will re-write.
 2017-01-23 17:37:57 +00:00
Luke Barnard b7204bf868 Use primary bg color on statusArea 2017-01-23 13:33:39 +00:00
Luke Barnard c4d246cd72 Merge branch 'develop' into luke/feature-animated-status-bar 2017-01-23 13:31:48 +00:00
Luke Barnard b582cf0a5f Remove CSS for StatusBar mid-timeline 2017-01-23 13:30:39 +00:00
Luke Barnard 57126efe86 Reposition typing avatars relative to "is typing" 2017-01-23 10:24:23 +00:00
Kegan Dougal 2ecf65f057 Keep the logs if no store exists 2017-01-23 09:28:48 +00:00
Matthew Hodgson d907421ad4 crappy CSS for UnknownDeviceDialog 2017-01-22 01:25:32 +01:00
Matthew Hodgson ef519231d6 fix mute button colors 2017-01-20 21:16:58 +00:00
Matthew Hodgson 83272f5cc5 fix badge color again 2017-01-20 21:11:28 +00:00
Matthew Hodgson 5b1fea46cb fix badge color 2017-01-20 21:09:49 +00:00
Matthew Hodgson a9c575b4d0 fix a bunch of dark-theme buttons 2017-01-20 21:00:33 +00:00
Luke Barnard a24b568b73 Merge pull request #2998 from vector-im/luke/css-typing-avatars 
CSS for avatars that appear when users are typing
 2017-01-20 17:43:36 +01:00
lukebarnard afcf9de8d4 Handle avatars with initials 2017-01-20 17:35:01 +01:00
lukebarnard 9ffedf5e7d space after colons 2017-01-20 17:00:59 +01:00
lukebarnard 956deca844 Add bg-color border to typing avatars 2017-01-20 16:59:41 +01:00
Kegan Dougal ea063ab8b0 Address race conditions when flushing logs 2017-01-20 14:46:19 +00:00
Kegan Dougal 378126e746 Add another store to keep last modified times 
This makes it easier to get a list of all the log IDs. It also makes it possible
to order the logs by the *LAST* log line and not the first as was the case
previously, which is important in the case of long-running tabs.
 2017-01-20 14:00:30 +00:00
Kegan Dougal 41c6294be2 Remove clearAll from consume(): we want duplicate logs on multiple reports 2017-01-20 13:02:57 +00:00
Kegan Dougal ba1e166ac8 Line length 80 like we're still in the 80s 2017-01-20 12:02:48 +00:00
Kegan Dougal ea860807c4 Add a monkeyPatch function rather than monkey-patching in the constructor 2017-01-20 11:56:11 +00:00
Matthew Hodgson 9b70e2e25f fix RTE bg color 2017-01-20 02:34:45 +00:00
Matthew Hodgson 4d8f5d4df1 change selection color & fix MD bg 2017-01-20 02:29:56 +00:00
Matthew Hodgson fa535996ae fix textarea bg 2017-01-20 02:22:11 +00:00
Richard van der Hoff 8ad0ff24f8 Fix link to image for event options menu 
This has to be relative, because we don't know if riot is going to be mounted
at the top-level of the domain or not (it's not, on riot.im).

Links are relative to the final location of the CSS, which is under
bundles/<hash>, so need ../..
 2017-01-19 18:35:43 +00:00
Kegan Dougal 53a16158c7 Remove logs when submitting bug reports 2017-01-19 17:41:08 +00:00
Kegan Dougal beba4d2ae3 Add version and user agent to bug report 2017-01-19 17:40:21 +00:00
Richard van der Hoff 36450764f3 rethemendex fixes 
- set cwd before doing cwd-specific operations
- don't include 'themes' directory, otherwise it's a bit circular.
 2017-01-19 17:02:57 +00:00
Kegan Dougal 3996d23b19 Inject bug report endpoint URL from config.json 2017-01-19 16:49:25 +00:00
Kegan Dougal bf887e82fe Swap to async/await rather than promise chains 
Since we do in fact support coroutines!
 2017-01-19 16:40:54 +00:00
lukebarnard 789c7b60cc CSS for avatars that appear when users are typing 2017-01-19 16:51:41 +01:00
Kegan Dougal 81d437ac1e POST reports to localhost for now. Also send live console logs 2017-01-19 15:47:55 +00:00
Richard van der Hoff 61c5253dbf Give the 'Light' theme link a title too 
... mostly to make it appear on the Firefox style menu.
 2017-01-19 15:41:58 +00:00
Kegan Dougal 608c1b0208 Finish implementing consume() 
- Fetches all logs in order and concatenates correctly.
- Purges old logs correctly.
 2017-01-19 15:03:47 +00:00
David Baker bee4ca2b28 Fixes to electron desktop notifs 
Merge the notification part of https://github.com/vector-im/riot-web/pull/2960

 * Show and focus the window when the notification is clicked,
   rather than just restoring it.
 * Implement requestNotificationPermission and return a resolved
   promise (although in practice it should never be called)
 2017-01-19 13:25:56 +00:00
Kegan Dougal 89d514a532 Query IndexedDB for all results with index=0 2017-01-19 12:02:19 +00:00
lukebarnard 6b1d138918 Make scrolling to bottom whilst expanded seem less weird inertially 2017-01-19 12:45:26 +01:00
David Baker 5f8170f4cd Merge remote-tracking branch 'origin/develop' into dbkr/add_searching_known_users 2017-01-19 11:12:49 +00:00
lukebarnard e08f97a549 Reduce animation time to 200ms 2017-01-19 11:52:15 +01:00
Matthew Hodgson 5b95986705 fix various SCSS snafus 2017-01-18 20:05:18 +00:00
Matthew Hodgson ec1a2f6abf fix CSS regression in searchbox 2017-01-18 19:29:53 +00:00
Kegan Dougal 811086ac8e Comment how we should consume logs 2017-01-18 17:18:02 +00:00
Kegan Dougal 5828ab1077 Generate unique IDs for each JS runtime to accomodate multiple tabs 2017-01-18 16:27:11 +00:00
Matthew Hodgson acb85b7b72 f1x0r CSS comment 2017-01-18 16:06:02 +00:00
Kegan Dougal e9884768f6 Persist console logs to an IndexedDB instance 2017-01-18 16:00:13 +00:00
lukebarnard f10bc8eef1 Animate status bar max-height and margin-top 
When collapsed, the max-height is set to 0px. When expanded, max-height is set to 50px, margin-top is set to 0px. When expanded and when the timeline is not scrolled down to the bottom, margin-top is set to -50px to offset the change in height, keeping it at the same scroll position.

Without the animation, there would be a jump when the user starts scrolling up from the bottom whilst the StatusBar is expanded.
 2017-01-18 16:49:20 +01:00
Matthew Hodgson 708fd640f7 unbreak switching after vdh's webpack changes 2017-01-18 14:06:20 +00:00
Matthew Hodgson 14eec6d982 Merge branch 'develop' into matthew/postcss 2017-01-18 12:44:42 +00:00
Matthew Hodgson 69bedf0d37 review feedback 2017-01-18 12:42:48 +00:00
Matthew Hodgson 0cd895b417 kill the moofle 2017-01-17 19:19:30 +00:00
Matthew Hodgson 6c88201e23 use ye olde rel='alternate stylesheets' for theming 2017-01-17 19:14:16 +00:00