Dima/element-web
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 1 Wiki Activity

Commit Graph

  • c4b4f5a44a Merge remote-tracking branch 'origin/master' into develop Richard van der Hoff 2016-02-25 17:32:59 +00:00
  • 030b8fe113 Merge remote-tracking branch 'origin/0_1_0_fixes' into develop Richard van der Hoff 2016-02-25 17:32:22 +00:00
  • 757f1b228c chmod +x jenkins.sh Richard van der Hoff 2016-02-25 17:25:36 +00:00
  • 8a346dd0ec Remove old tarball before building new one Richard van der Hoff 2016-02-25 17:24:13 +00:00
  • 21410354ab Merge branch 'rav/jenkins_build' into develop Richard van der Hoff 2016-02-25 16:59:44 +00:00
  • de50518282 s/version.txt/git-revision.txt/ Richard van der Hoff 2016-02-25 16:57:34 +00:00
  • c1bb527539 s/version.txt/git-revision.txt/ Richard van der Hoff 2016-02-25 16:50:27 +00:00
  • d9e58d9626 Merge pull request #177 from Half-Shot/develop David Baker 2016-02-25 16:28:21 +00:00
  • 081a975d2a Added ES6 function 'fromCodePoint' to retrive first initial for default avatars that begin with a large unicode character. Will Hunt 2016-02-25 16:23:38 +00:00
  • 78e5adeb2c Merge branch 'master' into 0_1_0_fixes David Baker 2016-02-25 16:18:23 +00:00
  • e3b7330e3f Add CONTRIBUTING.rst file David Baker 2016-02-25 16:17:55 +00:00
  • 025a026f45 Use js-sdk and react-sdk from jenkins artifacts Richard van der Hoff 2016-02-25 15:31:04 +00:00
  • dceb4a9297 Add a 'version.txt' file to the tarball Richard van der Hoff 2016-02-25 15:24:10 +00:00
  • 2e5df1a96f Merge pull request #173 from matrix-org/rav/configurable_sync_limit Richard van der Hoff 2016-02-25 14:19:31 +00:00
  • 46a2d4079d jenkins.sh for react-sdk Richard van der Hoff 2016-02-25 14:18:26 +00:00
  • 49525f22c2 Changelog David Baker 2016-02-25 12:10:30 +00:00
  • 246025a45f Add barebones changelog David Baker 2016-02-25 11:56:13 +00:00
  • 2d977c54ad Add barebones changelog David Baker 2016-02-25 11:56:13 +00:00
  • 4bfae230fc Merge pull request #174 from matrix-org/dbkr/missed_delayedupdate_roomlist David Baker 2016-02-25 11:26:31 +00:00
  • e915d7e215 Change some refreshRoomList() calls to dalyed ones to avoid hammering on catchup. David Baker 2016-02-25 11:06:47 +00:00
  • 642c33e8d9 Mention package script in readme David Baker 2016-02-25 10:47:09 +00:00
  • fa322e8488 Auto-create a sensible version file. Copy the vector dir so we can put it in there rather than creating files in the main vector dir. David Baker 2016-02-24 18:59:33 +00:00
  • 874123bbfa Move package script out and make it tar into a versioned top level directory. It may as well be a shell script since it's unix specific anyway, and maintaining it inside package.json is now impractical. David Baker 2016-02-24 18:41:30 +00:00
  • 10b55036f9 Merge branch 'rav/roomview_works' into develop Richard van der Hoff 2016-02-24 17:26:34 +00:00
  • 87945d2a97 Merge pull request #160 from matrix-org/rav/read_marker Richard van der Hoff 2016-02-24 17:01:29 +00:00
  • c9f9ccc43f Merge branch 'rav/roomview_works' into rav/read_marker Richard van der Hoff 2016-02-24 17:00:49 +00:00
  • 1959b03104 Land refactored roomview branch 'rav/roomview_works'. Richard van der Hoff 2016-02-24 16:52:12 +00:00
  • 1009faf9dc Merge pull request #171 from matrix-org/rav/typing_notifs_cleanups Richard van der Hoff 2016-02-24 16:45:45 +00:00
  • 7a19bad388 Merge pull request #170 from matrix-org/rav/video_resize Richard van der Hoff 2016-02-24 16:45:25 +00:00
  • 4ce3598274 Make the initialSyncLimit configurable Richard van der Hoff 2016-02-24 16:42:23 +00:00
  • b088651211 Use the --tags option so it works with non-annoated tags (seriously, git?) David Baker 2016-02-24 15:05:13 +00:00
  • a69c63cc60 Master is no longer stale. David Baker 2016-02-24 14:25:34 +00:00
  • 04b51f6f0f Merge branch 'develop' David Baker 2016-02-24 14:24:57 +00:00
  • ebd5399626 Bump to version 0.2.0 David Baker 2016-02-24 14:24:15 +00:00
  • 5d63d2269e Use newly released versions of js-sdk & react-sdk David Baker 2016-02-24 14:21:53 +00:00
  • 4b13d71bb4 Bump to 0.1.0 David Baker 2016-02-24 14:14:53 +00:00
  • cd92f0ea62 Use new release of js-sdk David Baker 2016-02-24 14:06:03 +00:00
  • 1e095e105a Don't update state when no change to read marker Richard van der Hoff 2016-02-24 12:53:39 +00:00
  • ef00bc6d56 Manually merge relevant remaining parts of https://github.com/vector-im/vector-web/pull/790 that aren't covered by @richvdh's PR. David Baker 2016-02-24 11:59:29 +00:00
  • 8e25a4ca36 Merge pull request #999 from vector-im/dbkr/more_readme_foolproofing David Baker 2016-02-24 11:50:13 +00:00
  • 1ecedd2769 Add back deployment info David Baker 2016-02-24 11:48:51 +00:00
  • 9c9e260410 Make the README more idiot-proof David Baker 2016-02-24 11:36:57 +00:00
  • 3f9f3e9d92 Merge pull request #998 from vector-im/rav/fix_the_sodding_deployment_instructions David Baker 2016-02-24 11:24:48 +00:00
  • ca89c09e73 formatting Richard van der Hoff 2016-02-23 21:00:27 +00:00
  • 10f6277de2 Update the README to make the development instructions clearer Richard van der Hoff 2016-02-23 20:55:37 +00:00
  • 9db58de119 remove some dead code Richard van der Hoff 2016-02-23 19:09:51 +00:00
  • 4f417f7a82 Merge branch 'rav/roomview_works' into rav/read_marker Richard van der Hoff 2016-02-23 18:56:11 +00:00
  • 029f47d91c Merge branch 'rav/roomview_works' into rav/read_marker Richard van der Hoff 2016-02-23 18:30:42 +00:00
  • 68e0192acc reinstate event-continuation logic Richard van der Hoff 2016-02-23 18:43:51 +00:00
  • 3f51cda846 Register a s a guest even if email invite: this is ok now. David Baker 2016-02-23 18:30:35 +00:00
  • e2bafcbf02 Don't redirect to registration on 3pid invite: it's ok to be a guest now. David Baker 2016-02-23 18:26:15 +00:00
  • f1dd3d381a Merge pull request #172 from matrix-org/dbkr/guest_access_by_default David Baker 2016-02-23 18:12:54 +00:00
  • acb443537a Merge pull request #997 from vector-im/dbkr/fix_new_room_crash David Baker 2016-02-23 18:12:42 +00:00
  • b2b7354018 Comment guest access initial state David Baker 2016-02-23 18:10:48 +00:00
  • 55c7c08ac2 Sender can be null, so null check. David Baker 2016-02-23 17:59:13 +00:00
  • 72393bf75f Merge branch 'rav/read_marker' into develop Richard van der Hoff 2016-02-23 17:57:50 +00:00
  • 418bf8e39c Allow guest access by default (by specifying initial state) as rooms are private by default so they'd have to be invited to join. People can't get a 3pid invite & join as guest without this. David Baker 2016-02-23 17:55:45 +00:00
  • b384d8c91a Merge pull request #168 from matrix-org/dbkr/keypair_3pid_invites David Baker 2016-02-23 16:37:55 +00:00
  • 07822e20cb Don't forceUpdate the whole roomview on typing notifs Richard van der Hoff 2016-02-23 16:17:50 +00:00
  • 7a20fda7e7 Factor out a separate auxpanel, and cleanup the maxHeight management Richard van der Hoff 2016-02-23 15:46:27 +00:00
  • d599c8fbd2 Merge remote-tracking branch 'origin/develop' into rav/roomview_works Richard van der Hoff 2016-02-23 13:37:21 +00:00
  • 2c1b353c18 Merge pull request #169 from matrix-org/rav/regemini_on_status_update Richard van der Hoff 2016-02-23 13:36:54 +00:00
  • e656cbe8f3 Merge branch 'develop' into rav/roomview_works Richard van der Hoff 2016-02-23 13:32:32 +00:00
  • ac4b36c0dd Merge commit '99d2392' into rav/roomview_works Richard van der Hoff 2016-02-23 13:32:23 +00:00
  • 862e3c8c43 Merge commit '3f1db5a' into rav/roomview_works Richard van der Hoff 2016-02-23 13:26:11 +00:00
  • 4a22fb9763 Merge commit '26e6632' into rav/roomview_works Richard van der Hoff 2016-02-23 13:25:09 +00:00
  • 21850d7e2f Merge commit 'd7b3a24' into rav/roomview_works Richard van der Hoff 2016-02-23 13:24:58 +00:00
  • 9eff426819 Merge commit '71e2495' into rav/roomview_works Richard van der Hoff 2016-02-23 13:24:38 +00:00
  • 6aaced04fa Merge commit 'd2a731e' into rav/roomview_works Richard van der Hoff 2016-02-23 13:02:26 +00:00
  • 776b6a26c3 Merge commit '9a0ea56' into rav/roomview_works Richard van der Hoff 2016-02-23 13:02:02 +00:00
  • b1093f3f4b Merge commit 'e972686' into rav/roomview_works Richard van der Hoff 2016-02-23 12:57:53 +00:00
  • 4c571cf1bf Merge commit 'eb91faf' into rav/roomview_works Richard van der Hoff 2016-02-23 12:56:54 +00:00
  • 7f4f30d7d5 Merge commit 'e3feae3' into rav/roomview_works Richard van der Hoff 2016-02-23 12:01:53 +00:00
  • 3acfab48fc Merge commit '014acba' into rav/roomview_works Richard van der Hoff 2016-02-23 12:00:54 +00:00
  • 8161a18efd Merge commit 'b1a6575' into rav/roomview_works Richard van der Hoff 2016-02-23 11:56:51 +00:00
  • 497cb8bc9c Merge pull request #993 from vector-im/dbkr/keypair_3pid_invites David Baker 2016-02-23 11:08:28 +00:00
  • d673249681 Wire up StatusBar size changes to a geminipanel update Richard van der Hoff 2016-02-23 11:06:16 +00:00
  • a063efe250 Remove no-longer accurate comment. David Baker 2016-02-23 10:57:50 +00:00
  • 45c8500f28 Pass through params for other URLs (in this case, for keypair invite signing urls) David Baker 2016-02-23 10:22:22 +00:00
  • ac9f0f204d Wire up support for keypair 3pid invites. David Baker 2016-02-23 10:15:07 +00:00
  • bb6a36b911 Merge pull request #167 from matrix-org/rav/fix_image_load Richard van der Hoff 2016-02-22 17:53:36 +00:00
  • 3f1db5ac86 Merge pull request #166 from matrix-org/rav/keys_on_search_highlights Richard van der Hoff 2016-02-22 17:51:47 +00:00
  • 4158a007db Give <a> elements in search results a key Richard van der Hoff 2016-02-22 17:44:34 +00:00
  • 99d2392b6f Update the scroll offset when images load Richard van der Hoff 2016-02-22 17:19:04 +00:00
  • b04ce6a376 Fix default hs url after it was broken in 77b45e72 Richard van der Hoff 2016-02-22 17:07:26 +00:00
  • 26e66326a2 Link search results to the right room Richard van der Hoff 2016-02-22 12:54:22 +00:00
  • f2fc4a88ae gemini up roomdirectory Matthew Hodgson 2016-02-22 09:35:11 +00:00
  • 77b45e7231 oooooooops - remember opensans v13 Matthew Hodgson 2016-02-22 09:18:56 +00:00
  • 484736bf57 oops, add sanitize-html Matthew Hodgson 2016-02-21 00:05:17 +00:00
  • e91a108738 Merge pull request #972 from vector-im/matthew/room-directory Matthew Hodgson 2016-02-20 23:59:02 +00:00
  • 2ca5529faa support hyperlinked topics Matthew Hodgson 2016-02-20 23:54:47 +00:00
  • a35ab6bcef tart up room directory Matthew Hodgson 2016-02-20 13:36:48 +00:00
  • e33e9b5d4a upgrade OpenSans and add semibold Matthew Hodgson 2016-02-20 13:36:33 +00:00
  • d7b3a24c18 Merge pull request #165 from matrix-org/dbkr/read_receipt_send_ignore_implicit David Baker 2016-02-19 16:20:12 +00:00
  • 71e2495e81 Use new flag in js-sdk to look at the last read receipt the server actually has and ignore implicit ones, otherwise we can end up not sending an RR because we think there's already a more recent one, even though that one is implicit. David Baker 2016-02-19 14:45:02 +00:00
  • b4fe9473d5 improve error messages when failing to talk to a HS Matthew Hodgson 2016-02-19 14:17:35 +00:00
  • c053f90b18 Merge pull request #164 from matrix-org/make_room_links_valid David Baker 2016-02-19 11:40:11 +00:00
  • a44ef5bd48 fix incomingCallBox vertical offset if MatrixToolbar is present Matthew Hodgson 2016-02-19 02:21:17 +00:00
  • 3910877f8f ensure local activity bumps rooms up the roomlist Matthew Hodgson 2016-02-19 02:09:04 +00:00
  • 957ef9cdc8 fix self-highlight Matthew Hodgson 2016-02-19 01:56:03 +00:00