Commit Graph

  • ab04be2f84 Merge remote-tracking branch 'origin/master' into gs-master David Yip 2018-03-18 20:21:17 -05:00
  • 6a6f680d98 Merge remote-tracking branch 'personal/merge/tootsuite/master' into gs-master David Yip 2018-03-18 20:20:08 -05:00
  • a387f99659 Merge pull request #388 from ThibG/glitch-soc/federated-pinned-toots David Yip 2018-03-18 20:17:15 -05:00
  • f02411da40 Ignore media validation when attaching to status during processing (#6822) Eugen Rochko 2018-03-19 01:51:19 +01:00
  • a568e3ca8e Revert #6479, hide sensitive text/images from OpenGraph previews (#6818) Eugen Rochko 2018-03-18 20:33:07 +01:00
  • 3b440bd5af Fix elephant graphic being draggable and selectable (#6819) Eugen Rochko 2018-03-18 20:32:44 +01:00
  • c68c1466ac fix compressed notifications again (#393) Ash Levy 2018-03-18 13:42:28 -04:00
  • f2a9a13b32 Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master Jenkins 2018-03-18 16:17:15 +00:00
  • 39f27b6cf3 If DEFAULT_LOCALE is set, enforce it instead of HTTP request locale (#6817) Eugen Rochko 2018-03-18 16:57:04 +01:00
  • 721234230c Synchronize HTML page cache with sessions (#6815) Akihiko Odaki 2018-03-18 23:14:38 +09:00
  • 9341b982b6 Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master Jenkins 2018-03-17 17:17:21 +00:00
  • 566ace2d64 Add entropy to download filenames (#6811) nightpool 2018-03-17 12:39:28 -04:00
  • 092f1df9d0 Bump version to 2.3.2rc2 Eugen Rochko 2018-03-17 15:28:52 +01:00
  • 844616e950 Re-add git and nodejs-npm to Dockerfile (#6810) Eugen Rochko 2018-03-17 15:28:09 +01:00
  • 40871caa4b Revert "Upgrade Paperclip to version 6.0.0" (#6807) Eugen Rochko 2018-03-17 14:20:35 +01:00
  • cdf8b92fea Bump version to 2.3.2rc1 Eugen Rochko 2018-03-17 14:07:00 +01:00
  • 0074cad44f Downgrade Dockerfile to Ruby 2.4.3 on Alpine 3.6 (#6806) Eugen Rochko 2018-03-17 14:06:25 +01:00
  • 4a0a19fe54 Handle Mastodon::HostValidationError when pulling remoteable assets (#6782) Daniel Hunsaker 2018-03-17 06:27:50 -06:00
  • 338bff8b93 Correct the reference to user's password in mastodon:add_user task (#6800) Akihiko Odaki 2018-03-17 21:27:19 +09:00
  • b88fcd53f7 Upgrade Paperclip to version 6.0.0 (#6754) Yamagishi Kazutoshi 2018-03-17 20:37:58 +09:00
  • ca7e6a6d2e Properly center .nothing-here (#6787) (#6788) trwnh 2018-03-17 06:35:35 -05:00
  • f0cd957c7a Cache HTML page with Service Worker (#6802) Akihiko Odaki 2018-03-17 20:35:13 +09:00
  • 64fc8d2b07 [Nanobox] Stream backups to the warehouse (#6799) Daniel Hunsaker 2018-03-17 01:39:14 -06:00
  • fe17446af0 Merge pull request #391 from ashkitten/compressed-notifs David Yip 2018-03-16 18:15:59 -05:00
  • 33d5fe889a fix non-notification boosts Ash Levy 2018-03-16 18:36:35 -04:00
  • 6f0e50f9a0 [Glitch] Federate pinned statuses over ActivityPub Thibaut Girka 2018-03-16 20:29:42 +01:00
  • cd73af3bd0 [Glitch] Improve style of web UI account tabs Thibaut Girka 2018-03-16 20:48:22 +01:00
  • f00af46d70 [Glitch] Add "Toots/Toots with replies/Media" tab below profile header Thibaut Girka 2018-03-16 19:54:00 +01:00
  • 50f56ba375 Merge pull request #385 from ThibG/glitch-soc/features/port-reports-ui-changes David Yip 2018-03-16 17:13:09 -05:00
  • 8383f777fb Merge pull request #389 from ThibG/glitch-soc/error-500 David Yip 2018-03-16 16:51:19 -05:00
  • a3c86d8cb9 Merge pull request #386 from ashkitten/compressed-notifs David Yip 2018-03-16 16:35:15 -05:00
  • cf754e6a91 Fix error 500 page Thibaut Girka 2018-03-16 22:31:20 +01:00
  • 9c40a5f3c8 Fix toot text color in the report modal Thibaut Girka 2018-03-13 11:39:29 +01:00
  • 19f7bd1582 Show media on report UI Thibaut Girka 2018-03-12 19:43:31 +01:00
  • 22870985da Add close modal icon to report dialog (#6591) Thibaut Girka 2018-03-12 19:32:47 +01:00
  • 9cf574d0d2 Port federated reports UI to glitchsoc Thibaut Girka 2018-03-12 19:06:28 +01:00
  • d75a6054a0 Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master Jenkins 2018-03-13 18:17:20 +00:00
  • 9317f6853e compress boost/fave notifications more Ash Levy 2018-03-12 20:57:28 -04:00
  • fd385e256d i18n: Update Polish translation (#6780) Marcin Mikołajczak 2018-03-13 18:17:48 +01:00
  • 03119c857b Weblate translations (2018-03-13) (#6777) Renato "Lond" Cerqueira 2018-03-13 16:16:51 +01:00
  • 2ef1ce1182 Bump version to 2.3.1 Eugen Rochko 2018-03-13 15:50:15 +01:00
  • eb2425b53b Hide loading bar on status interactions (#6774) Eugen Rochko 2018-03-13 14:30:01 +01:00
  • 79d3a8553f Bump version to 2.3.1rc3 Eugen Rochko 2018-03-13 09:21:21 +01:00
  • 7709556673 Merge branch 'kagucho-spoiler' Eugen Rochko 2018-03-13 09:18:27 +01:00
  • f0ae6b4cc5 Merge branch 'spoiler' of git://github.com/kagucho/mastodon into kagucho-spoiler Eugen Rochko 2018-03-13 09:18:11 +01:00
  • 9e3a6d6784 Log BackupWorker backtrace, delete Backup if retries exhausted (#6769) Eugen Rochko 2018-03-13 08:15:24 +01:00
  • 8bf3e750ab Fix #6757: Adjust RTL styles for landing page (#6768) Eugen Rochko 2018-03-13 08:14:08 +01:00
  • 18241ccbe1 Change the title of sensitive button by state (#6771) Akihiko Odaki 2018-03-13 16:10:12 +09:00
  • 0dccb398bd Change the title of spoiler button by state Akihiko Odaki 2018-03-13 15:58:13 +09:00
  • 386365090c Fix #6762: Do not overwrite some status attributes in reducer (#6767) Eugen Rochko 2018-03-13 07:16:43 +01:00
  • d9500c8a3b [Nanobox] Fix DB backup task (#6766) Daniel Hunsaker 2018-03-12 23:07:02 -06:00
  • f7c1668bf6 Do not run lint in Travis CI (#6763) Akihiko Odaki 2018-03-13 14:06:14 +09:00
  • f8e934f955 Merge remote-tracking branch 'origin/master' into merge-upstream David Yip 2018-03-12 17:52:19 -05:00
  • 051b649628 Detailed SMTP setup (#6759) Ushitora Anqou 2018-03-13 05:41:26 +09:00
  • 22f2750578 Merge pull request #384 from ThibG/glitch-soc/features/no-media-url Gô Shoemake 2018-03-12 13:09:42 -07:00
  • 2395a4c313 Merge pull request #344 from chriswmartin/getting-started-badge-merge Gô Shoemake 2018-03-12 13:07:59 -07:00
  • 841ef606a9 Remove text requirement when media attached from statuses (fixes #381) Thibaut Girka 2018-03-12 18:39:07 +01:00
  • f5f165a5eb set SAFETY_ASSURED=1 of db:setup in mastodon:setup (#6758) 艮 鮟鱇 2018-03-13 00:21:48 +09:00
  • f89ff65ec7 Bump version to 2.3.1rc2 Eugen Rochko 2018-03-12 12:48:49 +01:00
  • 48b940d5c6 Insert space before shortcode if necessary (#6751) Akihiko Odaki 2018-03-12 20:47:51 +09:00
  • 6ae70a92c9 Hide pinned toots on with replies (#6753) Yamagishi Kazutoshi 2018-03-12 20:47:18 +09:00
  • fa5c867e0e Avoid using JS to set height in MediaModal (#6750) Yuto Tokunaga 2018-03-12 11:52:05 +09:00
  • 641abe2db7 Fix Procfile on OS X (#6748) nightpool 2018-03-11 22:50:40 -04:00
  • 4f7f6b3922 Fix follow relationships not loading after notifications fetch (#6746) Eugen Rochko 2018-03-12 03:20:56 +01:00
  • 8b14726f5b Weblate translations (2018-03-11) (#6742) Yamagishi Kazutoshi 2018-03-12 00:21:26 +09:00
  • 9090b63831 i18n: Update Polish translation and “yarn manage:translations” (#6743) Marcin Mikołajczak 2018-03-11 16:21:16 +01:00
  • ab27dccba5 Bump version to 2.3.1rc1 Eugen Rochko 2018-03-11 15:13:13 +01:00
  • 56eb5c3f34 Fix focal point cropping in MediaGallery, fix focal point modal (#6740) Eugen Rochko 2018-03-11 15:12:33 +01:00
  • 56333cca88 Add license info to README (#6583) TrashMacNugget 2018-03-11 07:12:23 -07:00
  • 1aaec701bb Fix #6715: Make catalan words with the L geminate letter work in hashtags (#6741) Eugen Rochko 2018-03-11 14:55:49 +01:00
  • cd252b794e add new avatar placeholder missing.png (#6728) Konrad Pozniak 2018-03-11 14:55:38 +01:00
  • a0724cd742 Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master Jenkins 2018-03-11 09:17:21 +00:00
  • b6003afcdb Add show more/less toggle for entire threads in web UI (#6733) Eugen Rochko 2018-03-11 09:52:59 +01:00
  • 0c2a16fcbf Merge pull request #379 from ThibG/glitch-soc/features/improved-account-header David Yip 2018-03-10 23:35:16 -06:00
  • f5ee2d469b i18n: Update Polish translation (#6731) Marcin Mikołajczak 2018-03-10 17:56:30 +01:00
  • 37b043d447 Improve performance of account_media_status_ids (#6729) abcang 2018-03-11 01:44:26 +09:00
  • 36579bac88 Use Alpine Linux yarn package in Docker (#6725) Akihiko Odaki 2018-03-10 19:49:04 +09:00
  • 4476a45444 Fix #6717: Do not double html-encode page titles (#6720) Eugen Rochko 2018-03-10 11:43:20 +01:00
  • 58a4633707 Remove su-exec from Docker image (#6722) Akihiko Odaki 2018-03-10 19:42:42 +09:00
  • 494969d394 Remove git from Docker image (#6724) Akihiko Odaki 2018-03-10 19:42:28 +09:00
  • e553905ba7 Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master Jenkins 2018-03-09 12:17:22 +00:00
  • c1a41181c5 docs: Add AUTHORS file (#6685) Espen Rønnevik 2018-03-09 13:11:43 +01:00
  • 6e309f5e45 Bump version to 2.3.0 Eugen Rochko 2018-03-09 12:59:58 +01:00
  • 25c5223617 Port #6627 and #6636 to glitch-soc Thibaut Girka 2018-03-05 11:09:29 +01:00
  • e5f18ace2a When inside Docker, output saved configuration during mastodon:setup (#6711) Eugen Rochko 2018-03-09 11:52:18 +01:00
  • 11697d6894 Fix thumbnail not filling entire space sometimes (#6709) Eugen Rochko 2018-03-09 11:33:05 +01:00
  • 675b8fea53 Adjust suggested ES host in .env sample for docker-compose config (#6710) Eugen Rochko 2018-03-09 11:32:55 +01:00
  • 4c16ddf588 Change avatar size on form hints (#6707) Yamagishi Kazutoshi 2018-03-09 18:57:33 +09:00
  • 5ba4c36f95 Weblate translations (2018-03-09) (#6708) Renato "Lond" Cerqueira 2018-03-09 10:38:13 +01:00
  • ccd53e983c Missing Korean translations (#6703) Jeong Arm 2018-03-09 14:21:47 +09:00
  • 447d7e6127 Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master Jenkins 2018-03-09 00:17:17 +00:00
  • ff44b2e92d Add missing meta description to profiles, some other SEO stuff (#6706) Eugen Rochko 2018-03-09 00:35:07 +01:00
  • 188aa3ea50 Add polyfill for Object.values (#6697) Yamagishi Kazutoshi 2018-03-08 21:07:25 +09:00
  • bd077ad7d9 Bump version to 2.3.0rc3 Eugen Rochko 2018-03-08 11:19:02 +01:00
  • a29d409e20 If login redirects to omniauth, redirect logout to root_path (#6694) Eugen Rochko 2018-03-08 11:18:26 +01:00
  • 5acd5315f2 Improve styling of closed registrations message, rename button (#6695) Eugen Rochko 2018-03-08 11:10:37 +01:00
  • b79ab15859 When enabled, always display media in gallery. Also: click to reveal (#6692) Eugen Rochko 2018-03-08 08:57:21 +01:00
  • 77406d3a09 Display AttachmentList in notifications (#6693) Eugen Rochko 2018-03-08 08:22:04 +01:00
  • 510c9049c7 For now, put a "." into no-text statuses with media for backcompat (#6691) Eugen Rochko 2018-03-08 08:20:49 +01:00
  • ed902581d3 Update Yarn to version 1.5.1 (#6689) Yamagishi Kazutoshi 2018-03-08 15:09:10 +09:00