Commit graph

  • 6383580e6f Do not re-query mentions from serializers (#6858) Eugen Rochko 2018-03-22 11:31:17 +0100
  • 9fe1619db9
    Do not re-query mentions from serializers (#6858) Eugen Rochko 2018-03-22 11:31:17 +0100
  • f4e8e39c99 Restore username validation to disallow dots, for now (#6863) Eugen Rochko 2018-03-22 11:30:22 +0100
  • da70aca28e
    Restore username validation to disallow dots, for now (#6863) Eugen Rochko 2018-03-22 11:30:22 +0100
  • 7d7a725e82 Fix MENTION_RE to not match nil usernames (#6862) ThibG 2018-03-22 10:45:48 +0100
  • 6f531d140b Fix MENTION_RE to not match nil usernames (#6862) ThibG 2018-03-22 10:45:48 +0100
  • 692d03239b Hide floating action button on thread views (#6859) Eugen Rochko 2018-03-22 09:33:14 +0100
  • f66a786029
    Hide floating action button on thread views (#6859) Eugen Rochko 2018-03-22 09:33:14 +0100
  • fe6b28185f Merge remote-tracking branch 'personal/merge/tootsuite/master' into gs-master David Yip 2018-03-21 13:39:31 -0500
  • 9c3e4bdead
    Merge remote-tracking branch 'personal/merge/tootsuite/master' into gs-master David Yip 2018-03-21 13:39:31 -0500
  • a9bcd383b8 Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master Jenkins 2018-03-21 17:17:20 +0000
  • 6290cd7969 Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master Jenkins 2018-03-21 17:17:20 +0000
  • e62904bcba Update sanitize and loofah (#6855) Patrick Figel 2018-03-21 17:43:28 +0100
  • d97903a358 Update sanitize and loofah (#6855) Patrick Figel 2018-03-21 17:43:28 +0100
  • 53b1100144 Permit dots in usernames with conditions (#6844) Eugen Rochko 2018-03-21 10:26:53 +0100
  • 93897134ca
    Permit dots in usernames with conditions (#6844) Eugen Rochko 2018-03-21 10:26:53 +0100
  • dbd18c5cfe Remove debug option from Babel preset env (#6852) Akihiko Odaki 2018-03-21 18:26:15 +0900
  • a6b59cd1a3 Remove debug option from Babel preset env (#6852) Akihiko Odaki 2018-03-21 18:26:15 +0900
  • 8ccf42c149 Bump version to 2.3.2rc4 Eugen Rochko 2018-03-20 23:49:24 +0100
  • f64af6473f
    Bump version to 2.3.2rc4 Eugen Rochko 2018-03-20 23:49:24 +0100
  • b1453c0dbf Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master Jenkins 2018-03-20 19:17:20 +0000
  • e8aeec4fea Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master Jenkins 2018-03-20 19:17:20 +0000
  • 59b3b38b0e Add LDAP_TLS_NO_VERIFY option, don't require LDAP_ENABLED outside .env (#6845) Eugen Rochko 2018-03-20 19:41:51 +0100
  • ac49c7932d
    Add LDAP_TLS_NO_VERIFY option, don't require LDAP_ENABLED outside .env (#6845) Eugen Rochko 2018-03-20 19:41:51 +0100
  • 15ae3500aa Merge pull request #396 from ThibG/glitch-soc/fixes/compose-suggestions David Yip 2018-03-20 10:48:33 -0500
  • 2649cce3a0
    Merge pull request #396 from ThibG/glitch-soc/fixes/compose-suggestions David Yip 2018-03-20 10:48:33 -0500
  • a4d7afa3d9 Fix i18n fallback configuration conflicts with environment configurations (#6843) Akihiko Odaki 2018-03-21 00:36:20 +0900
  • 61dcb686a8 Fix i18n fallback configuration conflicts with environment configurations (#6843) Akihiko Odaki 2018-03-21 00:36:20 +0900
  • ab96a9ff11 Use username/domain to match existing accounts in ActivityPub (#6842) Eugen Rochko 2018-03-20 14:57:46 +0100
  • 9381a7d9d5
    Use username/domain to match existing accounts in ActivityPub (#6842) Eugen Rochko 2018-03-20 14:57:46 +0100
  • 5857c632ef [Glitch] Cancel outdated pending compose suggestions Thibaut Girka 2018-03-20 14:17:49 +0100
  • 12b0ea0667 [Glitch] Cancel outdated pending compose suggestions Thibaut Girka 2018-03-20 14:17:49 +0100
  • ca370217ad Cancel outdated pending compose suggestions (#6838) ThibG 2018-03-20 12:40:12 +0100
  • a5c6c748e0 Cancel outdated pending compose suggestions (#6838) ThibG 2018-03-20 12:40:12 +0100
  • 4c91be94d3 request: in the event of failure, try other IPs (#6761) (#6813) Rey Tucker 2018-03-20 04:06:08 -0400
  • 36b5703796 request: in the event of failure, try other IPs (#6761) (#6813) Rey Tucker 2018-03-20 04:06:08 -0400
  • db7e974589 Merge remote-tracking branch 'personal/merge/tootsuite/master' into gs-master David Yip 2018-03-19 15:41:59 -0500
  • 0fa0836e63
    Merge remote-tracking branch 'personal/merge/tootsuite/master' into gs-master David Yip 2018-03-19 15:41:59 -0500
  • bdeaef116e Merge pull request #394 from ashkitten/compressed-notifs David Yip 2018-03-19 15:41:09 -0500
  • c074b226b6
    Merge pull request #394 from ashkitten/compressed-notifs David Yip 2018-03-19 15:41:09 -0500
  • eba1b109db Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master Jenkins 2018-03-19 20:17:18 +0000
  • df70571bfe Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master Jenkins 2018-03-19 20:17:18 +0000
  • 99790407e2 Serialize mentions in the order they are added (#6836) ThibG 2018-03-19 20:19:35 +0100
  • ff6b8a6443 Serialize mentions in the order they are added (#6836) ThibG 2018-03-19 20:19:35 +0100
  • c4c87b8ee8 Display content warning in mail notification emails (#6832) ThibG 2018-03-19 20:12:20 +0100
  • 6b76a6212d Display content warning in mail notification emails (#6832) ThibG 2018-03-19 20:12:20 +0100
  • af08f6042d rename pam email environment variable to something more understandable and default to LOCAL_DOMAIN (better fallback) (#6833) Alexander 2018-03-19 20:09:26 +0100
  • 33ee347c99 rename pam email environment variable to something more understandable and default to LOCAL_DOMAIN (better fallback) (#6833) Alexander 2018-03-19 20:09:26 +0100
  • 4fc9827b69 bugfixes and gem update (#6831) Alexander 2018-03-19 20:08:56 +0100
  • 0306e3e9be bugfixes and gem update (#6831) Alexander 2018-03-19 20:08:56 +0100
  • 720a45e99f Fix e-mail changed notification (fixes #6778) (#6835) ThibG 2018-03-19 20:07:47 +0100
  • 357f9298bd Fix e-mail changed notification (fixes #6778) (#6835) ThibG 2018-03-19 20:07:47 +0100
  • 9bdedcfa48 Weblate translations 20180319 (#6827) Renato "Lond" Cerqueira 2018-03-19 15:12:06 +0100
  • f7c46fc113 Weblate translations 20180319 (#6827) Renato "Lond" Cerqueira 2018-03-19 15:12:06 +0100
  • fd86b58568 Bump version to 2.3.2rc3 Eugen Rochko 2018-03-19 12:20:57 +0100
  • 74c39fada0
    Bump version to 2.3.2rc3 Eugen Rochko 2018-03-19 12:20:57 +0100
  • 4b0f6c677e fix .status__info__icons layout Ash Lea 2018-03-18 23:49:30 -0400
  • 5b00b8f0da fix .status__info__icons layout Ash Lea 2018-03-18 23:49:30 -0400
  • b0993a5fdf Merge remote-tracking branch 'origin/master' into gs-master David Yip 2018-03-18 20:21:17 -0500
  • ab04be2f84
    Merge remote-tracking branch 'origin/master' into gs-master David Yip 2018-03-18 20:21:17 -0500
  • 8b7008f3fa Merge remote-tracking branch 'personal/merge/tootsuite/master' into gs-master David Yip 2018-03-18 20:20:08 -0500
  • 6a6f680d98
    Merge remote-tracking branch 'personal/merge/tootsuite/master' into gs-master David Yip 2018-03-18 20:20:08 -0500
  • 8d5abcb749 Merge pull request #388 from ThibG/glitch-soc/federated-pinned-toots David Yip 2018-03-18 20:17:15 -0500
  • a387f99659
    Merge pull request #388 from ThibG/glitch-soc/federated-pinned-toots David Yip 2018-03-18 20:17:15 -0500
  • f0bc8e8a89 Ignore media validation when attaching to status during processing (#6822) Eugen Rochko 2018-03-19 01:51:19 +0100
  • f02411da40
    Ignore media validation when attaching to status during processing (#6822) Eugen Rochko 2018-03-19 01:51:19 +0100
  • b95c3ef3ee Revert #6479, hide sensitive text/images from OpenGraph previews (#6818) Eugen Rochko 2018-03-18 20:33:07 +0100
  • a568e3ca8e
    Revert #6479, hide sensitive text/images from OpenGraph previews (#6818) Eugen Rochko 2018-03-18 20:33:07 +0100
  • 6d00359015 Fix elephant graphic being draggable and selectable (#6819) Eugen Rochko 2018-03-18 20:32:44 +0100
  • 3b440bd5af
    Fix elephant graphic being draggable and selectable (#6819) Eugen Rochko 2018-03-18 20:32:44 +0100
  • 59c1accd4b fix compressed notifications again (#393) Ash Levy 2018-03-18 13:42:28 -0400
  • c68c1466ac fix compressed notifications again (#393) Ash Levy 2018-03-18 13:42:28 -0400
  • 047346ce10 Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master Jenkins 2018-03-18 16:17:15 +0000
  • f2a9a13b32 Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master Jenkins 2018-03-18 16:17:15 +0000
  • 77badbc85a If DEFAULT_LOCALE is set, enforce it instead of HTTP request locale (#6817) Eugen Rochko 2018-03-18 16:57:04 +0100
  • 39f27b6cf3
    If DEFAULT_LOCALE is set, enforce it instead of HTTP request locale (#6817) Eugen Rochko 2018-03-18 16:57:04 +0100
  • cabb197337 Synchronize HTML page cache with sessions (#6815) Akihiko Odaki 2018-03-18 23:14:38 +0900
  • 721234230c Synchronize HTML page cache with sessions (#6815) Akihiko Odaki 2018-03-18 23:14:38 +0900
  • 3d16993fbe Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master Jenkins 2018-03-17 17:17:21 +0000
  • 9341b982b6 Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master Jenkins 2018-03-17 17:17:21 +0000
  • 2902b97c83 Add entropy to download filenames (#6811) nightpool 2018-03-17 12:39:28 -0400
  • 566ace2d64 Add entropy to download filenames (#6811) nightpool 2018-03-17 12:39:28 -0400
  • a9538ac293 Bump version to 2.3.2rc2 Eugen Rochko 2018-03-17 15:28:52 +0100
  • 092f1df9d0
    Bump version to 2.3.2rc2 Eugen Rochko 2018-03-17 15:28:52 +0100
  • a235678802 Re-add git and nodejs-npm to Dockerfile (#6810) Eugen Rochko 2018-03-17 15:28:09 +0100
  • 844616e950
    Re-add git and nodejs-npm to Dockerfile (#6810) Eugen Rochko 2018-03-17 15:28:09 +0100
  • d35272245e Revert "Upgrade Paperclip to version 6.0.0" (#6807) Eugen Rochko 2018-03-17 14:20:35 +0100
  • 40871caa4b
    Revert "Upgrade Paperclip to version 6.0.0" (#6807) Eugen Rochko 2018-03-17 14:20:35 +0100
  • 64d5c8a512 Bump version to 2.3.2rc1 Eugen Rochko 2018-03-17 14:07:00 +0100
  • cdf8b92fea
    Bump version to 2.3.2rc1 Eugen Rochko 2018-03-17 14:07:00 +0100
  • 36734278ba Downgrade Dockerfile to Ruby 2.4.3 on Alpine 3.6 (#6806) Eugen Rochko 2018-03-17 14:06:25 +0100
  • 0074cad44f
    Downgrade Dockerfile to Ruby 2.4.3 on Alpine 3.6 (#6806) Eugen Rochko 2018-03-17 14:06:25 +0100
  • 8f374100ed Handle Mastodon::HostValidationError when pulling remoteable assets (#6782) Daniel Hunsaker 2018-03-17 06:27:50 -0600
  • 4a0a19fe54 Handle Mastodon::HostValidationError when pulling remoteable assets (#6782) Daniel Hunsaker 2018-03-17 06:27:50 -0600
  • 7b247b15f2 Correct the reference to user's password in mastodon:add_user task (#6800) Akihiko Odaki 2018-03-17 21:27:19 +0900
  • 338bff8b93 Correct the reference to user's password in mastodon:add_user task (#6800) Akihiko Odaki 2018-03-17 21:27:19 +0900
  • cd6dee83a1 Upgrade Paperclip to version 6.0.0 (#6754) Yamagishi Kazutoshi 2018-03-17 20:37:58 +0900
  • b88fcd53f7 Upgrade Paperclip to version 6.0.0 (#6754) Yamagishi Kazutoshi 2018-03-17 20:37:58 +0900
  • e3984f76a4 Properly center .nothing-here (#6787) (#6788) trwnh 2018-03-17 06:35:35 -0500
  • ca7e6a6d2e Properly center .nothing-here (#6787) (#6788) trwnh 2018-03-17 06:35:35 -0500