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

Commit Graph

  • 819e06e2cd MessageComposer styling for Draft Aviral Dasgupta 2016-06-10 04:41:59 +05:30
  • 4e0720db12 Fix MessageComposerInput.setLastTextEntry Aviral Dasgupta 2016-06-10 00:03:40 +05:30
  • 29cdd1fc41 user and room decorators, history & typing notifs Aviral Dasgupta 2016-06-09 23:53:09 +05:30
  • b7f1a3db57 gitignore config.json now it isn't versioned David Baker 2016-06-09 18:51:25 +01:00
  • b60ab9d695 Remove XXX now it's fixed (yay!) David Baker 2016-06-09 18:50:18 +01:00
  • 72b3ce200d Make the room directory join rooms by alias David Baker 2016-06-09 18:49:06 +01:00
  • a030e46c69 Use join_room_by_alias in RoomDirectory David Baker 2016-06-09 17:13:02 +01:00
  • f61cfbc542 Fix RoomDirectory to join by alias whenever possible. David Baker 2016-06-09 16:41:01 +01:00
  • 049e3a968b Merge pull request #303 from matrix-org/rav/factor_out_createroom David Baker 2016-06-09 11:05:22 +01:00
  • 888c0611e8 Merge pull request #302 from matrix-org/rav/guest_device_spinner David Baker 2016-06-09 11:03:40 +01:00
  • de36aa63fb Factor out common parts of room creation Richard van der Hoff 2016-06-08 23:03:46 +01:00
  • 2352661513 MemberInfo: remove spinner if device query fails Richard van der Hoff 2016-06-08 22:54:48 +01:00
  • 98ef793809 Default IS should be vector.im now David Baker 2016-06-09 10:56:14 +01:00
  • bb405563c8 Fix default servers David Baker 2016-06-09 10:54:56 +01:00
  • ef764c112e Merge pull request #300 from matrix-org/rav/device_verification Richard van der Hoff 2016-06-09 10:44:42 +01:00
  • c4b7571c45 Merge pull request #1612 from vector-im/dbkr/optional_config Richard van der Hoff 2016-06-09 10:40:58 +01:00
  • 7700bb0ed9 Merge pull request #301 from matrix-org/dbkr/optional_config Richard van der Hoff 2016-06-09 10:40:47 +01:00
  • 4dd477e064 index.js: fix comment typo Richard van der Hoff 2016-06-09 10:38:51 +01:00
  • f595f6f141 This check shouldn't be here with the || David Baker 2016-06-09 10:25:49 +01:00
  • 24602119c5 This doesn't actually need to be global David Baker 2016-06-09 09:59:37 +01:00
  • 3040d0a474 Comment typo David Baker 2016-06-09 09:57:44 +01:00
  • e4ea00ca23 Return here, else we'll call resolve too David Baker 2016-06-09 09:56:57 +01:00
  • 4fc311da90 Style fix David Baker 2016-06-09 09:56:11 +01:00
  • 05404efa34 Remove if (this.props.config) David Baker 2016-06-09 09:53:37 +01:00
  • 7894e52529 Merge pull request #1610 from vector-im/rav/device_verification Richard van der Hoff 2016-06-08 21:37:35 +01:00
  • 7999a70cab Switch to dev versions of react-sdk and js-sdk Richard van der Hoff 2016-03-24 17:39:49 +00:00
  • 1dfb3f71ae Merge branch 'develop' into rav/device_verification Richard van der Hoff 2016-06-08 21:34:47 +01:00
  • cab24bb14c Switch matrix-js-sdk back to develop Richard van der Hoff 2016-06-08 21:33:38 +01:00
  • 85770feb31 device verification: use a js-sdk event Richard van der Hoff 2016-06-08 21:25:42 +01:00
  • f6aa9a7ea4 Make the config optional David Baker 2016-06-08 18:46:21 +01:00
  • c123f02842 Make the config optional David Baker 2016-06-08 18:45:46 +01:00
  • 7ce49c752f Wire up events to update UI on device verification Richard van der Hoff 2016-06-08 18:35:43 +01:00
  • b3ae9cc9d4 Merge pull request #1609 from vector-im/dbkr/SdkConfig David Baker 2016-06-08 17:34:18 +01:00
  • b5ff247f09 Merge pull request #299 from matrix-org/dbkr/SdkConfig David Baker 2016-06-08 17:34:10 +01:00
  • 5f29729e82 Make unverified encrypted events red and verified ones green Richard van der Hoff 2016-06-08 17:03:54 +01:00
  • e24851456a CSS for the MemberDeviceInfo view Richard van der Hoff 2016-06-08 17:03:28 +01:00
  • 1616431d27 EventTile: add classes to indicate verifiedness Richard van der Hoff 2016-06-08 17:01:13 +01:00
  • f3e66e6fd2 Add device info to member info Richard van der Hoff 2016-06-08 13:13:41 +01:00
  • 086698cd11 Add device info to user settings Richard van der Hoff 2016-06-08 13:09:07 +01:00
  • 1e40fd750f Don't use SdkConfig David Baker 2016-06-08 14:55:47 +01:00
  • 7e8c8dd336 Remove SdkConfig David Baker 2016-06-08 14:54:34 +01:00
  • 12816c5e1f Explanatory comment David Baker 2016-06-07 22:14:56 +01:00
  • d063735c96 Use variable for key name David Baker 2016-06-07 22:07:23 +01:00
  • 33251e6566 Remove default options that shouldn't be part of this PR David Baker 2016-06-07 22:03:31 +01:00
  • ed1554f4af index.js: fix wording in android popup Richard van der Hoff 2016-06-07 22:01:56 +01:00
  • b54376aa2a Add singleton object to hold SDK configuration David Baker 2016-06-07 21:49:06 +01:00
  • aca0e060a4 Also change velocity-vector commit & requires David Baker 2016-06-07 20:47:37 +01:00
  • 8679ce80c8 Update vector velocity fork package name David Baker 2016-06-07 20:28:38 +01:00
  • a4352dee50 Merge pull request #298 from matrix-org/dbkr/velocity_mem_leak2 David Baker 2016-06-07 19:55:41 +01:00
  • 943d7e18e1 Add _ to internal member David Baker 2016-06-07 19:55:24 +01:00
  • d5a522fdfe Second attempt at fixing the Velocity memory leak David Baker 2016-06-07 18:22:01 +01:00
  • c6cf5febd5 Merge pull request #1516 from vith/static-config-json David Baker 2016-06-06 19:15:35 +01:00
  • f9aaf7d903 Use the SdkConfig interface David Baker 2016-06-06 19:13:30 +01:00
  • 15dccd9871 Handle errors with scalar-oauthing David Baker 2016-06-06 17:55:45 +01:00
  • fdcebe1e56 Merge remote-tracking branch 'origin/develop' into dbkr/scalar David Baker 2016-06-06 17:19:38 +01:00
  • a2e73cceee Merge branch 'develop' into matthew/scalar Matthew Hodgson 2016-06-06 10:24:39 +01:00
  • c672919d1e 0.7.3 Matthew Hodgson 2016-06-03 12:20:05 +01:00
  • 7ab2449ac1 Prepare changelog for v0.7.3 Matthew Hodgson 2016-06-03 12:20:04 +01:00
  • e68a2b5e1d pin to react sdk 0.6.3 for release Matthew Hodgson 2016-06-03 12:19:04 +01:00
  • 507f5e2ca1 0.6.3 Matthew Hodgson 2016-06-03 12:17:46 +01:00
  • 9e17c0ddd1 Prepare changelog for v0.6.3 Matthew Hodgson 2016-06-03 12:17:45 +01:00
  • f8b3128645 invite input box wording for amandine Matthew Hodgson 2016-06-02 23:33:55 +01:00
  • ddc4ac187c dep on react-sdk develop Matthew Hodgson 2016-06-02 23:32:47 +01:00
  • 1b3c8481f6 fix dialog prompt an embarassing bug where if 3pid invites triggered a dialog they'd get wedged Matthew Hodgson 2016-06-02 21:07:47 +01:00
  • 532e93d7cb fix up trailing whitespace and put the buttons in the right order Matthew Hodgson 2016-06-02 21:07:04 +01:00
  • e20a1acb88 label our versions sensibly Matthew Hodgson 2016-06-02 19:22:11 +01:00
  • ded66bbdfc 0.7.2 Matthew Hodgson 2016-06-02 19:05:50 +01:00
  • 1a11c402fa Prepare changelog for v0.7.2 Matthew Hodgson 2016-06-02 19:05:50 +01:00
  • 4ec77eeca7 correctly bump dep on js-sdk and react-sdk Matthew Hodgson 2016-06-02 19:04:22 +01:00
  • b06ab78a81 0.6.2 Matthew Hodgson 2016-06-02 18:55:34 +01:00
  • 5ecbd10d36 Prepare changelog for v0.6.2 Matthew Hodgson 2016-06-02 18:55:34 +01:00
  • 168f74d6cf correctly bump dep on js-sdk 0.5.4 Matthew Hodgson 2016-06-02 18:53:50 +01:00
  • 635fd927cd 0.7.1 Matthew Hodgson 2016-06-02 18:41:20 +01:00
  • 481a7b160d Prepare changelog for v0.7.1 Matthew Hodgson 2016-06-02 18:41:20 +01:00
  • 204437e40c 0.6.1 Matthew Hodgson 2016-06-02 18:32:50 +01:00
  • d857859d51 Prepare changelog for v0.6.1 Matthew Hodgson 2016-06-02 18:32:50 +01:00
  • 487f3c72dd fix new 3pid invite UI Matthew Hodgson 2016-06-02 16:59:38 +01:00
  • 5379956b0d jenkins.sh: remove spurious 'npm install' Richard van der Hoff 2016-06-02 16:42:19 +01:00
  • cadedd2919 Revert presumably accidentally comitted config.json David Baker 2016-06-02 14:24:36 +01:00
  • e0bf23fa7c 0.7.0 Richard van der Hoff 2016-06-02 13:42:25 +01:00
  • a53acb3b58 Prepare changelog for v0.7.0 Richard van der Hoff 2016-06-02 13:42:24 +01:00
  • f6ec858ac9 Bump js-sdk and react-sdk for new releases Richard van der Hoff 2016-06-02 13:39:52 +01:00
  • 268cedee0f 0.6.0 Richard van der Hoff 2016-06-02 13:38:19 +01:00
  • 9a77796d77 Prepare changelog for v0.6.0 Richard van der Hoff 2016-06-02 13:38:18 +01:00
  • d812c77fc1 Bump to js-sdk 0.5.3 Richard van der Hoff 2016-06-02 13:36:45 +01:00
  • d976046e6a set email branding whenever emails are added from vector Matthew Hodgson 2016-06-02 13:15:13 +01:00
  • 1d31463140 set email branding after registration Matthew Hodgson 2016-06-02 13:14:52 +01:00
  • 83fd02bdfa specify a brand when registering accounts Matthew Hodgson 2016-06-02 11:50:00 +01:00
  • 1902b631c7 add default branding parameter for email notifs Matthew Hodgson 2016-06-02 11:45:23 +01:00
  • 0ef0120227 Merge pull request #297 from matrix-org/matthew/new-3pid-invite Matthew Hodgson 2016-06-02 11:24:21 +01:00
  • 3b34311e05 implement new UX for 3pid invites Matthew Hodgson 2016-06-01 23:42:34 +01:00
  • 0747ca3923 ignore @ prefixes when sorting memberlist Matthew Hodgson 2016-05-19 23:00:28 +01:00
  • b979a16199 initial version of autocomplete Aviral Dasgupta 2016-06-01 16:54:21 +05:30
  • 272afe39dc do not list rooms by default Matthew Hodgson 2016-06-01 02:03:53 +01:00
  • c3fc76cdaa warn guests to register nicely to upload files Matthew Hodgson 2016-05-31 23:59:36 +01:00
  • e1ba7df66e fix the Add button for email addies Matthew Hodgson 2016-05-31 23:50:21 +01:00
  • 2662ca36f9 fix tag unsetting https://github.com/vector-im/vector-web/issues/1499 - HOW DID THIS EVER WORK?!?! Matthew Hodgson 2016-05-31 21:44:11 +01:00
  • b74d690035 Merge pull request #290 from matrix-org/matthew/multipreview Matthew Hodgson 2016-05-31 19:42:21 +01:00
  • b3638f9169 PR review Matthew Hodgson 2016-05-31 19:42:00 +01:00
  • 96526c22c5 Merge branch 'develop' into feature-rte Aviral Dasgupta 2016-05-29 20:50:33 +05:30