OpenCloud
/
element-web
mirror of https://github.com/vector-im/element-web
1
0
Fork 0
Code Issues Releases Wiki Activity
4,314 Commits
192 Branches
539 Tags
396 MiB
Commit Graph

4314 Commits (013f2ce66aeb1e218b55635aea65736e831e752a)

Author SHA1 Message Date
David Baker 013f2ce66a More CSS for group membership lifecycle 2017-08-21 19:34:31 +01:00
David Baker 07b6e215a1 CSS for group invite tiles 2017-08-18 11:24:52 +01:00
David Baker ee6e36cd90 Allow extra tiles to be put into room sub lists 
So we can put in tiles for group invites & other stuff
 2017-08-18 11:23:55 +01:00
David Baker 1a7a670c96 Show the group invite dialog 
What to TODO said!
 2017-08-16 14:59:00 +01:00
David Baker 57eb2feeb6 Make right panel collpasing work in GroupView 2017-08-15 13:18:16 +01:00
David Baker be611f53e1 Merge remote-tracking branch 'origin/develop' into dbkr/group_userlist 2017-08-15 10:49:20 +01:00
Luke Barnard 07ca70fd44 Fix scrollbar for pills with initial avatar 2017-08-11 17:48:25 +01:00
David Baker d610788866 Merge pull request #4777 from vector-im/luke/fix-quick-search-nav 
move focus-via-up/down cursors to LeftPanel
 2017-08-11 10:52:36 +01:00
David Baker 3eeabe8d91 Merge pull request #4775 from vector-im/luke/fix-user-url-no-middle-panel 
Remove userId property on RightPanel
 2017-08-11 10:49:25 +01:00
Luke Barnard 752934350f Merge pull request #4776 from shvchk/patch-2 
Make member device info buttons fluid and stackable with flexbox
 2017-08-10 18:20:22 +01:00
Matthew Hodgson 5bfb5d4c3c move focus-via-up/down cursors to LeftPanel 
Conflicts:
	src/components/structures/LeftPanel.js
 2017-08-10 18:18:15 +01:00
Andrei Shevchuk a72fc80ef6 Remove width 100% from device info buttons wrapper 2017-08-10 20:08:46 +03:00
Luke Barnard 44c6f3fafc Add todo to make RP listen to RVS 2017-08-10 16:59:12 +01:00
Andrei Shevchuk 68dd47aa7b Make member device info buttons fluid and stackable with flexbox 
Buttons with short text stay as they are, buttons with long text don't get overflowed, but just grow and wrap on a new line if needed, still remaining aligned with others (see screenshot in PR comments)

Signed-off-by: Andrei Shevchuk <andrei@shevchuk.co>
 2017-08-10 17:50:09 +03:00
Luke Barnard 535e33509b Merge pull request #4688 from vector-im/t3chguy/i18n_analytics 
un-i18n Modal Analytics
 2017-08-10 15:36:04 +01:00
