enki/blap
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 6 Wiki Activity

Commit Graph

  • 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
  • 88abe54ffe Give the SRH its prop back Luke Barnard 2017-04-27 17:58:02 +01:00
  • 791f7f7f6b Merge branch 'luke/room-directory-remove-rhs' into luke/room-directory-improve Luke Barnard 2017-04-27 17:57:19 +01:00
  • 0b06e979cb Add optional tintable SVG icon for SimpleRoomHeader Luke Barnard 2017-04-27 17:57:13 +01:00
  • 9d57e8b959 Merge pull request #845 from matrix-org/luke/rm-fix Luke Barnard 2017-04-27 17:01:39 +01:00
  • 6313193aa8 Null check readMarkerEventId, update comment Luke Barnard 2017-04-27 16:52:40 +01:00
  • 50831796bb Remove RHS when viewing RoomDirectory Luke Barnard 2017-04-27 16:49:23 +01:00
  • 5defd0bb74 Merge branch 'develop' of github.com:vector-im/vector-web into develop Luke Barnard 2017-04-27 16:46:21 +01:00
  • e6f694307d add word-break to RoomDirectory Luke Barnard 2017-04-27 16:46:14 +01:00
  • 786fa6b6e7 Merge pull request #846 from matrix-org/luke/fix-rm-stuck-in-mels Richard van der Hoff 2017-04-27 15:22:24 +01:00
  • 2012513c0e Allow MELS to have its own RM Luke Barnard 2017-04-27 14:16:50 +01:00
  • 8f7359fce1 Only show jumpToReadMarker bar when RM !== RR Luke Barnard 2017-04-27 14:03:54 +01:00
  • 021cdb8010 Merge pull request #844 from matrix-org/luke/fire-activity-on-keydown David Baker 2017-04-27 13:47:17 +01:00
  • fc774e8508 Merge pull request #808 from matrix-org/rob/shiny-avatars Matthew Hodgson 2017-04-27 12:02:52 +01:00
  • 39de37b547 *Avatar: Calculate thumbnail dimensions based on devicePixelRatio Robert Swain 2017-04-27 12:38:03 +02:00
  • 8291b36b3e Use document.onkeydown instead of onkeypress Luke Barnard 2017-04-27 10:16:24 +01:00
  • beefcfcb8c Merge pull request #3742 from vector-im/luke/fix-emotes-rrs David Baker 2017-04-26 18:25:27 +01:00
  • 0e880f7971 Merge pull request #842 from matrix-org/luke/fix-emote-rrs David Baker 2017-04-26 18:25:24 +01:00
  • 44d0e7dcba Fix emote RRs alignment Luke Barnard 2017-04-26 18:00:51 +01:00
  • 63224ff164 Add mx_EventTile_emote class Luke Barnard 2017-04-26 18:00:25 +01:00
  • 1913a32fbd Merge pull request #841 from matrix-org/luke/fix-double-dialogs David Baker 2017-04-26 17:47:53 +01:00
  • 0c16298c45 Merge pull request #840 from matrix-org/dbkr/spinner_until_sync_fixed David Baker 2017-04-26 17:39:29 +01:00
  • 5f0ecc588f Fix dialog reappearing after hitting Enter Luke Barnard 2017-04-26 17:37:52 +01:00
  • 4910a225d1 Fix spinner that shows until the first sync David Baker 2017-04-26 17:26:53 +01:00
  • 71685b5eab Merge pull request #3741 from vector-im/dbkr/remove_unused_droptarget_placeholder Luke Barnard 2017-04-26 16:46:48 +01:00
  • 7b3719bc3c Remove unused placeholder prop on RoomDropTarget David Baker 2017-04-26 16:27:25 +01:00
  • 9ac06d4c79 Merge pull request #839 from matrix-org/dbkr/spinner_until_sync Luke Barnard 2017-04-26 14:34:08 +01:00
  • e37ab02706 Merge pull request #838 from matrix-org/dbkr/loggedinview_style Luke Barnard 2017-04-26 14:11:29 +01:00
  • df283dae47 Show spinner until first sync has completed David Baker 2017-04-26 14:05:09 +01:00
  • 04f44e9201 Style fixes for LoggedInView David Baker 2017-04-26 13:48:03 +01:00
  • 5cbf77b53e Merge pull request #834 from matrix-org/dbkr/fix_registration_custom_server Luke Barnard 2017-04-26 10:41:29 +01:00