Commit Graph

  • 1ed1080bf3 Update README with npm run electron Michael Telatynski 2017-05-05 17:05:03 +01:00
  • a09f890619 Merge package.json, match version in electron/package.json Michael Telatynski 2017-05-05 17:03:28 +01:00
  • 499b04c254 Only install electron deps when we're bundling/running electron Michael Telatynski 2017-05-05 17:01:32 +01:00
  • 8a50207189 Change shebang to bash for string manipulations Michael Telatynski 2017-05-05 16:57:18 +01:00
  • f54708227e Proper two package.json format, release.sh bumps 2nd json ver too Michael Telatynski 2017-05-05 16:54:55 +01:00
  • 6f4eb9d8b1 Show password nag bar when user is PWLU Luke Barnard 2017-05-05 16:31:33 +01:00
  • f14c2a0a71 Implement PasswordNagBar Luke Barnard 2017-05-05 16:30:18 +01:00
  • 4fc4ae1e99 Size is a string, import react David Baker 2017-05-05 14:56:26 +01:00
  • 28e0a32d6c Merge pull request #862 from matrix-org/rav/log_device_id Richard van der Hoff 2017-05-05 14:52:49 +01:00
  • c27f39714a Dedicated classes for the buttons David Baker 2017-05-05 14:26:13 +01:00
  • 4a5821e199 Separate classes for the different buttons David Baker 2017-05-05 14:25:18 +01:00
  • e00605571b Fix the spinner to actually appear David Baker 2017-05-05 10:48:54 +01:00
  • e1cd046c1a Prevent zalgo-like text overflowing MELS summary Luke Barnard 2017-05-05 09:54:00 +01:00
  • ae76c76558 Fix #3450 - RM hidden by things Luke Barnard 2017-05-04 21:27:33 +01:00
  • 1001c98a3c Align buttons better with the text David Baker 2017-05-04 18:23:04 +01:00
  • f86ca5bc97 Hide empty tips if collapsed David Baker 2017-05-04 18:08:04 +01:00
  • bfceaa827b Log deviceid at login Richard van der Hoff 2017-05-04 18:04:47 +01:00
  • 8d4663f437 Fix lint in Lifecycle.js Richard van der Hoff 2017-05-04 18:03:35 +01:00
  • 8e3851b380 Merge pull request #860 from t3chguy/patch-4 Luke Barnard 2017-05-04 17:53:59 +01:00
  • 23a141c5ad Remove slightly misleading commented code David Baker 2017-05-04 17:46:44 +01:00
  • 8731e46900 Merge pull request #3808 from vector-im/dbkr/remove_babelcheck Luke Barnard 2017-05-04 17:45:59 +01:00
  • 6e30134403 Merge pull request #861 from matrix-org/dbkr/remove_babelcheck Luke Barnard 2017-05-04 17:45:37 +01:00
  • da960e776d Remove commented code David Baker 2017-05-04 17:45:11 +01:00
  • d419024da9 Merge pull request #3809 from vector-im/rav/include_mx_id_in_rageshake David Baker 2017-05-04 17:30:51 +01:00
  • f76b9b4489 remove link to issue Michael Telatynski 2017-05-04 17:25:23 +01:00
  • 45efdbdd43 Include MXID and device id in rageshakes Richard van der Hoff 2017-05-04 17:21:16 +01:00
  • 7918ff2fc2 Merge pull request #857 from t3chguy/t3chguy/settings_versions_improvements Luke Barnard 2017-05-04 16:56:45 +01:00
  • 7b320f8fbb Remove babelcheck David Baker 2017-05-04 16:51:36 +01:00
  • 396b38512c Remove babelcheck David Baker 2017-05-04 16:50:47 +01:00
  • da4c2f8b31 Guests can't send RR Michael Telatynski 2017-05-04 16:42:41 +01:00
  • e6e2e6989a Merge pull request #3791 from t3chguy/patch-3 David Baker 2017-05-04 16:35:15 +01:00
  • c8b0a15902 Merge pull request #852 from t3chguy/max-len David Baker 2017-05-04 16:24:20 +01:00
  • 3c6e301f7f Improve regex to ignore trailing -dirty and for rc tags Michael Telatynski 2017-05-04 16:22:39 +01:00
  • 909cdb6e9a Depend on prop-types module David Baker 2017-05-04 16:22:06 +01:00
  • 2edfc3e598 remove commented out code as per review Michael Telatynski 2017-05-04 15:51:31 +01:00
  • cb478f1194 no idea why those got in there... Michael Telatynski 2017-05-04 15:50:52 +01:00
  • 72df43d22b Year David Baker 2017-05-04 15:46:24 +01:00
  • 306ea58578 Merge remote-tracking branch 'origin/develop' into dbkr/left_panel_for_newbies_2 David Baker 2017-05-04 15:45:05 +01:00
  • 2bf0074953 Make bottom left menu buttons use RoleButton too David Baker 2017-05-04 15:38:53 +01:00
  • 6a1d0fbab5 Make bottom left menu buttons use RoleButton too David Baker 2017-05-04 15:38:09 +01:00
  • 0998adb366 What year is it? Who's the president? David Baker 2017-05-04 15:02:21 +01:00
  • ff709ed8b1 Fix import David Baker 2017-05-04 14:53:13 +01:00
  • d5b49a11d7 Merge pull request #829 from matrix-org/luke/fix-people-section-disappearing Luke Barnard 2017-05-04 14:15:28 +01:00
  • cbb32968f1 Merge remote-tracking branch 'origin/develop' into dbkr/left_panel_for_newbies_2 David Baker 2017-05-04 14:04:33 +01:00
  • e1c99430cb Merge remote-tracking branch 'origin/develop' into dbkr/left_panel_for_newbies_2 David Baker 2017-05-04 14:04:22 +01:00
  • 095da68aac Add buttons to room sub list headers David Baker 2017-05-04 13:58:17 +01:00
  • ce119a6364 Add buttons to room sub list headers David Baker 2017-05-04 13:55:52 +01:00
  • 694fc26a55 Merge pull request #855 from matrix-org/luke/fix-jump-to-rm-in-mels Luke Barnard 2017-05-04 13:03:30 +01:00
  • 6d9a1f047d Typo Luke Barnard 2017-05-04 13:03:04 +01:00
  • aa639ca061 Merge pull request #858 from t3chguy/patch-3 Luke Barnard 2017-05-04 10:57:17 +01:00
  • bfa3123f9b Combine data-scroll-token and -contained-scroll-tokens Luke Barnard 2017-05-04 10:00:13 +01:00
  • c5d37ab2fb add to manifest for #334 Michael Telatynski 2017-05-03 22:56:39 +01:00
  • 9d92f93fcb consolidate call onPageUnload handler into RoomView Michael Telatynski 2017-05-03 16:36:57 +01:00
  • 356d29939c also warn when quitting mid-call Michael Telatynski 2017-05-03 16:25:27 +01:00
  • b6fd771b9a move implementation to MessageComposer to it applies to any future composers Michael Telatynski 2017-05-03 16:21:35 +01:00
  • 18ba5d3e49 fix typo Michael Telatynski 2017-05-03 12:39:24 +01:00
  • 9997cc9891 import Modal Michael Telatynski 2017-05-02 22:27:30 +01:00
  • d5009962cd Fix scope of callback Michael Telatynski 2017-05-02 22:19:32 +01:00
  • 6367344181 tidy and fix flow notation Michael Telatynski 2017-05-02 21:29:19 +01:00
  • 61c338a233 remove leading v in /version file so its semver and also then consistent with electron versioning Michael Telatynski 2017-05-02 21:24:02 +01:00
  • 74b2c86f93 tidy up UserSettings Michael Telatynski 2017-05-02 21:17:12 +01:00
  • 76e98d4267 improve version hyperlinking removed redundant v prefix (key already says version) links to most applicable version/tag tag-commit -> commit commit1-commit2-commit3 -> commit1 (v)x.y.z -> tag<x.y.z> commit -> commit Michael Telatynski 2017-05-02 21:12:58 +01:00
  • f4bb76922d Merge pull request #856 from matrix-org/luke/fix-phone-number-invalid-feedback Luke Barnard 2017-05-02 19:45:27 +01:00
  • af137f8867 Validate phone number on login Luke Barnard 2017-05-02 18:30:46 +01:00
  • 4febc63aee Add comment to _scrollToToken Luke Barnard 2017-05-02 17:41:09 +01:00
  • fe83a99ab7 Update ScrollPanel docs Luke Barnard 2017-05-02 17:36:59 +01:00
  • 3f25928380 Fix jumping to an unread event when in MELS Luke Barnard 2017-05-02 16:34:39 +01:00
  • 425719c72e Merge pull request #3762 from vector-im/luke/new-guest-access-set-mxid Luke Barnard 2017-05-02 14:15:28 +01:00
  • 863430cf5d Merge pull request #849 from matrix-org/luke/new-guest-access-set-mxid Luke Barnard 2017-05-02 14:12:07 +01:00
  • 13d37e43ff Mock isGuest Luke Barnard 2017-05-02 10:14:54 +01:00
  • 4f71f4c331 Store mx_pass at the same point as access_token Luke Barnard 2017-05-02 10:07:06 +01:00
  • a887af9f92 copyright Luke Barnard 2017-05-02 09:56:14 +01:00
  • 4f72450847 Merge pull request #827 from t3chguy/develop Matthew Hodgson 2017-04-30 13:40:27 +01:00
  • 9f3c1deae6 Merge pull request #3775 from t3chguy/patch-1 Matthew Hodgson 2017-04-30 13:11:33 +01:00
  • 4a8ad53bd9 Pin filesize ver to fix break upstream Michael Telatynski 2017-04-30 13:11:01 +01:00
  • e11dd23026 Merge pull request #854 from t3chguy/patch-2 Matthew Hodgson 2017-04-30 13:08:56 +01:00
  • c8fb18dc93 Pin filesize ver to fix break upstream Michael Telatynski 2017-04-30 13:00:47 +01:00
  • 7676fd960e Merge branch 'develop' into forward_message Michael Telatynski 2017-04-30 12:35:52 +01:00
  • 86a5ff42e9 Change max-len 90->120 Michael Telatynski 2017-04-29 14:22:06 +01:00
  • daae3bd1ec warn on unload when uploading file(s) Michael Telatynski 2017-04-29 06:25:30 +01:00
  • 6685cbcb25 make MessageComposerInput (new and old) warn on unload new needs binding due to class this ref being softer couldn't do this nicely in MessageComposer/Input as isTyping wasn't propagated. Michael Telatynski 2017-04-29 06:13:03 +01:00
  • 67efb8bde2 Add date tooltip to timestamps Matthew Hodgson 2017-04-29 00:00:29 +01:00
  • c6262d62a6 webrtc config electron Michael Telatynski 2017-04-28 18:21:22 +01:00
  • d7b2f0d3be CSS for new SetMxIdDialog Luke Barnard 2017-04-28 14:32:08 +01:00
  • 5a5768a4ec Try to fix tests Luke Barnard 2017-04-28 13:38:35 +01:00
  • d12b1903f2 Fix defer promise logic Luke Barnard 2017-04-28 13:29:30 +01:00
  • 6dff4a4415 Return early after cancelled mxid dialog Luke Barnard 2017-04-28 13:28:34 +01:00
  • 8774100508 Initial implementation: SetDisplayName -> SetMxIdDialog Luke Barnard 2017-04-28 13:22:55 +01:00
  • 96c867b34b Make left panel more friendly to new users David Baker 2017-04-26 19:00:07 +01:00
  • 4eb0ca63a9 Revert commits acciderntally put on develop David Baker 2017-04-28 11:22:05 +01:00
  • 73fb2c859e Remove now-redundant grey CSS David Baker 2017-04-28 11:20:55 +01:00
  • 083d5bf463 Other empty sections no longer need to be greyed David Baker 2017-04-28 11:20:29 +01:00
  • 431b8aaefa Make left panel more friendly to new users David Baker 2017-04-26 19:00:07 +01:00
  • f5f35e3294 Make the left panel more friendly to new users David Baker 2017-04-26 18:59:16 +01:00
  • 47827e0b81 un-eat the space Michael Telatynski 2017-04-28 01:00:50 +01:00
  • c9c72036f3 Change wording Michael Telatynski 2017-04-28 01:00:10 +01:00
  • 19482d751d comment out spammy CTD logging Matthew Hodgson 2017-04-28 00:52:31 +01:00
  • b91f53652d Merge pull request #848 from matrix-org/luke/room-directory-improve David Baker 2017-04-27 18:28:28 +01:00
  • b637ab33cc Merge pull request #3751 from vector-im/luke/room-directory-improve David Baker 2017-04-27 18:28:25 +01:00
  • afb4b79d81 Improve Room Directory Look & Feel Luke Barnard 2017-04-27 18:04:41 +01:00