Matrix-Mirrors/schildi-web
1
0
Fork 0
mirror of https://github.com/SchildiChat/element-web.git synced 2024-10-01 01:26:12 -04:00
Code Issues Packages Projects Releases Wiki Activity
3,825 Commits 3 Branches 492 Tags 100 MiB
bbb9dd9228
Commit Graph

3825 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
David Baker
bf716add99 Dedicated classes for the buttons 2017-05-25 12:08:14 +01:00
David Baker
fce1164b58 Align buttons better with the text 2017-05-25 12:08:06 +01:00
David Baker
9b1ffe6fda Remove slightly misleading commented code 2017-05-25 12:07:59 +01:00
David Baker
a5ea19b900 Remove commented code 2017-05-25 12:07:54 +01:00
Luke Barnard
e3342e36c0 Fix RoomSubList (RoomSubListHeader was removed) 2017-05-25 12:07:39 +01:00
David Baker
67ecd94b4a Make bottom left menu buttons use RoleButton too 
Conflicts:
	src/components/structures/BottomLeftMenu.js

cherry-picking commit 2bf0074.
 2017-05-25 12:06:49 +01:00
David Baker
d81f894a50 Add buttons to room sub list headers 
Conflicts:
	src/components/structures/RoomSubList.js
	src/components/structures/RoomSubListHeader.js

cherry-picking commit 095da68.
 2017-05-25 11:58:12 +01:00
David Baker
af305ea540 Make left panel more friendly to new users 
https://github.com/vector-im/riot-web/issues/3609
 2017-05-25 11:42:12 +01:00
David Baker
b95da4a40c No longer need counterpart 
We now use stock counterpart, but indirectly via react-sdk so no
need to depend on it directly.
 2017-05-25 11:40:31 +01:00
David Baker
ee85eb961a Bulk change counterpart imports 
to use react-sdk wrapper function, rather than using counterpart
directly.
 2017-05-25 11:39:56 +01:00
Luke Barnard
365a46777c Remove GuestWarningBar 2017-05-25 11:02:26 +01:00
Luke Barnard
36ec156d2e Merge pull request #4015 from vector-im/luke/new-guest-access-default-welcome 
Implement default welcome page and allow custom URL /w config
 2017-05-25 10:28:55 +01:00
Luke Barnard
e253f86c63 Improve teamToken prop doc on homePage 2017-05-25 10:23:26 +01:00
Luke Barnard
43bd88777c Remove potentially confusing sample config 2017-05-25 10:10:26 +01:00
Michael Telatynski
52a8039eb3 add more generic class for links/highlights within UserSettings 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2017-05-25 01:30:11 +01:00
Luke Barnard
efb6316ba0 Implement default welcome page and allow custom URL /w config 
counterpart to https://github.com/matrix-org/matrix-react-sdk/pull/922
 2017-05-24 17:58:03 +01:00
Michael Telatynski
a98792b05e auto-launch support, ux =checkbox in UserSettings[Electron] 
settings are sorta generic, probably reusable for proxy settings

Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2017-05-24 15:52:08 +01:00
David Baker
aaf948017a Make language dropdown a more sensible width 2017-05-24 14:37:12 +01:00
David Baker
d4aa428321 Move translation status image to i18n section 2017-05-24 14:23:34 +01:00
David Baker
d5425b62a1 Don't inject languages into the config 
If we're defaulting this it should really be by the component
itself or with the other defaukts in SdkConfig, but we've decided
to leave out support for reading languages from the config file as
it's only useful for a Riot admin to restrict the choice of
languages available to users which is of debateable use.
 2017-05-24 11:27:06 +01:00
Michael Telatynski
c63e429c76 Merge branch 'develop' of github.com:vector-im/riot-web into t3chguy/electron_call_sleep 2017-05-24 10:56:36 +01:00
David Baker
ff1567ed2a Remove spurious import 2017-05-23 17:09:09 +01:00
David Baker
af6cc7bf9c I don't really see why this is necessary 2017-05-23 17:06:49 +01:00
David Baker
caca5cc00b Remove c+ped UserSettingsStore functions 
as they don't seem to be necessary
 2017-05-23 17:06:02 +01:00
David Baker
241d95293e Code style fixes 
Use async/await consistently rather than flipping between that and
callbacks, s/var/let/, indenting
 2017-05-23 16:44:54 +01:00
David Baker
a6b11968a4 s/tabs/spaces/ 2017-05-23 16:15:52 +01:00
David Baker
3f3f230a77 Remove accidentally comitted yarn stuff 2017-05-23 14:20:51 +01:00
David Baker
6b6fa59f3e Squash merge https://github.com/vector-im/riot-web/pull/3636 2017-05-23 14:12:53 +01:00
Michael Telatynski
8994c2bad1 missed a concat :) 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2017-05-22 19:28:01 +01:00
Michael Telatynski
e0fb2fd074 /me forgets we don't have babel 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2017-05-22 19:25:56 +01:00
Michael Telatynski
4bb054c955 electron stuff isn't actually using flow, so don't enable it 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2017-05-22 19:25:18 +01:00
Michael Telatynski
911c3bcf6e tidy electron files, they were starting to annoy me 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2017-05-22 19:21:52 +01:00
Michael Telatynski
4944bfdaa2 onAction support in Electron process, disable powersave when in call 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2017-05-22 18:32:39 +01:00
Michael Telatynski
f57d8e4cb9 make ESLint a touch happier 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2017-05-22 18:31:30 +01:00
Michael Telatynski
755c66b9f1 pass dispatcher through to electron, on a whitelist basis 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2017-05-22 18:30:45 +01:00
David Baker
7d59742a22 Merge pull request #3975 from vector-im/t3chguy/riot-desktopt-linux-cat 
add menu category for linux build of app
 2017-05-22 16:59:27 +01:00
Michael Telatynski
6e8516e537 fiiine! 2017-05-22 16:53:46 +01:00
Luke Barnard
299dc7fe84 Merge branch 'develop' into new-guest-access 2017-05-22 16:17:36 +01:00
David Baker
b057e8a92f Merge pull request #3989 from vector-im/luke/new-guest-access-set-pwd-dialog-fuzzy 
Add warm-fuzzy for successful password entry
 2017-05-22 16:15:00 +01:00
Luke Barnard
9fc57786f1 Add warm-fuzzy for successful password entry 2017-05-22 16:11:52 +01:00
David Baker
24584bee4a Merge pull request #3982 from vector-im/luke/new-guest-access-autoFocus-new-password 
autoFocus new password input in SetPasswordDialog
 2017-05-22 15:57:45 +01:00
Luke Barnard
5d712d27d3 autoFocus new password input in SetPasswordDialog 2017-05-22 14:45:40 +01:00
David Baker
73ec3e1f4d Merge branch 'master' into develop 2017-05-22 11:44:31 +01:00
David Baker
86bce146e8 v0.9.10 2017-05-22 11:41:10 +01:00
David Baker
734a28e0f3 Prepare changelog for v0.9.10 2017-05-22 11:41:09 +01:00
David Baker
5c4e3cec08 v0.9.10 2017-05-22 11:40:10 +01:00
David Baker
c03d12238a Released js-sdk & react-sdk 2017-05-22 11:39:25 +01:00
Michael Telatynski
90ab4a02f2 add category so it doesn't get dropped into Default/Lost+Found 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2017-05-20 13:11:31 +01:00
Kieran Gould
cae62c8383 MessageTimestamp now has 12 hour prop 2017-05-19 22:36:02 +01:00
Kieran Gould
1ebe819aa2 Revert _EventTile.scss padding. 2017-05-19 22:29:20 +01:00