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

5082 Commits

Author SHA1 Message Date
Michael Telatynski ffa53ca205 Update manifest.json 2017-05-11 11:17:55 +01:00
Luke Barnard 4c0e8cd372 Merge pull request #3886 from vector-im/luke/auto-reskindex 
Automatically update component-index
 2017-05-11 10:47:06 +01:00
Luke Barnard 6d94f35c33 Automatically update component-index 
Following changes to the react-sdk, reskindex can now be updated using the "-w" (watch) equivalent of the reskindex script.

-Alter npm scripts so that reskindex is run when building once and so that reskindex:start is runwhen developing
-Remove and stop tracking component-index, this will now only be created at build-time
 2017-05-11 10:37:13 +01:00
Luke Barnard ee33490553 Merge pull request #3885 from vector-im/luke/new-guest-access-set-mxid-4 
CSS for mxIdDialog redesign
 2017-05-11 10:28:23 +01:00
Luke Barnard d2ea162b3f Unmuddle the component-index header 2017-05-11 10:11:30 +01:00
Luke Barnard 2eccdf56b9 Merge branch 'develop' into new-guest-access 2017-05-11 09:50:13 +01:00
Luke Barnard ab24994e37 Move general CSS to more specific so as not to affect other dialogs 2017-05-11 09:42:21 +01:00
Luke Barnard 98f62d0300 NL at EOF 2017-05-11 09:40:06 +01:00
Luke Barnard 2e49014ffe CSS for mxIdDialog redesign 2017-05-11 09:33:52 +01:00
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 1b78737f12 Merge pull request #3817 from vector-im/luke/password-nag-bar 
Implement PasswordNagBar
 2017-05-08 15:00:37 +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
Pablo Saavedra 53796f55be Added default_federate property 2017-05-08 12:25:45 +02: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
Luke Barnard 5766a6e93d Give warning icon better alt 2017-05-08 10:02:05 +01:00
Luke Barnard c783f701dd reskindex 2017-05-08 10:01:18 +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
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