David Baker
e67e891040
Merge pull request #3877 from vector-im/t3chguy/electron_install_fix
...
move electron -> electron_app because npm smart
2017-05-10 13:48:18 +01:00
Michael Telatynski
c607b1bc89
npm is "smart" enough to try and install our electron wrapper as a module
...
instead of the actual electron package. With no way to ignore directories.
I'd like to think of this as temporary, until I get to rip apart riot-web
and riot-electron
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2017-05-10 13:36:27 +01:00
Richard van der Hoff
41738ec025
Merge pull request #3863 from vector-im/rav/bug_report_endpoint
...
Fix bug report endpoint in config.sample.json.
2017-05-09 12:34:40 +01:00
Richard van der Hoff
f9ae456a64
Fix bug report endpoint in config.sample.json.
...
Not sure why this was like this - has vector.im/bugs *ever* worked?
2017-05-09 12:27:41 +01:00
David Baker
2983b36d4c
Merge pull request #3851 from vector-im/dbkr/missed_icons
...
Update 2 missed icons to the new icon
2017-05-08 13:12:00 +01:00
David Baker
640aa98cf4
Update 2 missed icons to the new icon
...
Electron icons for windows & Linux. Also add them to the script
that makes all the icon versions.
2017-05-08 13:05:17 +01:00
David Baker
e6133820a2
Merge pull request #3804 from vector-im/dbkr/left_panel_for_newbies_2
...
Make left panel better for new users (mk II)
2017-05-08 10:37:59 +01:00
Matthew Hodgson
d1db602b3a
Merge pull request #3839 from vector-im/t3chguy/patch-1
...
match primary package.json
2017-05-07 20:34:18 +01:00
Michael Telatynski
ea72e9c7a0
match primary package.json
...
got mismatched after a release -> develop merge
2017-05-07 20:33:13 +01:00
Matthew Hodgson
8e94d5240f
merge master into develop post 0.9.9
2017-05-07 19:58:42 +01:00
Matthew Hodgson
1e5908a31e
speed up burndown generation by ~250x
2017-05-07 19:34:16 +01:00
David Baker
40c98fc84f
Merge pull request #3829 from vector-im/t3chguy/productName-missing
...
Re-add productName
2017-05-06 12:20:30 +01:00
Michael Telatynski
9c6b3819a5
Re-add productName
...
so that electron-builder packages is as Riot rather than riot-web
2017-05-06 10:24:13 +01:00
David Baker
6013a3e71d
Merge pull request #3683 from t3chguy/t3chguy/electron_version_inconsistency
...
Remove leading v in /version file, for SemVer and to match Electron ver
2017-05-05 18:28:16 +01:00
David Baker
0deed1b511
Merge pull request #3790 from t3chguy/patch-2
...
Fix scope of callback
2017-05-05 18:25:29 +01:00
David Baker
2c36506342
Merge pull request #3622 from t3chguy/t3chguy/electron-persist-window-layout
...
Remember and Recall window layout/position state
2017-05-05 18:23:15 +01:00
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
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
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
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
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