Commit Graph

Select branches

Hide Pull Requests

main

Mono Color

• 9c3e4bdead
  Merge remote-tracking branch 'personal/merge/tootsuite/master' into gs-master David Yip 2018-03-21 13:39:31 -0500
• 6290cd7969 Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master Jenkins 2018-03-21 17:17:20 +0000
• d97903a358 Update sanitize and loofah (#6855) Patrick Figel 2018-03-21 17:43:28 +0100
• 93897134ca
  Permit dots in usernames with conditions (#6844) Eugen Rochko 2018-03-21 10:26:53 +0100
• a6b59cd1a3 Remove debug option from Babel preset env (#6852) Akihiko Odaki 2018-03-21 18:26:15 +0900
• f64af6473f
  Bump version to 2.3.2rc4 Eugen Rochko 2018-03-20 23:49:24 +0100
• e8aeec4fea Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master Jenkins 2018-03-20 19:17:20 +0000
• ac49c7932d
  Add LDAP_TLS_NO_VERIFY option, don't require LDAP_ENABLED outside .env (#6845) Eugen Rochko 2018-03-20 19:41:51 +0100
• 2649cce3a0
  Merge pull request #396 from ThibG/glitch-soc/fixes/compose-suggestions David Yip 2018-03-20 10:48:33 -0500
• 61dcb686a8 Fix i18n fallback configuration conflicts with environment configurations (#6843) Akihiko Odaki 2018-03-21 00:36:20 +0900
• 9381a7d9d5
  Use username/domain to match existing accounts in ActivityPub (#6842) Eugen Rochko 2018-03-20 14:57:46 +0100
• 12b0ea0667 [Glitch] Cancel outdated pending compose suggestions Thibaut Girka 2018-03-20 14:17:49 +0100
• a5c6c748e0 Cancel outdated pending compose suggestions (#6838) ThibG 2018-03-20 12:40:12 +0100
• 36b5703796 request: in the event of failure, try other IPs (#6761) (#6813) Rey Tucker 2018-03-20 04:06:08 -0400
• 0fa0836e63
  Merge remote-tracking branch 'personal/merge/tootsuite/master' into gs-master David Yip 2018-03-19 15:41:59 -0500
• c074b226b6
  Merge pull request #394 from ashkitten/compressed-notifs David Yip 2018-03-19 15:41:09 -0500
• df70571bfe Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master Jenkins 2018-03-19 20:17:18 +0000
• ff6b8a6443 Serialize mentions in the order they are added (#6836) ThibG 2018-03-19 20:19:35 +0100
• 6b76a6212d Display content warning in mail notification emails (#6832) ThibG 2018-03-19 20:12:20 +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
• 0306e3e9be bugfixes and gem update (#6831) Alexander 2018-03-19 20:08:56 +0100
• 357f9298bd Fix e-mail changed notification (fixes #6778) (#6835) ThibG 2018-03-19 20:07:47 +0100
• f7c46fc113 Weblate translations 20180319 (#6827) Renato "Lond" Cerqueira 2018-03-19 15:12:06 +0100
• 74c39fada0
  Bump version to 2.3.2rc3 Eugen Rochko 2018-03-19 12:20:57 +0100
• 5b00b8f0da fix .status__info__icons layout Ash Lea 2018-03-18 23:49:30 -0400
• ab04be2f84
  Merge remote-tracking branch 'origin/master' into gs-master David Yip 2018-03-18 20:21:17 -0500
• 6a6f680d98
  Merge remote-tracking branch 'personal/merge/tootsuite/master' into gs-master David Yip 2018-03-18 20:20:08 -0500
• a387f99659
  Merge pull request #388 from ThibG/glitch-soc/federated-pinned-toots David Yip 2018-03-18 20:17:15 -0500
• f02411da40
  Ignore media validation when attaching to status during processing (#6822) Eugen Rochko 2018-03-19 01:51:19 +0100
• a568e3ca8e
  Revert #6479, hide sensitive text/images from OpenGraph previews (#6818) Eugen Rochko 2018-03-18 20:33:07 +0100
• 3b440bd5af
  Fix elephant graphic being draggable and selectable (#6819) Eugen Rochko 2018-03-18 20:32:44 +0100
• c68c1466ac fix compressed notifications again (#393) Ash Levy 2018-03-18 13:42:28 -0400
• f2a9a13b32 Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master Jenkins 2018-03-18 16:17:15 +0000
• 39f27b6cf3
  If DEFAULT_LOCALE is set, enforce it instead of HTTP request locale (#6817) Eugen Rochko 2018-03-18 16:57:04 +0100
• 721234230c Synchronize HTML page cache with sessions (#6815) Akihiko Odaki 2018-03-18 23:14:38 +0900
• 9341b982b6 Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master Jenkins 2018-03-17 17:17:21 +0000
• 566ace2d64 Add entropy to download filenames (#6811) nightpool 2018-03-17 12:39:28 -0400
• 092f1df9d0
  Bump version to 2.3.2rc2 Eugen Rochko 2018-03-17 15:28:52 +0100
• 844616e950
  Re-add git and nodejs-npm to Dockerfile (#6810) Eugen Rochko 2018-03-17 15:28:09 +0100
• 40871caa4b
  Revert "Upgrade Paperclip to version 6.0.0" (#6807) Eugen Rochko 2018-03-17 14:20:35 +0100
• cdf8b92fea
  Bump version to 2.3.2rc1 Eugen Rochko 2018-03-17 14:07:00 +0100
• 0074cad44f
  Downgrade Dockerfile to Ruby 2.4.3 on Alpine 3.6 (#6806) Eugen Rochko 2018-03-17 14:06:25 +0100
• 4a0a19fe54 Handle Mastodon::HostValidationError when pulling remoteable assets (#6782) Daniel Hunsaker 2018-03-17 06:27:50 -0600
• 338bff8b93 Correct the reference to user's password in mastodon:add_user task (#6800) Akihiko Odaki 2018-03-17 21:27:19 +0900
• b88fcd53f7 Upgrade Paperclip to version 6.0.0 (#6754) Yamagishi Kazutoshi 2018-03-17 20:37:58 +0900
• ca7e6a6d2e Properly center .nothing-here (#6787) (#6788) trwnh 2018-03-17 06:35:35 -0500
• f0cd957c7a Cache HTML page with Service Worker (#6802) Akihiko Odaki 2018-03-17 20:35:13 +0900
• 64fc8d2b07 [Nanobox] Stream backups to the warehouse (#6799) Daniel Hunsaker 2018-03-17 01:39:14 -0600
• fe17446af0
  Merge pull request #391 from ashkitten/compressed-notifs David Yip 2018-03-16 18:15:59 -0500
• 33d5fe889a fix non-notification boosts Ash Levy 2018-03-16 18:36:35 -0400
• 6f0e50f9a0 [Glitch] Federate pinned statuses over ActivityPub Thibaut Girka 2018-03-16 20:29:42 +0100
• cd73af3bd0 [Glitch] Improve style of web UI account tabs Thibaut Girka 2018-03-16 20:48:22 +0100
• f00af46d70 [Glitch] Add "Toots/Toots with replies/Media" tab below profile header Thibaut Girka 2018-03-16 19:54:00 +0100
• 50f56ba375
  Merge pull request #385 from ThibG/glitch-soc/features/port-reports-ui-changes David Yip 2018-03-16 17:13:09 -0500
• 8383f777fb
  Merge pull request #389 from ThibG/glitch-soc/error-500 David Yip 2018-03-16 16:51:19 -0500
• a3c86d8cb9
  Merge pull request #386 from ashkitten/compressed-notifs David Yip 2018-03-16 16:35:15 -0500
• cf754e6a91 Fix error 500 page Thibaut Girka 2018-03-16 22:31:20 +0100
• 9c40a5f3c8 Fix toot text color in the report modal Thibaut Girka 2018-03-13 11:39:29 +0100
• 19f7bd1582 Show media on report UI Thibaut Girka 2018-03-12 19:43:31 +0100
• 22870985da Add close modal icon to report dialog (#6591) Thibaut Girka 2018-03-12 19:32:47 +0100
• 9cf574d0d2 Port federated reports UI to glitchsoc Thibaut Girka 2018-03-12 19:06:28 +0100
• d75a6054a0 Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master Jenkins 2018-03-13 18:17:20 +0000
• 9317f6853e compress boost/fave notifications more Ash Levy 2018-03-12 20:57:28 -0400
• fd385e256d i18n: Update Polish translation (#6780) Marcin Mikołajczak 2018-03-13 18:17:48 +0100
• 03119c857b Weblate translations (2018-03-13) (#6777) Renato "Lond" Cerqueira 2018-03-13 16:16:51 +0100
• 2ef1ce1182
  Bump version to 2.3.1 Eugen Rochko 2018-03-13 15:50:15 +0100
• eb2425b53b
  Hide loading bar on status interactions (#6774) Eugen Rochko 2018-03-13 14:30:01 +0100
• 79d3a8553f
  Bump version to 2.3.1rc3 Eugen Rochko 2018-03-13 09:21:21 +0100
• 7709556673 Merge branch 'kagucho-spoiler' Eugen Rochko 2018-03-13 09:18:27 +0100
• f0ae6b4cc5 Merge branch 'spoiler' of git://github.com/kagucho/mastodon into kagucho-spoiler Eugen Rochko 2018-03-13 09:18:11 +0100
• 9e3a6d6784
  Log BackupWorker backtrace, delete Backup if retries exhausted (#6769) Eugen Rochko 2018-03-13 08:15:24 +0100
• 8bf3e750ab
  Fix #6757: Adjust RTL styles for landing page (#6768) Eugen Rochko 2018-03-13 08:14:08 +0100
• 18241ccbe1 Change the title of sensitive button by state (#6771) Akihiko Odaki 2018-03-13 16:10:12 +0900
• 0dccb398bd Change the title of spoiler button by state Akihiko Odaki 2018-03-13 15:58:13 +0900
• 386365090c
  Fix #6762: Do not overwrite some status attributes in reducer (#6767) Eugen Rochko 2018-03-13 07:16:43 +0100
• d9500c8a3b [Nanobox] Fix DB backup task (#6766) Daniel Hunsaker 2018-03-12 23:07:02 -0600
• f7c1668bf6 Do not run lint in Travis CI (#6763) Akihiko Odaki 2018-03-13 14:06:14 +0900
• f8e934f955
  Merge remote-tracking branch 'origin/master' into merge-upstream David Yip 2018-03-12 17:52:19 -0500
• 051b649628 Detailed SMTP setup (#6759) Ushitora Anqou 2018-03-13 05:41:26 +0900
• 22f2750578
  Merge pull request #384 from ThibG/glitch-soc/features/no-media-url Gô Shoemake 2018-03-12 13:09:42 -0700
• 2395a4c313
  Merge pull request #344 from chriswmartin/getting-started-badge-merge Gô Shoemake 2018-03-12 13:07:59 -0700
• 841ef606a9 Remove text requirement when media attached from statuses (fixes #381) Thibaut Girka 2018-03-12 18:39:07 +0100
• f5f165a5eb set SAFETY_ASSURED=1 of db:setup in mastodon:setup (#6758) 艮 鮟鱇 2018-03-13 00:21:48 +0900
• f89ff65ec7
  Bump version to 2.3.1rc2 Eugen Rochko 2018-03-12 12:48:49 +0100
• 48b940d5c6 Insert space before shortcode if necessary (#6751) Akihiko Odaki 2018-03-12 20:47:51 +0900
• 6ae70a92c9 Hide pinned toots on with replies (#6753) Yamagishi Kazutoshi 2018-03-12 20:47:18 +0900
• fa5c867e0e Avoid using JS to set height in MediaModal (#6750) Yuto Tokunaga 2018-03-12 11:52:05 +0900
• 641abe2db7 Fix Procfile on OS X (#6748) nightpool 2018-03-11 22:50:40 -0400
• 4f7f6b3922
  Fix follow relationships not loading after notifications fetch (#6746) Eugen Rochko 2018-03-12 03:20:56 +0100
• 8b14726f5b Weblate translations (2018-03-11) (#6742) Yamagishi Kazutoshi 2018-03-12 00:21:26 +0900
• 9090b63831 i18n: Update Polish translation and “yarn manage:translations” (#6743) Marcin Mikołajczak 2018-03-11 16:21:16 +0100
• ab27dccba5
  Bump version to 2.3.1rc1 Eugen Rochko 2018-03-11 15:13:13 +0100
• 56eb5c3f34
  Fix focal point cropping in MediaGallery, fix focal point modal (#6740) Eugen Rochko 2018-03-11 15:12:33 +0100
• 56333cca88 Add license info to README (#6583) TrashMacNugget 2018-03-11 07:12:23 -0700
• 1aaec701bb
  Fix #6715: Make catalan words with the L geminate letter work in hashtags (#6741) Eugen Rochko 2018-03-11 14:55:49 +0100
• cd252b794e add new avatar placeholder missing.png (#6728) Konrad Pozniak 2018-03-11 14:55:38 +0100
• a0724cd742 Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master Jenkins 2018-03-11 09:17:21 +0000
• b6003afcdb
  Add show more/less toggle for entire threads in web UI (#6733) Eugen Rochko 2018-03-11 09:52:59 +0100
• 0c2a16fcbf
  Merge pull request #379 from ThibG/glitch-soc/features/improved-account-header David Yip 2018-03-10 23:35:16 -0600
• f5ee2d469b i18n: Update Polish translation (#6731) Marcin Mikołajczak 2018-03-10 17:56:30 +0100