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

Commit Graph

  • e8d5e8c8ab Merge pull request #3246 from vector-im/dbkr/allow_forget_ban David Baker 2017-02-17 16:36:19 +00:00
  • b18473ccb2 Handle there being no member event when banned David Baker 2017-02-17 16:35:18 +00:00
  • 6aa5266029 Merge remote-tracking branch 'origin/develop' into dbkr/allow_forget_ban David Baker 2017-02-17 16:19:15 +00:00
  • 1f5fdf7945 Get a member object, not the user object David Baker 2017-02-17 16:14:51 +00:00
  • a3aea6ba2d Swap rejoin / forget David Baker 2017-02-17 16:11:20 +00:00
  • 9f9de46b10 Add onForgetClick proptype David Baker 2017-02-17 16:09:25 +00:00
  • 03dd25624f Allow forgetting rooms you're banned from David Baker 2017-02-17 15:52:07 +00:00
  • 5abcb91e0d Merge pull request #708 from matrix-org/kegan/clear-cache Kegsay 2017-02-17 15:51:08 +00:00
  • de4773ba93 Show when you've been kicked or banned David Baker 2017-02-17 15:50:30 +00:00
  • 0d1c53285b Merge pull request #3245 from vector-im/dbkr/fix_manifest_icon_paths David Baker 2017-02-17 15:41:49 +00:00
  • 8d6c3cd3f4 Review comments Kegan Dougal 2017-02-17 15:37:49 +00:00
  • aad880b3b5 Fix icon paths in manifest David Baker 2017-02-17 15:31:28 +00:00
  • 0a31efa0b7 Add a 'Clear Cache' button Kegan Dougal 2017-02-17 15:16:28 +00:00
  • 775834b707 Merge pull request #707 from matrix-org/dbkr/update_on_room_name David Baker 2017-02-17 15:10:36 +00:00
  • 5c2049935a Merge pull request #3242 from vector-im/kegan/fix-tests-for-indexeddb Kegsay 2017-02-17 14:54:56 +00:00
  • a3746ea1b6 Merge remote-tracking branch 'origin/develop' into dbkr/update_on_room_name David Baker 2017-02-17 14:41:54 +00:00
  • d876e4482b Fix broken tests caused by adding IndexedDB support Kegan Dougal 2017-02-17 14:32:08 +00:00
  • 75097471b6 Merge pull request #3227 from vector-im/dbkr/add_unban_button Richard van der Hoff 2017-02-17 12:46:13 +00:00
  • 97722af3d6 Merge pull request #698 from matrix-org/dbkr/add_unban_button Richard van der Hoff 2017-02-17 12:46:00 +00:00
  • cc11b3eadc Merge pull request #687 from matrix-org/kegan/indexeddb Kegsay 2017-02-17 11:59:44 +00:00
  • b2344ceb74 Update the room view on room name change David Baker 2017-02-17 11:44:56 +00:00
  • cca266c62c Review comments Kegan Dougal 2017-02-17 10:43:55 +00:00
  • 4753552ddc Merge pull request #706 from matrix-org/luke/fix-team-token-referral-link David Baker 2017-02-16 18:12:46 +00:00
  • b13e6ca022 Merge pull request #705 from matrix-org/luke/rts-default-goto-directory David Baker 2017-02-16 18:10:56 +00:00
  • 406c34b715 Make UserSettings use the right teamToken Luke Barnard 2017-02-16 18:00:52 +00:00
  • 9d2bb70823 If the home page is somehow accessed, goto directory Luke Barnard 2017-02-16 17:03:22 +00:00
  • 53f3b5780e Merge branch 'develop' into kegan/indexeddb Kegan Dougal 2017-02-16 16:10:23 +00:00
  • 8224d7fc60 Oops - remove empty CSS selector David Baker 2017-02-16 15:14:53 +00:00
  • 6945e7c154 Merge pull request #699 from matrix-org/luke/fix-avatar-initials Luke Barnard 2017-02-16 14:06:05 +00:00
  • f2654616eb Merge pull request #3239 from vector-im/luke/css-remove-avatar-initial-z-index Luke Barnard 2017-02-16 13:45:45 +00:00
  • fe4a28b59a Merge pull request #703 from aviraldg/fix-no-invalid-this David Baker 2017-02-16 13:26:31 +00:00
  • f07da44aa5 Don't handle logs db: It needs to close its connections first Kegan Dougal 2017-02-16 12:42:45 +00:00
  • fc0e460222 Remove z-index property on avatar initials Luke Barnard 2017-02-16 11:42:32 +00:00
  • 0e66b370d4 fix eslint's no-invalid-this rule for class properties Aviral Dasgupta 2017-02-16 16:49:00 +05:30
  • 1f77534b32 Merge pull request #701 from matrix-org/luke/rts-allow-non-referrals David Baker 2017-02-16 10:42:27 +00:00
  • 74487c655d If a referrer hasn't been specified, use empty string Luke Barnard 2017-02-16 09:22:44 +00:00
  • ebe7ec4000 Rename RTE labs option to "New Composer & Autocomplete" Aviral Dasgupta 2017-02-15 09:16:17 +05:30
  • 5769213647 Merge pull request #700 from matrix-org/rav/no_logout_on_localstorage_fail Richard van der Hoff 2017-02-15 19:59:30 +00:00
  • bdb8f9d052 Don't force-logout the user if reading localstorage fails Richard van der Hoff 2017-02-15 18:44:15 +00:00
  • 8698d40d3c Fix docs & add MatrixClient check David Baker 2017-02-15 19:01:00 +00:00
  • a5a056292d Revert c082827fc7 David Baker 2017-02-15 18:58:59 +00:00
  • c082827fc7 Fix docs & use WithMatrixClient David Baker 2017-02-15 17:12:51 +00:00
  • 8067bb627f Display avatar initials in typing notifications Luke Barnard 2017-02-15 16:29:08 +00:00
  • 827692b9b0 Merge pull request #3233 from vector-im/luke/css-status-bar-icon-positioning Luke Barnard 2017-02-15 15:56:41 +00:00
  • bfad7612c6 Re-position certain icons in the status bar Luke Barnard 2017-02-15 15:45:24 +00:00
  • 42bb26925d Merge branch 'develop' into dbkr/add_unban_button Richard van der Hoff 2017-02-15 13:19:22 +00:00
  • a5325ee14a Merge pull request #697 from matrix-org/dbkr/missed_accessiblebuttons Richard van der Hoff 2017-02-15 13:10:14 +00:00
  • f1f54c95ab Copyright David Baker 2017-02-14 18:11:36 +00:00
  • 431e7a875d Copyright David Baker 2017-02-14 18:10:40 +00:00
  • 1e1ae5c950 Merge pull request #696 from matrix-org/dbkr/ban_becomes_unban David Baker 2017-02-14 18:00:15 +00:00
  • 5ecf560675 CSS for un-ban button in RoomSettings David Baker 2017-02-14 17:56:42 +00:00
  • 87516fb950 Add a button to un-ban users in RoomSettings David Baker 2017-02-14 17:54:57 +00:00
  • e1cb34e255 Merge remote-tracking branch 'origin/develop' into dbkr/missed_accessiblebuttons David Baker 2017-02-14 17:45:30 +00:00
  • 973b92b8f6 Merge pull request #694 from matrix-org/dbkr/confirm_ban David Baker 2017-02-14 17:31:51 +00:00
  • b9dd419d04 Merge pull request #3224 from vector-im/dbkr/confirm_ban David Baker 2017-02-14 17:31:44 +00:00
  • 6fc70415cb s/onBan/onBanOrUnban/ David Baker 2017-02-14 17:29:40 +00:00
  • 3d4a831624 Merge pull request #695 from matrix-org/luke/fix-scalar-popup Luke Barnard 2017-02-14 17:13:55 +00:00
  • f38b2dee78 Convert some missed buttons to AccessibleButton David Baker 2017-02-14 17:06:16 +00:00
  • 6663f5bff0 Remove commented stuff David Baker 2017-02-14 16:12:04 +00:00
  • ec0ce76d87 Clarify docs David Baker 2017-02-14 16:09:02 +00:00
  • a1c990a2ea Make ban either ban or unban David Baker 2017-02-14 16:03:30 +00:00
  • 0303a42fc7 Fix typo with Scalar popup Luke Barnard 2017-02-14 15:35:14 +00:00
  • 5e232d8500 Argh, ES6 import syntax David Baker 2017-02-14 14:33:21 +00:00
  • ff61b76bf7 Fix imports David Baker 2017-02-14 13:58:29 +00:00
  • 689972f023 Copyright David Baker 2017-02-14 13:57:22 +00:00
  • 324e596e28 CSS for kick/ban confirmation dialog David Baker 2017-02-14 13:42:06 +00:00
  • 8001c0b16b Add confirmation dialog to kick/ban buttons David Baker 2017-02-14 13:40:19 +00:00
  • 76f80e9873 Merge pull request #693 from matrix-org/luke/fix-team-token-undefined Luke Barnard 2017-02-14 13:29:00 +00:00
  • 1b8e93d4f2 Treat the literal team token string "undefined" as undefined Luke Barnard 2017-02-14 12:56:29 +00:00
  • 0e08646d01 Merge pull request #692 from matrix-org/luke/fix-missing-sid Luke Barnard 2017-02-14 11:35:12 +00:00
  • 6996291f0c Store retrieved sid in the signupInstance of EmailIdentityStage Luke Barnard 2017-02-14 11:00:40 +00:00
  • 17b08aedfc Merge pull request #691 from matrix-org/dbkr/interactive_auth_nondialog David Baker 2017-02-14 10:55:12 +00:00
  • 1bc9ba46c7 Merge pull request #3217 from vector-im/dbkr/interactive_auth_nondialog David Baker 2017-02-14 10:55:01 +00:00
  • 43a740df15 Add busy param to docs David Baker 2017-02-14 10:34:43 +00:00
  • ba3e62e395 Remove old docs David Baker 2017-02-14 10:31:56 +00:00
  • 18cba1fe45 Merge pull request #689 from matrix-org/luke/rts-set-team-token-view-home David Baker 2017-02-14 10:21:23 +00:00
  • 36d126f3a9 PR feedback David Baker 2017-02-13 19:09:43 +00:00
  • 8fc3104507 Replace submit button with a spinner when busy David Baker 2017-02-13 18:52:33 +00:00
  • c6ccfa0616 Copyright David Baker 2017-02-13 16:15:27 +00:00
  • 77b226631a Copyright David Baker 2017-02-13 16:15:00 +00:00
  • 9e2793dfed Style for split-out interactive auth David Baker 2017-02-13 16:10:43 +00:00
  • 79d9deb339 Split out InterActiveAuthDialog David Baker 2017-02-13 16:03:21 +00:00
  • 16e3365240 Use a callback prop instead of window. Luke Barnard 2017-02-13 14:36:03 +00:00
  • a21e71f59d Merge pull request #688 from matrix-org/luke/rts-use-sid-client-secret Luke Barnard 2017-02-13 13:49:23 +00:00
  • b45da45457 Merge pull request #686 from matrix-org/luke/rts-enable-branded-urls David Baker 2017-02-13 13:38:55 +00:00
  • 75deb55844 Null check on teamName Luke Barnard 2017-02-13 11:48:03 +00:00
  • 6a7daaf6c4 remove GA, given it's increasingly useless given Riot/Desktop doesn't use it, plus it obviously has privacy implications. It may get re-added as opt-in in future, so we're not sailing entirely blind on how folks use the app, or we may switch to Piwik etc instead. Matthew Hodgson 2017-02-10 17:21:02 +00:00
  • 4ac769168a View /home on registered /w team Luke Barnard 2017-02-10 17:17:58 +00:00
  • 29f5e88f6a Instead of sending userId, userEmail, send sid, client_secret Luke Barnard 2017-02-10 16:50:25 +00:00
  • 33fc4f7d8d Merge pull request #680 from matrix-org/luke/rts-fix-reg-icon David Baker 2017-02-10 16:39:11 +00:00
  • c46f282139 Comments Kegan Dougal 2017-02-10 16:19:39 +00:00
  • f628ee2ef0 Merge branch 'develop' into kegan/indexeddb Kegan Dougal 2017-02-10 16:16:17 +00:00
  • bdd031eac2 Enable branded URLs again by parsing the path client-side Luke Barnard 2017-02-10 15:09:45 +00:00
  • 407bcf1bb9 Delete database on logout. DI a SyncAccumulator. Log uncaught errors Kegan Dougal 2017-02-10 14:22:54 +00:00
  • a5a43bcd93 Merge pull request #685 from matrix-org/luke/rts-session-team-token Luke Barnard 2017-02-10 13:58:03 +00:00
  • ec730056d8 Alter comment Luke Barnard 2017-02-10 11:39:22 +00:00
  • bab6a0b84a Persist query parameter team token across refreshes Luke Barnard 2017-02-10 11:31:04 +00:00
  • b6741d9b10 Merge pull request #3196 from vector-im/luke/rts-thread-team-token David Baker 2017-02-10 10:43:24 +00:00
  • 8bd7d90ca2 Merge pull request #684 from matrix-org/luke/rts-thread-teamToken David Baker 2017-02-10 10:42:59 +00:00
  • 45f5b8b3a9 Thread teamToken through to LeftPanel for "Home" button Luke Barnard 2017-02-10 09:57:28 +00:00