Commit Graph

  • 8fa7ec0fac fix lint Bruno Windels 2019-01-07 16:03:24 +01:00
  • 81c48f07c7 clear width of right panel container when collapsed in grid view Bruno Windels 2019-01-07 15:20:39 +01:00
  • b63bd5ea54 allow right panel to be hidden (although container is still visible) Bruno Windels 2019-01-07 14:59:00 +01:00
  • 8a6e7382ae Missing newline Erik Johnston 2018-12-24 15:11:05 +00:00
  • 4c204e88be Add feature flag for counters Erik Johnston 2018-12-24 15:09:10 +00:00
  • 712241d710 Add simple state counters to room heading Erik Johnston 2018-12-24 14:27:50 +00:00
  • 54898a6c35 Fix black-on-black GIF icon for stickers David Baker 2019-01-07 13:49:01 +00:00
  • 44ecaf6177 Merge pull request #2407 from matrix-org/dbkr/logout_warning David Baker 2019-01-07 13:45:30 +00:00
  • 290dc9d8fb Merge branch 'experimental' into bwindels/roomgridview-experimental Bruno Windels 2019-01-07 14:17:57 +01:00
  • 8fbb0607ff Re-write as full class component David Baker 2019-01-07 12:09:19 +00:00
  • 522dddbd13 Lint David Baker 2019-01-07 10:13:02 +00:00
  • 47f303dc9d Make logout warning nag about key backups David Baker 2019-01-07 10:08:57 +00:00
  • 5fb6da886c Merge pull request #2404 from jaywink/jaywink/improve-readme-for-devs Travis Ralston 2019-01-07 01:01:59 -07:00
  • 633b8d419f Mention node 8.x as recommended in development docs Travis Ralston 2019-01-06 15:13:07 +02:00
  • 8dbe87f09b Translated using Weblate (Portuguese (Brazil)) Paulo Miranda 2019-01-06 01:02:54 +00:00
  • aab7b541a1 Translated using Weblate (Basque) Osoitz 2018-12-30 12:03:39 +00:00
  • a7c9d4ea1f Use same link style in HTML messages J. Ryan Stinnett 2019-01-04 18:14:24 -06:00
  • 5419b4279b Simplify create key backup maze J. Ryan Stinnett 2019-01-04 11:16:06 -06:00
  • 2769e68169 Give the create key backup title more space J. Ryan Stinnett 2019-01-04 10:03:14 -06:00
  • 97747640bb Record keys button styling tweak J. Ryan Stinnett 2019-01-04 09:51:20 -06:00
  • e6b6b463ce Merge pull request #2401 from christopherjmedlin/name-command J. Ryan Stinnett 2019-01-04 14:22:40 -06:00
  • e102000e58 Change to 'roomname' instead of 'name'. Christopher Medlin 2019-01-04 11:29:51 -08:00
  • 7b6a51cf9f Merge pull request #2381 from matrix-org/travis/fix-memberlist-order Travis Ralston 2019-01-04 08:13:45 -07:00
  • b045fe7950 Translated using Weblate (Chinese (Traditional)) Jeff Huang 2019-01-02 13:18:23 +00:00
  • e876edcbc3 Clarify readme instructions for developers Jason Robinson 2019-01-04 10:51:39 +02:00
  • 0ebde5266e Appease the linter again Travis Ralston 2019-01-03 22:33:01 -07:00
  • f59625f7bd Fix last active test Travis Ralston 2019-01-03 22:24:24 -07:00
  • 34d5870a03 Appease the linter Travis Ralston 2019-01-03 22:07:09 -07:00
  • 5a2113e1a9 Fix a comparison bug in ordering the MemberList Travis Ralston 2019-01-03 21:56:10 -07:00
  • 77dfba8a22 Add unit tests for MemberList Travis Ralston 2019-01-03 21:55:52 -07:00
  • cc8fa7911b Merge remote-tracking branch 'origin/experimental' into travis/fix-memberlist-order Travis Ralston 2019-01-03 20:01:28 -07:00
  • e1d2065f73 Merge pull request #2403 from matrix-org/travis/fix-status-messages Travis Ralston 2019-01-03 18:23:52 -07:00
  • 93ea9d3617 Condense .mx_RoomTile_avatar properties Travis Ralston 2019-01-03 18:07:34 -07:00
  • 852d6df580 Fix composer avatar being an oval when a custom status is set Travis Ralston 2019-01-03 18:06:37 -07:00
  • 51dc1fe9bf Fix badges on room tiles not being right aligned Travis Ralston 2019-01-03 18:05:32 -07:00
  • 920911c0a1 Room list fixes for custom status J. Ryan Stinnett 2019-01-03 18:36:57 -06:00
  • c89b6e1e27 Add slash command for changing room name Christopher Medlin 2019-01-03 15:42:17 -08:00
  • 46aa543934 Merge pull request #2400 from matrix-org/travis/re-apply-exp-changes Travis Ralston 2019-01-03 16:42:05 -07:00
  • ff2faf7996 Add missing CSS to dharma theme Travis Ralston 2019-01-03 16:32:52 -07:00
  • 502288d4cc Merge branch 'travis/room-list-hover' into travis/re-apply-exp-changes Travis Ralston 2019-01-03 16:28:05 -07:00
  • 1481dcf9d7 Don't re-sort the room list if the user is hovering over it Travis Ralston 2019-01-03 13:57:20 -07:00
  • 42ddea10ba Merge branch 'travis/back-button' into travis/re-apply-exp-changes Travis Ralston 2019-01-03 16:26:18 -07:00
  • 643dd5ca47 Add a comment explaining the reason for setting the LOGGED_IN view Travis Ralston 2019-01-03 14:22:16 -07:00
  • d8f6a7c684 Add missing stopPropagation Travis Ralston 2019-01-02 13:07:40 -07:00
  • 2e5b3ec0f1 Use the safer way to set the logged in view state Travis Ralston 2019-01-02 13:07:10 -07:00
  • 8f5e825cd5 Fix browser navigation not working between /home, /login, /register, etc Travis Ralston 2018-12-20 17:26:13 -07:00
  • 5d3f585c1e Merge pull request #2399 from matrix-org/travis/develop-for-real Travis Ralston 2019-01-03 16:15:53 -07:00
  • 01eacfa26a Regenerate en_EN.json Travis Ralston 2019-01-03 16:02:36 -07:00
  • 8017f0a4a1 Merge remote-tracking branch 'origin/experimental' into travis/develop-for-real Travis Ralston 2019-01-03 16:00:23 -07:00
  • 2fe2e76fa5 Merge pull request #2398 from matrix-org/travis/back-out-bad-merge Travis Ralston 2019-01-03 15:48:42 -07:00
  • 6447a60e1f Revert "Merge pull request #2336 from matrix-org/travis/notif-button" Travis Ralston 2019-01-03 15:44:07 -07:00
  • f928be6f59 Revert "Merge pull request #2395 from matrix-org/dbkr/merge_develop_experimental" David Baker 2019-01-03 18:55:56 +00:00
  • d111fe27bb Revert "Merge pull request #2396 from matrix-org/travis/room-list-hover" Travis Ralston 2019-01-03 14:34:18 -07:00
  • 0978687c65 Revert "Merge pull request #2383 from matrix-org/travis/back-button" Travis Ralston 2019-01-03 14:37:04 -07:00
  • 78592286bd Merge pull request #2383 from matrix-org/travis/back-button Travis Ralston 2019-01-03 14:37:04 -07:00
  • 5098b28672 Merge pull request #2396 from matrix-org/travis/room-list-hover Travis Ralston 2019-01-03 14:34:18 -07:00
  • e5192811a1 Add a comment explaining the reason for setting the LOGGED_IN view Travis Ralston 2019-01-03 14:22:16 -07:00
  • 4c264b87fa Add missing stopPropagation Travis Ralston 2019-01-02 13:07:40 -07:00
  • 7904b91b58 Use the safer way to set the logged in view state Travis Ralston 2019-01-02 13:07:10 -07:00
  • 223a49d81f Don't re-sort the room list if the user is hovering over it Travis Ralston 2019-01-03 13:57:20 -07:00
  • 95844ebf9d Comment out debugging statements Travis Ralston 2018-12-20 14:57:27 -07:00
  • 63a7b86eac Flatten and simplify the memberlist sorting algorithm Travis Ralston 2018-12-20 14:56:18 -07:00
  • 35c9dce241 Fix browser navigation not working between /home, /login, /register, etc Travis Ralston 2018-12-20 17:26:13 -07:00
  • 373c587ef8 Merge pull request #8003 from vector-im/develop David Baker 2019-01-03 18:56:03 +00:00
  • ad47144355 Merge pull request #2395 from matrix-org/dbkr/merge_develop_experimental David Baker 2019-01-03 18:55:56 +00:00
  • 982e037822 Fix merge David Baker 2019-01-03 18:05:38 +00:00
  • 7d161de35b Partial merge of develop to experimental David Baker 2019-01-03 15:02:58 +00:00
  • ca024673b9 Translated using Weblate (Portuguese) Paulo Miranda 2019-01-03 14:53:53 +00:00
  • 255688546c Translated using Weblate (Hungarian) Szimszon 2018-12-25 20:47:01 +00:00
  • ea7b7797a7 Translated using Weblate (French) Kévin C 2019-01-03 10:55:59 +00:00
  • 451743c459 Translated using Weblate (Albanian) Besnik Bleta 2019-01-03 10:48:02 +00:00
  • 90622b58b1 Merge remote-tracking branch 'origin/develop' into develop Weblate 2019-01-03 10:27:40 +00:00
  • c11d0bdf0c Merge pull request #2394 from jryans/key-backup-unverified-creator David Baker 2019-01-03 10:27:35 +00:00
  • ef7d8a6d94 Merge remote-tracking branch 'origin/develop' into develop Weblate 2019-01-03 10:09:38 +00:00
  • 0cc8027fd9 Translated using Weblate (Vietnamese) Le Dang Trung 2018-12-25 04:20:22 +00:00
  • 9e085511fd Merge pull request #7943 from vector-im/dbkr/electron_custom_protocol David Baker 2019-01-03 10:09:31 +00:00
  • 04b5100dcb Merge remote-tracking branch 'origin/develop' into develop Weblate 2019-01-02 22:59:53 +00:00
  • 0bb35944f9 replace expect.createSpy() with jest.fn() Stephen Solka 2018-12-24 21:55:10 -05:00
  • c3185a4cdb breaking changes from expect upgrade Stephen Solka 2018-12-24 21:13:09 -05:00
  • 22167f8538 upgrade expect to 23.6.0 Stephen Solka 2018-12-24 21:02:36 -05:00
  • 5c3d11dddc Merge remote-tracking branch 'origin/develop' into develop Weblate 2019-01-02 22:35:55 +00:00
  • 8e9fcbefff Translated using Weblate (Italian) Silvano 2018-12-29 15:21:01 +00:00
  • 1d5b3df5f1 Translated using Weblate (Chinese (Traditional)) Jeff Huang 2019-01-02 13:18:23 +00:00
  • 758e867208 Merge pull request #2389 from christopherjmedlin/consistent-flair-ordering J. Ryan Stinnett 2019-01-02 16:35:50 -06:00
  • 402f58225f Show in-room reminder when key backup creating device unverified J. Ryan Stinnett 2019-01-02 15:32:14 -06:00
  • 00405e7f22 Use Nunito font from the server only J. Ryan Stinnett 2018-12-31 09:59:08 -06:00
  • 3f6bd1f94b Translated using Weblate (Basque) Osoitz 2018-12-30 12:02:40 +00:00
  • ae175910dd Merge remote-tracking branch 'origin/develop' into develop Weblate 2018-12-29 03:01:23 +00:00
  • a3778dc822 Merge pull request #2387 from matrix-org/travis/fix-build Travis Ralston 2018-12-28 20:01:18 -07:00
  • 135a0884c9 Update scripts/fetchdep.sh J. Ryan Stinnett 2018-12-28 19:42:13 -07:00
  • fb29eff011 Merge remote-tracking branch 'origin/develop' into develop Weblate 2018-12-29 02:16:13 +00:00
  • fbded08050 Translated using Weblate (Polish) Karol Kosek 2018-12-25 10:20:22 +00:00
  • 2340798fcf Translated using Weblate (Hungarian) Szimszon 2018-12-25 20:47:01 +00:00
  • d4aab3dc81 Translated using Weblate (Basque) Osoitz 2018-12-26 10:19:44 +00:00
  • 1b8a8e9552 Merge pull request #2385 from matrix-org/travis/7838-logging Travis Ralston 2018-12-28 19:16:07 -07:00
  • 8f554556f1 Merge pull request #43 from matrix-org/travis/fix-build Travis Ralston 2018-12-28 17:00:58 -07:00
  • 344184f239 Added translation using Weblate (Vietnamese) Le Dang Trung 2018-12-25 03:54:18 +00:00
  • 384320e29f Consistently order flairs based on room configuration. Christopher Medlin 2018-12-24 14:46:36 -08:00
  • ad41229bb6 Merge pull request #7948 from vector-im/toml/experimental-feedback Matthew Hodgson 2018-12-24 09:54:59 +00:00
  • 9d175f9a05 Merge remote-tracking branch 'origin/develop' into develop Weblate 2018-12-24 09:43:08 +00:00