Michael Telatynski 4c6836bc3f
don't track error messages .2 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2017-08-10 15:13:30 +01:00
Michael Telatynski 9c5ceb6775
don't track error messages 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2017-08-10 13:56:01 +01:00
Marcel aae7515339 Add Login Page LanguageDropdown CSS (#4767) 2017-08-10 13:29:41 +01:00
Luke Barnard 7269e7b84a Remove userId property on RightPanel 
because we shouldn't have a dispatch AND have a property that do vaguely similar things. Ideally, the dispatch would send a userId and RP would do async work to get the member/avatar/displayname.
 2017-08-10 13:16:31 +01:00
Luke Barnard 72d250d8c4 Merge pull request #4773 from vector-im/luke/fix-quote-innerText 
Quote using innerText
 2017-08-10 10:35:45 +01:00
Luke Barnard 57f82c3c9e Quote using innerText 
codep matrix-org/matrix-react-sdk#1289
 2017-08-10 10:18:37 +01:00
David Baker 7c4b6739fc Add group member right panel 2017-08-09 15:36:51 +01:00
David Baker 12628b67ea Merge remote-tracking branch 'origin/develop' into dbkr/group_userlist 2017-08-09 13:46:40 +01:00
Luke Barnard ee2fb17945 Merge pull request #4765 from vector-im/rav/karma-bits 
Karma tweaks for riot-web
 2017-08-09 09:30:49 +01:00
Richard van der Hoff 06ef674597 Enable fancy karma reporters 
cargo-cult luke's stuff from react-sdk
 2017-08-08 19:05:58 +01:00
Richard van der Hoff df33d40285 Enable karma-sourcemap-loader 
This turns (some) stacktraces back into something useful, so that unpicking
test failures is vaguely tractable
 2017-08-08 19:05:49 +01:00
Richard van der Hoff 0b2120e423 Merge pull request #4764 from MTRNord/patch-5 
Fix typo with scripts/fetch-develop-deps.sh in Building From Source
 2017-08-08 18:23:44 +01:00
Marcel a3525f411d Fix typo with scripts/fetch-develop-deps.sh in Building From Source 
scripts/fetch-develop-deps.sh vs scripts/fetch-develop.deps.sh
 2017-08-08 19:22:07 +02:00
David Baker 3e96892a91 Merge pull request #4757 from vector-im/luke/css-feature-pills-hide-avatar-setting 
Adjust CSS for optional avatars in pills
 2017-08-08 14:01:29 +01:00
Luke Barnard 274fc34868 Adjust CSS for optional avatars in pills 
codep matrix-org/matrix-react-sdk#1277
 2017-08-08 11:14:52 +01:00
Richard van der Hoff 10ee9f4de4 Merge pull request #4754 from vector-im/rav/fix_crypto_build 
Fix crypto on develop
 2017-08-08 10:13:06 +01:00
Richard van der Hoff c31f66aed5 Jenkins.sh: only fetch head of dependency branches 2017-08-08 09:50:49 +01:00
Richard van der Hoff 7b024751d1 fetch-develop-deps: avoid breaking js-sdk 
do `npm i` in react-sdk *before* symlinking js-sdk, to avoid moving a load of
deps from js-sdk to react-sdk and hence breaking the build.
 2017-08-08 09:50:49 +01:00
Richard van der Hoff 9c3c1b7608 Make webpack exit non-zero on error 
Pass `--bail` to webpack, so that if we can't find a module, we bail out rather
than deploy a broken version to /develop.

https://github.com/webpack/webpack/issues/708 is somewhat relevant.
 2017-08-08 09:50:49 +01:00
Matthew Hodgson 9f3c33758c Merge pull request #4464 from vsund/patch-1 
Fix signing key url in readme
 2017-08-06 20:11:32 +01:00
Matthew Hodgson bf38fead18 Merge pull request #4749 from jfmherokiller/gitignore-update 
update gitignore to allow .idea directory to exist in subdirs
 2017-08-06 20:11:00 +01:00
Matthew Hodgson a98c734eb5 Merge pull request #4665 from uhoreg/compact 
tweak compact theme
 2017-08-06 20:10:27 +01:00
Jordan Moran Meyers fb69ac33a0
update gitignore to allow .idea directory to exist in subdirs 2017-08-05 15:50:47 -05:00
David Baker 4b5febadb7 Merge pull request #4740 from vector-im/luke/upgrade-dep-draft-js-0.11.0-alpha 
Update draft-js from 0.10.1 to 0.11.0-alpha
 2017-08-03 15:55:57 +01:00
Luke Barnard 8ca2af0fe7 Update draft-js from 0.10.1 to 0.11.0-alpha (see https://github.com/matrix-org/matrix-react-sdk/pull/1269) 2017-08-03 15:22:52 +01:00
David Baker f5e5bb8720 Merge pull request #4739 from vector-im/t3chguy/mouse_forward_back-windows 
electron support for mouse forward/back buttons in Windows
 2017-08-03 15:21:33 +01:00
Michael Telatynski a6d5158830
electron support for mouse forward/back buttons in Windows 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2017-08-03 15:03:50 +01:00
Luke Barnard 4b8764c070 Merge pull request #4730 from vector-im/luke/update-dep-draft-js 
Update draft-js from 0.8.1 to 0.10.1
 2017-08-02 13:06:31 +01:00
Luke Barnard 2f99a4883f Update draft-js from 0.8.1 to 0.10.1 
Hopefully to fix #4675 and friends
 2017-08-02 11:52:47 +01:00
Richard Lewis af85f18eae Styling tweaks 2017-08-01 17:30:22 +01:00
Michael Telatynski 5b6dbfb701
Merge branch 'develop' of github.com:vector-im/riot-web into t3chguy/i18n_analytics 2017-07-28 21:02:48 +01:00
David Baker 384727a553 Merge pull request #4693 from vector-im/luke/css-sending-event-tile 
Make pills, emoji translucent when sending
 2017-07-28 15:34:09 +01:00
Luke Barnard 397523f4ac Make pills, emoji translucent when sending 
also fix header colours, which now inherit the font colour of the event tile (so all headers have the correct colour when sending or when the event tile is highlighted for a mention)
 2017-07-28 15:13:36 +01:00
Richard Lewis ca5fdff72f Merge pull request #4690 from vector-im/rxl881/widgetPermissions 
Widget permissions styling and icon
 2017-07-28 14:15:41 +01:00
Richard Lewis 317ff8c6af Beta tag styling 2017-07-27 23:02:19 +01:00