catstodon

CatCatNya/catstodon

Fork 0

forked from glitch-soc-github-mirror/mastodon

Commit graph

50eb8f1f61 Add backend support for bookmarks Thibaut Girka 2018-04-10 22:13:15 +02:00
043a699990 Update glitch-soc style to match changes to reports UI Thibaut Girka 2018-04-11 19:15:42 +02:00
519119f657 Paginate ancestor statuses in public page (#7102) Akihiko Odaki 2018-04-11 19:35:09 +09:00
33c2bbdda7 Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master Jenkins 2018-04-11 00:50:09 +00:00
e74e5c7eb9 Place composer dropdown menus top if they are closer to the bottom of the viewport Thibaut Girka 2018-04-10 20:04:55 +02:00
d9b62e34da Feature: Improve reports ui (#7032) Emelia Smith 2018-04-10 20:27:59 +02:00
45c9f16f71

Improve load gap styling in web UI (#7100) Eugen Rochko 2018-04-10 17:12:10 +02:00
49bbef1202

Use RAILS_LOG_LEVEL to set log level of Sidekiq, too (#7079) Eugen Rochko 2018-04-10 16:08:28 +02:00
8f800ad691 Change custom emoji search to ILIKE instead of = (#7099) Paul Woolcock 2018-04-10 09:46:27 -04:00
219a4423d8 Feature: Allow staff to change user emails (#7074) Emelia Smith 2018-04-10 09:16:06 +02:00
e6e93ecd8a Fix GIFV encoding params (#7098) MIYAGI Hikaru 2018-04-10 16:11:55 +09:00
80a944c882

Log rate limit hits (#7096) Eugen Rochko 2018-04-10 01:20:18 +02:00
0c52654b52 When creating status, if no sensitive status is given, use default (#7057) Renato "Lond" Cerqueira 2018-04-09 23:02:42 +02:00
904a2479dd Feature: Direct message from Statuses (#7089) Emelia Smith 2018-04-09 17:09:11 +02:00
e057c0e525 Optimize public/headers/missing.png (#7084) Una 2018-04-09 05:34:48 -04:00
07d90b0414 i18n: Update Polish translation (#7085) Marcin Mikołajczak 2018-04-09 10:28:53 +02:00
498327b2e3 Exclude status itself from context query (#7083) Akihiko Odaki 2018-04-09 16:58:53 +09:00
67e77f230e

Merge remote-tracking branch 'origin/master' into gs-master David Yip 2018-04-08 19:05:02 -05:00
695b53b796

Merge pull request #414 from ThibG/glitch-soc/fixes/fix-video-playback David Yip 2018-04-08 18:18:41 -05:00
8a082d8735

Merge pull request #415 from ThibG/glitch-soc/fixes/source-url David Yip 2018-04-08 18:18:00 -05:00
9073687f66 [Glitch] Fix video player height Thibaut Girka 2018-04-09 00:42:26 +02:00
101e6564fd [Glitch] Refactor scss Thibaut Girka 2018-04-09 00:56:59 +02:00
0fb5ea5d15 Fix video modal Thibaut Girka 2018-04-09 00:11:10 +02:00
a4fa8c9064 [Glitch] Avoid using JS to set height in MediaModal Thibaut Girka 2018-04-08 23:18:24 +02:00
87071d9e81 [Glitch] Improved media modal Thibaut Girka 2018-04-08 23:15:25 +02:00
0b86ec4e7f [Glitch] Allow to open a modal for embedded photo Thibaut Girka 2018-04-08 23:06:33 +02:00
0893b16695 Hide search from Compose on mobile devices (#7077) Emelia Smith 2018-04-08 18:25:08 +02:00
88bcfaeb18 Point to glitch-soc source and not tootsuite on the public page Thibaut Girka 2018-04-08 15:43:26 +02:00
c9cbb8de70 Add search item to tab bar for mobile devices (#7072) Emelia Smith 2018-04-08 14:26:58 +02:00
cd0eaa349c Enable updating additional account information from user preferences via rest api (#6789) Levi Bard 2018-04-08 13:43:10 +02:00
1364e9e4ae Fix follow/unfollow buttons on public profile (fixes #7036) (#7040) ThibG 2018-04-08 13:40:22 +02:00
1ed1014546 Free stroage if it is exceeding disk quota (#7061) Akihiko Odaki 2018-04-08 20:32:39 +09:00
a896f601fa Fix video playback in glitch-soc detailed statuses Thibaut Girka 2018-04-08 12:22:12 +02:00
b83ce18b30 Ignore elasticsearch directory (#7070) THE BOSS ♨ 2018-04-08 16:57:16 +09:00
d4de2239b0

Add a circuit breaker for ActivityPub deliveries (#7053) Eugen Rochko 2018-04-07 21:36:58 +02:00
4a9becfca2 i18n: improve "Welcome" translation in Portuguese (#7068) Hisham Muhammad 2018-04-07 16:36:03 -03:00
b65eb00c53 Prevent admins and moderators eavesdropping in private and direct toots (#7067) Alda Marteau-Hardi 2018-04-07 21:33:01 +02:00
b5726def55

Forward deletes on the same path as reply forwarding (#7058) Eugen Rochko 2018-04-07 18:54:46 +02:00
98146281e1 Remove duplicate frequently used emojis (#7064) Harmon 2018-04-07 07:53:11 -05:00
b08ab329f4 retrieve custom emoji list via API instead of before page load (#7047) Isatis 2018-04-04 13:25:34 -07:00
f1867a7388

Adjust privacy policy (#6666) Eugen Rochko 2018-04-04 21:47:39 +02:00
3ab6a8b8be

Merge remote-tracking branch 'origin/master' into gs-master David Yip 2018-04-04 13:56:58 -05:00
bda1782cd8

Merge remote-tracking branch 'personal/merge/tootsuite/master' into gs-master David Yip 2018-04-04 13:55:42 -05:00
1c1042556d i18n: Update Polish translation (#7037) Marcin Mikołajczak 2018-04-04 20:13:43 +02:00
77b650b69c

Merge pull request #412 from ThibG/glitch-soc/cleanup beatrix 2018-04-04 11:36:54 -04:00
4ab58c3292

Merge pull request #413 from ThibG/glitch-soc/fixes/fix-account-card-style beatrix 2018-04-04 11:36:41 -04:00
d0e792e231 Update accounts SCSS for public pages Thibaut Girka 2018-04-04 15:40:59 +02:00
75f2e9fd97 Remove duplicate message entries Thibaut Girka 2018-04-02 12:21:01 +02:00
7a81082704 Revert "Add double-tap zoom functionary to ZoomableImage (#6944)" (#7035) Emelia Smith 2018-04-04 11:58:15 +02:00
07176fed37

Add contact account to landing page ("Administered by") (#6984) Eugen Rochko 2018-04-04 01:11:26 +02:00
6611100480 Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master Jenkins 2018-04-03 19:17:20 +00:00
d8d4217959 Fix french wording of reblogged toots in public views, matching the wording of reblogged_by (#7029) ThibG 2018-04-03 21:09:14 +02:00
6ff3b3e4db Fix nil account issue in ProcessAccountService (#7019) Nolan Lawson 2018-04-03 04:08:11 -07:00
2e59751823 Improve require_admin! and require_staff! filters (#7018) Emelia Smith 2018-04-03 13:07:32 +02:00
1c293086a1 i18n: Add Japanese translations for #7000 (#7022) mayaeh 2018-04-03 18:21:33 +09:00
e85cffb236 Feature: Report improvements (#6967) (#7000) Emelia Smith 2018-04-02 22:04:14 +02:00
1f5bdd8445

Merge pull request #410 from ThibG/glitch-soc/fixes/compose-disable David Yip 2018-04-02 14:42:09 -05:00
ca9f022a80 [Glitch] Fix: Prevent submission using same logic as submit button disabling. Thibaut Girka 2018-04-02 17:22:32 +02:00
36eac8ba90

Do not default SMTP verify mode to "peer", default to "none" (#6996) Eugen Rochko 2018-04-02 19:19:51 +02:00
2c51bc0ca5 Add missing rejection handling for Promises (#7008) unarist 2018-04-02 21:51:02 +09:00
e7a1716701 Implement the ability for an Administrator or Moderator to remove an account avatar (#6998) Emelia Smith 2018-04-02 13:45:07 +02:00
4fd71accd4 Fix issues with sending direct messages from user profile (#6999) Emelia Smith 2018-04-02 13:44:19 +02:00
3f51c6efaa Weblate translations (2018-04-02) (#7007) Yamagishi Kazutoshi 2018-04-02 20:43:30 +09:00
b04f73ce66 Russian language updated (#7005) Evgeny Petrov 2018-04-02 13:49:06 +03:00
24611d8deb i18n: update zh-HK translation (#7004) luzi82 2018-04-02 18:11:37 +08:00
eb39db7f93

Merge remote-tracking branch 'origin/master' into gs-master David Yip 2018-04-01 20:24:50 -05:00
f890d2a766

Support all ActivityPub actor types (#6997) Eugen Rochko 2018-04-02 02:10:53 +02:00
33513753b9

Fix unpermitted parameters warning when generating pagination URLs (#6995) Eugen Rochko 2018-04-02 02:09:50 +02:00
123a343d11 [WIP] Enable custom emoji on account pages and in the sidebar (#6124) David Underwood 2018-04-01 17:55:42 -04:00
f464f98fd3 Update Ruby to version 2.4.4 (#6964) Yamagishi Kazutoshi 2018-04-02 06:43:08 +09:00
6a895e1ab3 Fix: Prevent submission using same logic as submit button disabling. (#6993) Emelia Smith 2018-04-01 22:19:43 +02:00
993ce0e5a7 improve zh-HK localization by referring zh-TW and zh-CN (#6988) luzi82 2018-04-01 20:57:26 +08:00
929f58f180 i18n: Update Polish translation (#6985) Marcin Mikołajczak 2018-04-01 10:31:38 +02:00
b7d633c1bb i18n: Add Japanese translations for domain blocks (#6979) mayaeh 2018-03-31 21:09:39 +09:00
3886bfb5eb [Nanobox] Enable ElasticSearch support by default (#6977) Daniel Hunsaker 2018-03-31 05:17:25 -06:00
fb3dc00dda Ignore AbortError when cancelled sharing (#6978) unarist 2018-03-31 20:16:38 +09:00
f0bb3ff533 Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master Jenkins 2018-03-30 19:17:17 +00:00
01bad04efd

Merge pull request #408 from ThibG/glitch-soc/fixes/admin-js beatrix 2018-03-30 14:50:19 -04:00
3304cb681d

Merge pull request #380 from ThibG/glitch-soc/features/domain-block-ui beatrix 2018-03-30 14:50:02 -04:00
257146c960

Merge pull request #406 from ThibG/glitch-soc/fixes/menu-fixes David Yip 2018-03-30 11:29:26 -05:00
9248d1e3a7

Merge pull request #407 from ThibG/glitch-soc/fixes/migration-page David Yip 2018-03-30 11:27:57 -05:00
b305e7452a Add “public” pack to admin controller, as it is included in upstream admin layout Thibaut Girka 2018-03-30 18:15:18 +02:00
e573bb0990 Fix compatibility with PeerTube (#6968) ThibG 2018-03-30 15:44:54 +02:00
167a2ecde0 Fix migration page style Thibaut Girka 2018-03-30 15:26:12 +02:00
48bcf4d6e8 [Glitch] Remove pointer events on the entire UI when a dropdown menu is open Thibaut Girka 2018-03-30 12:45:23 +02:00
a6c129ddbd Add some UI for user-defined domain blocks (#6628) ThibG 2018-03-30 12:38:00 +02:00
2871a82fcc [Glitch] Place dropdown menu top if it is closer to the bottom of the viewport Thibaut Girka 2018-03-30 12:31:29 +02:00
218cc261d1 Add the domain blocks UI to Getting Started Misc Thibaut Girka 2018-03-04 21:51:40 +01:00
afa813d71f Add basic domain block UI Thibaut Girka 2018-03-04 21:46:27 +01:00
482ad7d7c4 Keep list of blocked domains Thibaut Girka 2018-03-04 21:33:08 +01:00
79da0ad7a2 Update all known users' domain_blocking relationship instead of just one's Thibaut Girka 2018-03-04 23:38:00 +01:00
937ace10d9 Fix undefined URL in fetchDomainBlocks Thibaut Girka 2018-03-04 22:19:20 +01:00
47cee7cc8e Upgrade charlock_holmes to version 0.7.6 (#6966) Pierre-Morgan Gate 2018-03-30 00:52:44 -07:00
947eedcab2 update ja locale (#6965) takayamaki 2018-03-30 10:04:04 +09:00
d1f34151ae Feature: Direct message from menu (#6956) Emelia Smith 2018-03-29 19:08:34 +02:00
1bd12cf8eb

Merge pull request #404 from ThibG/glitch-soc/features/moved-note David Yip 2018-03-29 09:26:31 -05:00
b5948044b3 [Glitch] Display unfollow button even if account moved Thibaut Girka 2018-03-29 14:46:00 +02:00
a59c146bf8 [Glitch] Profile redirect notes Thibaut Girka 2018-03-29 14:43:20 +02:00
f1f846045f Fix ReferenceError when Cache API is missing (#6953) unarist 2018-03-29 21:57:02 +09:00
41452e8302 Fix TypeError on follow notification (#6950) unarist 2018-03-29 19:59:12 +09:00
9ed5eebd7c Do not ignore unknown media attachments, only skip them (#6948) ThibG 2018-03-29 00:52:24 +02:00
4e45954280

Merge pull request #402 from ThibG/glitch-soc/fixes/accept-empty-toot-contents David Yip 2018-03-28 16:39:12 -05:00
d37a79adce

Merge pull request #403 from ThibG/glitch-soc/fixes/attachment-lists-fixup David Yip 2018-03-28 16:38:53 -05:00
7db431eac6 Fix attachment lists Thibaut Girka 2018-03-28 22:19:36 +02:00
53eab4470d Render toots with empty contents Thibaut Girka 2018-03-28 20:57:25 +02:00
5021c4e9ca Add double-tap zoom functionary to ZoomableImage (#6944) Yuto Tokunaga 2018-03-29 03:40:51 +09:00
4f9136d2d5 Document CORS requirement for asset host (#6941) Akihiko Odaki 2018-03-29 03:40:18 +09:00
1ed9500b52

Merge pull request #400 from vulpineclub/dev-gs-392-frontmatter David Yip 2018-03-27 13:06:28 -05:00
d2cdc2b5a3

Merge remote-tracking branch 'origin/master' into gs-master David Yip 2018-03-27 10:44:12 -05:00
49c957bc3b

Merge remote-tracking branch 'personal/merge/tootsuite/master' into gs-master David Yip 2018-03-27 10:41:18 -05:00
21b586436e Remove ignored 'u' parameter on regexp (#392) Rey Tucker 2018-03-27 11:30:49 -04:00
f61aa8e0f7

Merge remote-tracking branch 'origin/master' into gs-master David Yip 2018-03-27 10:26:47 -05:00
6af17b79c5

Merge pull request #399 from ThibG/glitch-soc/features/attachments-list David Yip 2018-03-27 10:20:52 -05:00
3523aa440b Fix LoadMore on account media gallery (#6933) unarist 2018-03-27 23:53:52 +09:00
88790b91de [Glitch] Display AttachmentList in notifications Thibaut Girka 2018-03-27 15:50:05 +02:00
3bc5452449 [Glitch] Display AttachmentList in timelines in compact style when media missing Thibaut Girka 2018-03-27 15:40:10 +02:00
f5ed5f3860 Clone response before put it to the cache (#6932) unarist 2018-03-27 22:18:35 +09:00
2f3ac14a43 Add missing null handling in notification reducer (#6930) unarist 2018-03-27 20:05:59 +09:00
ca42f9b0eb Cache media (#6902) Akihiko Odaki 2018-03-27 19:32:30 +09:00
31e7b73084 fix #6846 (#6914) Yuto Tokunaga 2018-03-27 19:30:28 +09:00
a1d0915585 Add a spec for UniqueUsernameValidator (#6927) unarist 2018-03-27 12:22:58 +09:00
2a90da1837

Fix UniqueUsernameValidator comparison (#6926) Eugen Rochko 2018-03-27 04:33:57 +02:00
40e5d2303b Validate HTTP response length while receiving (#6891) Akihiko Odaki 2018-03-26 21:02:10 +09:00
18965cb0e6 feat(ShowMore): Add classname to show more/show less button (#6904) Stephen Burgess 2018-03-26 07:59:44 -04:00
f691afaae9 Refactor scss (#6913) Yuto Tokunaga 2018-03-26 20:59:21 +09:00
db3be77890 Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master Jenkins 2018-03-26 11:17:19 +00:00
605a92b460 Fix moved account handling in IndexedDB feature (#6915) unarist 2018-03-26 19:48:01 +09:00
3b2c7a33a9 Missing OTP_SECRET in scalingo.json (#6917) Yann Klis 2018-03-26 12:47:34 +02:00
837b3804bf Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master Jenkins 2018-03-25 15:17:21 +00:00
85a395fab6 i18n: Update Polish translation (#6903) Marcin Mikołajczak 2018-03-25 16:33:07 +02:00
cbf97c03bb Allow clients to fetch notifications made while they were offline (#6886) Akihiko Odaki 2018-03-25 06:07:23 +09:00
9a1a55ce52 Allow clients to fetch statuses made while they were offline (#6876) Akihiko Odaki 2018-03-24 23:25:15 +09:00
59657e24b9 Rename variables to have semantic meanings in notifications reducer (#6890) Akihiko Odaki 2018-03-24 21:36:44 +09:00
fe398a098e Store objects to IndexedDB (#6826) Akihiko Odaki 2018-03-24 21:06:27 +09:00
28384c1771 Revert "Revert "Upgrade Paperclip to version 6.0.0" (#6807)" (#6808) Yamagishi Kazutoshi 2018-03-24 20:52:45 +09:00
ff7941e652 Show media modal on public pages (#6801) Akihiko Odaki 2018-03-24 20:52:26 +09:00
1c15329cce Change “Toots with replies” to “Toots and replies” (#6875) Marcin Mikołajczak 2018-03-24 12:51:51 +01:00
b2a4ffd3a9 Change columns in notifications nonnullable (#6764) Akihiko Odaki 2018-03-24 20:51:28 +09:00
fa310695fa Note if the user is already following the target when authorizing follow (#6325) Akihiko Odaki 2018-03-24 20:50:41 +09:00
580835ab69 Invites: Add '1 week' as expire option (#6872) Jeroen 2018-03-24 12:50:14 +01:00
54b273bf99 Close http connection in perform method of Request class (#6889) Akihiko Odaki 2018-03-24 20:49:54 +09:00
4e71b104e6 Internationalize unexpected error message (#6887) Akihiko Odaki 2018-03-24 18:54:19 +09:00
65c10c0bc8 Weblate translations (2018-03-23) (#6874) Yamagishi Kazutoshi 2018-03-24 09:04:02 +09:00
995b59526b

Re-insert stack size fix in Dockerfile David Yip 2018-03-23 12:09:22 -05:00
1772034ef2

Merge pull request #398 from ashkitten/compressed-notifs David Yip 2018-03-23 11:57:12 -05:00
03b2f701e7 Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master Jenkins 2018-03-23 10:17:18 +00:00
ecdc5957a3 [i18n] Occitan update (#6869) Quentí 2018-03-23 10:52:25 +01:00
58eeb92755 expanded notifications show like default Ash Levy 2018-03-22 10:10:04 -04:00
6cc432bbc4

Bump version to 2.3.2 Eugen Rochko 2018-03-22 14:13:46 +01:00
dafae9818d

Bump version to 2.3.2rc5 Eugen Rochko 2018-03-22 11:31:52 +01:00
9fe1619db9

Do not re-query mentions from serializers (#6858) Eugen Rochko 2018-03-22 11:31:17 +01:00
da70aca28e

Restore username validation to disallow dots, for now (#6863) Eugen Rochko 2018-03-22 11:30:22 +01:00
6f531d140b Fix MENTION_RE to not match nil usernames (#6862) ThibG 2018-03-22 10:45:48 +01:00
f66a786029

Hide floating action button on thread views (#6859) Eugen Rochko 2018-03-22 09:33:14 +01:00
9c3e4bdead

Merge remote-tracking branch 'personal/merge/tootsuite/master' into gs-master David Yip 2018-03-21 13:39:31 -05:00
6290cd7969 Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master Jenkins 2018-03-21 17:17:20 +00:00
d97903a358 Update sanitize and loofah (#6855) Patrick Figel 2018-03-21 17:43:28 +01:00
93897134ca

Permit dots in usernames with conditions (#6844) Eugen Rochko 2018-03-21 10:26:53 +01:00
a6b59cd1a3 Remove debug option from Babel preset env (#6852) Akihiko Odaki 2018-03-21 18:26:15 +09:00
f64af6473f

Bump version to 2.3.2rc4 Eugen Rochko 2018-03-20 23:49:24 +01:00
e8aeec4fea Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master Jenkins 2018-03-20 19:17:20 +00:00
ac49c7932d

Add LDAP_TLS_NO_VERIFY option, don't require LDAP_ENABLED outside .env (#6845) Eugen Rochko 2018-03-20 19:41:51 +01:00
2649cce3a0

Merge pull request #396 from ThibG/glitch-soc/fixes/compose-suggestions David Yip 2018-03-20 10:48:33 -05:00
61dcb686a8 Fix i18n fallback configuration conflicts with environment configurations (#6843) Akihiko Odaki 2018-03-21 00:36:20 +09:00
9381a7d9d5

Use username/domain to match existing accounts in ActivityPub (#6842) Eugen Rochko 2018-03-20 14:57:46 +01:00
12b0ea0667 [Glitch] Cancel outdated pending compose suggestions Thibaut Girka 2018-03-20 14:17:49 +01:00
a5c6c748e0 Cancel outdated pending compose suggestions (#6838) ThibG 2018-03-20 12:40:12 +01:00
36b5703796 request: in the event of failure, try other IPs (#6761) (#6813) Rey Tucker 2018-03-20 04:06:08 -04:00
0fa0836e63

Merge remote-tracking branch 'personal/merge/tootsuite/master' into gs-master David Yip 2018-03-19 15:41:59 -05:00
c074b226b6

Merge pull request #394 from ashkitten/compressed-notifs David Yip 2018-03-19 15:41:09 -05:00
df70571bfe Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master Jenkins 2018-03-19 20:17:18 +00:00
ff6b8a6443 Serialize mentions in the order they are added (#6836) ThibG 2018-03-19 20:19:35 +01:00
6b76a6212d Display content warning in mail notification emails (#6832) ThibG 2018-03-19 20:12:20 +01:00
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 +01:00
0306e3e9be bugfixes and gem update (#6831) Alexander 2018-03-19 20:08:56 +01:00
357f9298bd Fix e-mail changed notification (fixes #6778) (#6835) ThibG 2018-03-19 20:07:47 +01:00
f7c46fc113 Weblate translations 20180319 (#6827) Renato "Lond" Cerqueira 2018-03-19 15:12:06 +01:00
74c39fada0

Bump version to 2.3.2rc3 Eugen Rochko 2018-03-19 12:20:57 +01:00
5b00b8f0da fix .status__info__icons layout Ash Lea 2018-03-18 23:49:30 -04:00
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