Commit Graph

3346 Commits

Author SHA1 Message Date
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
f14c2a0a71 Implement PasswordNagBar
This will tell the user that they need to set a password to return to their account.
2017-05-05 16:30:18 +01:00
David Baker
c27f39714a Dedicated classes for the buttons 2017-05-05 14:26:13 +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
David Baker
1001c98a3c Align buttons better with the text 2017-05-04 18:23:04 +01:00
David Baker
23a141c5ad Remove slightly misleading commented code 2017-05-04 17:46:44 +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
da960e776d Remove commented code 2017-05-04 17:45:11 +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
David Baker
2bf0074953 Make bottom left menu buttons use RoleButton too 2017-05-04 15:38:53 +01:00
David Baker
ff709ed8b1 Fix import 2017-05-04 14:53:13 +01:00
David Baker
cbb32968f1 Merge remote-tracking branch 'origin/develop' into dbkr/left_panel_for_newbies_2 2017-05-04 14:04:33 +01:00
David Baker
095da68aac Add buttons to room sub list headers 2017-05-04 13:58:17 +01:00
Michael Telatynski
c5d37ab2fb add to manifest for #334
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2017-05-03 22:56:39 +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
Michael Telatynski
6367344181 tidy and fix flow notation
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2017-05-02 21:32:34 +01:00
Michael Telatynski
61c338a233 remove leading v in /version file so its semver
and also then consistent with electron versioning

Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2017-05-02 21:32:27 +01:00
Luke Barnard
425719c72e Merge pull request #3762 from vector-im/luke/new-guest-access-set-mxid
CSS for new SetMxIdDialog
2017-05-02 14:15:28 +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
Luke Barnard
d7b2f0d3be CSS for new SetMxIdDialog 2017-04-28 14:32:08 +01:00
David Baker
96c867b34b Make left panel more friendly to new users
https://github.com/vector-im/riot-web/issues/3609
2017-04-28 11:23:13 +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
777087504a Merge branch 'release-v0.9.9' 2017-04-25 11:12:14 +01:00
David Baker
aa482bae28 v0.9.9 2017-04-25 11:08:08 +01:00
David Baker
6fd64d19f0 Prepare changelog for v0.9.9 2017-04-25 11:08:07 +01:00