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

Commit Graph

  • fcf17adf14 hopefully fix bug186 by ensuring room members never have null users Matthew Hodgson 2016-03-04 16:57:20 +00:00
  • d732927dba Re-enable upgrade registration. David Baker 2016-03-04 15:42:22 +00:00
  • 4da0e2fd95 Re-enable upgrade registration. David Baker 2016-03-04 15:41:32 +00:00
  • 2a1e8ef39b Make audio notifs only play if the sound tweak is set David Baker 2016-03-04 15:29:33 +00:00
  • 0343bd1022 Merge pull request #1098 from ajohnson23/audio_notifications David Baker 2016-03-04 15:27:54 +00:00
  • b75cb3c6cb Added audio/source tags for message notifications. Andrew Johnson 2016-03-03 08:11:46 -05:00
  • bc5ae6a6ad Add shouldComponentUpdate() methods to RoomView and TimelinePanel Richard van der Hoff 2016-03-04 14:51:55 +00:00
  • 31df97e486 Make sure we update the timelinepanel when a read-receipt arrives Richard van der Hoff 2016-03-04 14:47:11 +00:00
  • 1c90288bfb Merge pull request #191 from ajohnson23/audio_notifications David Baker 2016-03-04 14:17:00 +00:00
  • c14b62ee64 Reduce the number of messages we show in the DOM to 250 Richard van der Hoff 2016-03-04 14:07:18 +00:00
  • 3bb824484f Added very basic audio notifications. Andrew Johnson 2016-03-03 08:18:41 -05:00
  • 6e86d7553f Flatten arrays of components before adding to messagepanel li Richard van der Hoff 2016-03-04 13:49:15 +00:00
  • 4a3053a90b Merge pull request #185 from matrix-org/dbkr/threepid_invite_wording David Baker 2016-03-04 11:37:55 +00:00
  • 82cdc15faf unneccessary '+' David Baker 2016-03-04 11:37:37 +00:00
  • 5b505cd32d Remove (broken, as it turns out) permission logic from react sdk and use https://github.com/matrix-org/matrix-js-sdk/pull/94 instead. David Baker 2016-03-03 17:58:41 +00:00
  • 05a3dab528 fix roomavatars on FF Matthew Hodgson 2016-03-03 16:16:40 +00:00
  • 2586280f2c add opera Matthew Hodgson 2016-03-03 15:31:08 +00:00
  • 516647ad04 fix placeholder opacity on moz Matthew Hodgson 2016-03-03 15:31:02 +00:00
  • 04fb8f9a81 de-kegan the CompatibilityPage :( Matthew Hodgson 2016-03-03 15:22:12 +00:00
  • 52f259ccfa explicit fg color for MessageComposer Matthew Hodgson 2016-03-03 15:08:13 +00:00
  • 27fea6bc95 make the newly invited warning prettier Matthew Hodgson 2016-03-03 15:02:11 +00:00
  • f89fe4fff8 when we set an explicit form foreground colour, set an explicit background one too to prevent system-level dark themes on Linux etc making the foreground text unreadable Matthew Hodgson 2016-03-03 14:37:11 +00:00
  • cfd6546fe9 default missing state_default to 50, as per https://github.com/matrix-org/matrix-doc/pull/286/files Matthew Hodgson 2016-03-03 12:11:22 +00:00
  • acaacae697 Fix 3pid invite acceptance with desired wording. David Baker 2016-03-02 16:04:24 +00:00
  • 1522c0ad76 Merge pull request #184 from matrix-org/dbkr/roomheader_unused_voip David Baker 2016-03-02 14:58:16 +00:00
  • 45857fa12c Remove unused voice & video on-clicks from RoomHeader. David Baker 2016-03-02 14:54:38 +00:00
  • adb6ab311c Merge pull request #1069 from vector-im/dbkr/directory_room_metadata David Baker 2016-03-02 14:35:29 +00:00
  • b03e6a8d73 add comment explaining data passing hack David Baker 2016-03-02 14:34:31 +00:00
  • 0051c91126 Merge pull request #183 from matrix-org/dbkr/3pid_invite_metadata David Baker 2016-03-02 14:31:58 +00:00
  • c585b3edee anothert stray room_ David Baker 2016-03-02 14:31:01 +00:00
  • 2271ec7634 Display room metadata from room previews when we come from the public room directory (more hacks to work around the fact that we can't get this data from the HS) David Baker 2016-03-02 14:24:00 +00:00
  • 332354e5b6 Uncommit 71cb04c50a (I failed to branch) David Baker 2016-03-02 14:23:20 +00:00
  • 71cb04c50a Display room metadata from room previews when we come from the public room directory (more hacks to work around the fact that we can't get this data from the HS) David Baker 2016-03-02 14:21:32 +00:00
  • de2eaa3078 Document inviterName David Baker 2016-03-02 14:04:51 +00:00
  • 5827a883bf This should be just oob_data too David Baker 2016-03-02 14:02:36 +00:00
  • 4184158a9a Make comment match reality, attempt 2. David Baker 2016-03-02 14:01:21 +00:00
  • 6319c85272 Make comment match reality David Baker 2016-03-02 13:59:55 +00:00
  • 5bd2316e7f Oops, it's just oob_data here David Baker 2016-03-02 13:58:52 +00:00
  • 2dbed2aa02 Clarify when room / oobData can/can't be set David Baker 2016-03-02 11:59:17 +00:00
  • d61f383748 Oops, actually assign variable David Baker 2016-03-02 11:57:05 +00:00
  • acb5f5d69b This should be props, not state David Baker 2016-03-02 11:56:18 +00:00
  • 7ae2c5b11b Document fields of oob_data David Baker 2016-03-02 11:51:47 +00:00
  • 10b1b6443d Fix rooms we don't have any info about David Baker 2016-03-02 10:59:54 +00:00
  • 9085a2a866 Pass room metadata from 3pid invite emails all the way through to the relevant components so we can display it. David Baker 2016-03-01 18:23:57 +00:00
  • 3718377355 Merge pull request #182 from matrix-org/rav/pagination_race Richard van der Hoff 2016-03-01 11:50:09 +00:00
  • 1e3040d19a Fix a race condition handling gappy syncs Richard van der Hoff 2016-03-01 10:41:56 +00:00
  • dc9a7e5e28 Merge pull request #181 from matrix-org/rav/issue_1049 Richard van der Hoff 2016-02-29 17:51:39 +00:00
  • 559f60d43e unmounted check in TimelinePanel Richard van der Hoff 2016-02-29 14:09:42 +00:00
  • 3b2d0a6c01 Fix up reading the push rules Mark Haines 2016-02-29 16:56:33 +00:00
  • 30abf81ed4 Fix CallView in left panel Richard van der Hoff 2016-02-29 13:43:22 +00:00
  • db1e1c7df0 Fix NPE when re-joining a room Richard van der Hoff 2016-02-26 23:05:41 +00:00
  • acfc7b3719 Don't throw exceptions when room changes in a timelinepanel Richard van der Hoff 2016-02-26 22:38:05 +00:00
  • 731d94eea4 Update the actions of default rules instead of overriding. Mark Haines 2016-02-26 20:51:16 +00:00
  • 543f444174 Merge commit 'd9e58d9' into develop Richard van der Hoff 2016-02-26 16:31:02 +00:00
  • a4402073fb Merge branch 'rav/roomview_works' into develop Richard van der Hoff 2016-02-26 14:04:15 +00:00
  • d5c83347a6 Merge pull request #173 from matrix-org/rav/configurable_sync_limit Richard van der Hoff 2016-02-26 13:55:25 +00:00
  • a9d363c668 Merge pull request #180 from matrix-org/rav/optimise_timeline_load Richard van der Hoff 2016-02-26 13:29:35 +00:00
  • 65ecbf93fe Merge pull request #178 from matrix-org/rav/reset_timeline Richard van der Hoff 2016-02-26 13:28:20 +00:00
  • c4603d3474 Merge pull request #179 from matrix-org/rav/pagination_spinners Richard van der Hoff 2016-02-26 13:28:01 +00:00
  • 0d1c85eb7c Make room-switching quicker Richard van der Hoff 2016-02-26 12:25:46 +00:00
  • c3b819b4da fix the version and improve changelog Matthew Hodgson 2016-02-25 20:12:57 +01:00
  • e634f98a13 Show spinners when forward/back paginating. Richard van der Hoff 2016-02-24 13:38:55 +00:00
  • 4be29401ce Reload the timeline when we get a gappy sync Richard van der Hoff 2016-02-25 18:28:07 +00:00
  • 2bd6529ca0 Merge remote-tracking branch 'origin/develop' into develop Richard van der Hoff 2016-02-25 18:38:14 +00:00
  • 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