Commit Graph

  • ff1513bec5 Merge branch 'master' into report-failed-join report-failed-join Austen Adler 2018-02-01 15:23:52 -0500
  • 4cd066540b Allow custom port for homeserver allow-custom-homeserver-port Austen Adler 2017-10-24 16:49:51 -0400
  • 5a051ebdad Add option to disable printing image url in telegram no-show-image-url Austen Adler 2017-10-30 11:09:19 -0400
  • a4ff6e81c8
    Merge pull request #43 from vurpo/master master Sijmen Schoon 2017-11-04 15:50:02 +0100
  • cd1d66ffee Revert .gitignore to correct version Max Sandholm 2017-11-02 15:36:17 +0200
  • ccbbe5ce73 Implement bot-owners feature bot-owners Austen Adler 2017-10-30 11:08:40 -0400
  • 845af9008c Ignore asconfig.yaml ignore-asconfig develop Austen Adler 2017-10-30 10:39:47 -0400
  • e5545ac9be Merge branch 'bot-owners' into develop Austen Adler 2017-10-30 10:39:05 -0400
  • c25e34ebc3 Fix small config load issue with bot owners Austen Adler 2017-10-30 10:38:57 -0400
  • 532c3af254 Merge branch 'bot-owners' into develop Austen Adler 2017-10-30 10:32:19 -0400
  • 9ce2aa35ca Final if fix Austen Adler 2017-10-30 10:31:23 -0400
  • b8e3eb6bf4 Merge branch 'bot-owners' into develop Austen Adler 2017-10-30 10:27:24 -0400
  • b41badee88 Correct bot-owner if statements Austen Adler 2017-10-30 10:27:17 -0400
  • 7da7bc0baa Merge branch 'no-show-image-url' into develop Austen Adler 2017-10-30 10:19:14 -0400
  • ac924fa420 Fix json formatting Austen Adler 2017-10-30 10:19:10 -0400
  • 55f0487391 Merge branch 'report-failed-join' into develop Austen Adler 2017-10-30 10:14:51 -0400
  • 8ad042dbb9 Merge no-show-image-url Austen Adler 2017-10-30 10:14:32 -0400
  • fad2be42ef Merge branch 'bot-owners' into develop Austen Adler 2017-10-30 10:10:32 -0400
  • f44c06daa0 Implement no-show-image-url Austen Adler 2017-10-30 10:09:45 -0400
  • af7731f00e Document no-show-image-url Austen Adler 2017-10-30 10:09:35 -0400
  • e20654668b Implement bot owners Austen Adler 2017-10-26 11:54:51 -0400
  • 30b5c6d3c6 Document bot-owners to allow some users to send messages without a prefix Austen Adler 2017-10-26 11:39:06 -0400
  • 7b8def4107 Log to console when a user cannot join a room Austen Adler 2017-10-26 11:26:51 -0400
  • 2b186ad31c Merge remote-tracking branch 'upstream/master' Max Sandholm 2017-10-25 13:23:51 +0300
  • 67647026ac Allow custom port for homeserver Austen Adler 2017-10-24 16:49:51 -0400
  • 8e85ba99e5 Make Matrix AS port configurable. Fixes #35 Sijmen Schoon 2017-10-19 00:39:31 +0200
  • 24e8ae9670 Merge pull request #41 from expectocode/typo Sijmen Schoon 2017-10-15 23:43:54 +0200
  • 9bdba4108f Fix 'brigde' typo Tanuj 2017-10-15 19:41:09 +0100
  • 9e003f8ff9 Remove "(Telegram)" from mentions Max Sandholm 2017-09-21 14:42:12 +0300
  • e98b7312f6 Correctly use the re.sub function Max Sandholm 2017-09-21 14:39:50 +0300
  • 3a21a819b9 Merge branch 'master' of github.com:vurpo/telematrix Max Sandholm 2017-09-21 13:36:49 +0200
  • 828f92e37b Fix escaping error Max Sandholm 2017-09-21 14:36:37 +0300
  • 2ee824f4ca Merge branch 'master' of github.com:vurpo/telematrix Max Sandholm 2017-09-21 13:31:33 +0200
  • 8e422d683b Merge branch 'master' of github.com:vurpo/telematrix Max Sandholm 2017-09-21 13:30:23 +0200
  • d537cfb1b3 Fix quoting formatting and change Matrix->Telegram username formatting Max Sandholm 2017-09-21 13:29:26 +0200
  • 09945d75cc Replace Matrix mentions with Telegram mentions (ping) Max Sandholm 2017-09-21 13:50:17 +0300
  • b0aeb11e8a Merge branch 'master' of https://github.com/SijmenSchoon/telematrix Max Sandholm 2017-09-21 11:13:44 +0300
  • 5a4b21db77 Add some documentation for bridging rooms (#30) Jan Christian Grünhage 2017-09-05 14:20:48 +0200
  • 18c5a5cd7b Update bridged displaynames and profile pictures (#27) Max Sandholm 2017-04-22 12:33:33 +0300
  • fea8d89493 Fix aliases-related breakage Max Sandholm 2017-04-08 13:32:19 +0300
  • 15e84f6861 Handle users without profile pictures correctly Max Sandholm 2017-04-04 00:07:07 +0300
  • fc65d5f0f5 Telegram profile pictures and display names are updated Max Sandholm 2017-04-03 20:56:56 +0300
  • 89779b4da7 Added reply bridging (#26) Max Sandholm 2017-03-05 13:51:32 +0200
  • b67d0733d9 Add rudimentary sticker support (#25) Max Sandholm 2017-02-20 01:19:40 +0200
  • 7cfac1504c Fix tiny mistake Sijmen Schoon 2017-01-20 16:38:53 +0000
  • 995f0a6e3d Fix image replies and image captions. Sijmen Schoon 2017-01-20 16:35:09 +0000
  • fcdc5a2fd2 Add image extension if missing, fix join swallowing msgs Sijmen Schoon 2017-01-09 18:46:53 +0000
  • 88769a95b7 Hardcode images to jpeg Sijmen Schoon 2017-01-05 16:25:27 +0000
  • 8fc4b5902b Fix some crashes Sijmen Schoon 2017-01-05 01:08:02 +0000
  • 2d317d1044 Merge branch 'master' of github.com:SijmenSchoon/telematrix Sijmen Schoon 2016-11-27 10:18:56 +0000
  • cba7594283 Discard old Matrix messages and reduce verbosity Sijmen Schoon 2016-11-27 10:18:49 +0000
  • 023367b72b Fix no-member error in matrix_room Sijmen Schoon 2016-11-27 01:20:41 +0100
  • 5bcaf1ba74 Phase out TELEGRAM_CHATS and MATRIX_ROOMS Sijmen Schoon 2016-11-27 01:13:09 +0100
  • ad842ada4d Fix links not getting added to the database Sijmen Schoon 2016-11-27 00:07:40 +0000
  • c705e8823c Add try-except around matrix_transaction Sijmen Schoon 2016-11-22 15:59:29 +0000
  • bc5269c7be Support displayname changes Sijmen Schoon 2016-11-17 10:33:22 +0000
  • 29fa9086c6 Fix crash Sijmen Schoon 2016-11-16 14:08:55 +0000
  • a1ca8d48cd Fix CI Sijmen Schoon 2016-11-16 14:47:13 +0100
  • 6ef0a343c8 Move files to a module Sijmen Schoon 2016-11-16 13:50:13 +0100
  • 3324257e35 Add last bit of configuration documentation. Sijmen Schoon 2016-11-15 15:26:21 +0100
  • 354b44a07e Add asconfig explanation to README.md Sijmen Schoon 2016-11-15 10:12:30 +0100
  • 7e17dd60c2 Remove random spacing in readme Sijmen Schoon 2016-11-15 10:07:52 +0100
  • 34febdac1f Fix readme Sijmen Schoon 2016-11-15 10:06:41 +0100
  • 5af3faf9a3 Improve forward and reply messages Sijmen Schoon 2016-11-15 08:28:42 +0100
  • fe5f913ab9 Fix Telegram forwards Sijmen Schoon 2016-11-15 07:00:00 +0000
  • 9f805b87cb Add database to gitignore Sijmen Schoon 2016-11-15 07:53:43 +0100
  • e9f166ee1b Add a bit more documentation Sijmen Schoon 2016-11-15 07:45:09 +0100
  • fa390b69c5 Make Google API token optional Sijmen Schoon 2016-11-15 07:36:36 +0100
  • 935fada1c5 Use a database for links, allowing for automatic configuration Sijmen Schoon 2016-11-15 00:52:00 +0100
  • 08c8a88721 Add travis pylint CI Sijmen Schoon 2016-11-14 11:22:14 +0100
  • df535efdc1 Replace hyphens with emdashes Sijmen Schoon 2016-11-14 11:14:36 +0100
  • 68b6bbe6a4 Merge pull request #10 from Flippylosaurus/master Sijmen Schoon 2016-11-14 11:09:48 +0100
  • 873bd6f101 Remove trailing space Sijmen Schoon 2016-11-14 11:07:26 +0100
  • 186cad8931 Add requirements.txt and update README a bit Sijmen Schoon 2016-11-14 11:06:16 +0100
  • 0f39b8881c Merge branch 'master' of github.com:SijmenSchoon/telematrix Sijmen Schoon 2016-11-12 02:33:59 +0000
  • 8bb396b44e Several improvements Sijmen Schoon 2016-11-12 02:33:51 +0000
  • dad1d6a37a Merge pull request #8 from Flippylosaurus/master Sijmen Schoon 2016-10-08 18:15:06 +0200
  • 0fd1d45e9b added example configuration Hillebrand van de Groep 2016-10-08 18:08:59 +0200
  • 3b1c26cb7d Merge branch 'master' of github.com:SijmenSchoon/telematrix Sijmen Schoon 2016-09-26 11:59:47 +0200
  • 7230fa1466 Add missing ) Sijmen Schoon 2016-09-26 11:59:38 +0200
  • 2e027e425f Update README.md Sijmen Schoon 2016-09-26 11:34:46 +0200
  • 1dfbd81ebc Add missing await to m.image handler Sijmen Schoon 2016-09-26 11:30:39 +0200
  • 37a8c63502 Fix url shortener Sijmen Schoon 2016-09-26 04:11:18 +0200
  • a0c111c1ea Add missing await to m.image matrix->tg Sijmen Schoon 2016-09-26 04:02:26 +0200
  • 9c91711740 Possibly fix image sending bug Sijmen Schoon 2016-09-26 04:00:23 +0200
  • e883055e61 Major refactor Sijmen Schoon 2016-09-26 03:52:59 +0200
  • 9052cac2e8 Create README.md Sijmen Schoon 2016-09-26 02:30:15 +0200
  • ff1c6bf883 Fix forward/reply grammar Sijmen Schoon 2016-09-26 00:56:22 +0200
  • a6007a8902 Support Tg forwards and replies Sijmen Schoon 2016-09-25 22:59:54 +0200
  • e62fa9ceb3 Initial commit Sijmen Schoon 2016-09-13 16:17:11 +0200