catstodon

CatCatNya/catstodon

Fork 0

forked from glitch-soc-github-mirror/mastodon

Commit graph

b469a8d688 Update Chinese (Simplified) Translations (#7816) SerCom_KC 2018-06-16 17:24:54 +08:00
97b2ba4240 Update fa.json (#7814) Masoud Abkenar 2018-06-16 03:05:45 +02:00
e8ccac468a [Glitch] Add vendor prefix for background-clip Thibaut Girka 2018-06-15 21:09:17 +02:00
8cafeedc25 Port 85470ec872 to glitch emoji picker. David Yip 2018-06-15 12:10:45 -05:00
db200226b8 Merge branch 'master' into glitch-soc/merge-upstream Thibaut Girka 2018-06-15 20:51:39 +02:00
3b8023f9f9

Bump version to 2.4.2rc1 Eugen Rochko 2018-06-15 20:38:41 +02:00
0df91c7b1e

Add dat, dweb, ipfs, ipns, ssb, gopher protocols to URL extractor (#7810) Eugen Rochko 2018-06-15 20:21:47 +02:00
09147186b7

Fix regression where CW is focused on reply (#7811) Eugen Rochko 2018-06-15 19:49:32 +02:00
53f0452b70

Remove rack-timeout (#7809) Eugen Rochko 2018-06-15 19:46:25 +02:00
ca85658975

Add autofollow option to invites (#7805) Eugen Rochko 2018-06-15 18:00:23 +02:00
33dd9bf36d

Fix vertical alignment of navigation bar (#7807) Eugen Rochko 2018-06-15 18:00:03 +02:00
c3b3594305

Remove placeholder text for media-only toots (#7806) Eugen Rochko 2018-06-15 15:51:51 +02:00
1cc775200e

Add "find friends", "invite people", and more to getting started footer (#7803) Eugen Rochko 2018-06-15 15:51:37 +02:00
4f42238c29 Put "Media Only" option in column settings instead of content area headline (#7801) chr v1.x 2018-06-15 02:15:15 -07:00
afceef74c2 Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master Jenkins 2018-06-14 06:17:24 +00:00
f972815f1b Hide status content when spoiler text is not empty (#7797) Yamagishi Kazutoshi 2018-06-14 15:03:51 +09:00
79a468016a Fix "Invalid DOM property class" (#7798) Yamagishi Kazutoshi 2018-06-14 15:03:07 +09:00
9d2b7ef9f8

Merge pull request #540 from lanodan/glitch-soc-pr/charLimit David Yip 2018-06-13 22:46:31 -05:00
ad8814232f Add tests for following accounts controller (#7800) Shuhei Kitagawa 2018-06-14 10:49:17 +09:00
6bae583d2f

Handle character limit in initial state in frontend. Lain Iwakura 2017-11-14 16:24:10 +01:00
0338da1699 Add profile options on compose form (#7789) chr v1.x 2018-06-13 05:44:50 -07:00
5b47774ab8 Add tests for followers_accounts_controller (#7794) Shuhei Kitagawa 2018-06-13 10:28:39 +09:00
f1bfcb50f0

Merge pull request #531 from glitch-soc/454-allow-keyword-mutes-to-skip-mentions David Yip 2018-06-12 19:28:08 -05:00
5cff053944

Merge branch 'master' into 454-allow-keyword-mutes-to-skip-mentions David Yip 2018-06-12 18:13:30 -05:00
f6bb50b6ec

Merge pull request #539 from glitch-soc/merge-upstream David Yip 2018-06-12 18:12:29 -05:00
99b2bc2668

keyword mute: Add missing scope for regex escape test David Yip 2018-06-12 17:48:38 -05:00
fac6e392e9

Port emojimart 2.6.1 changes to glitch flavour David Yip 2018-06-12 17:43:50 -05:00
908a770d2b

keyword mute: use mentions scope in home feed filtering (#454) David Yip 2018-06-12 17:14:35 -05:00
e931cf656d

Merge remote-tracking branch 'glitchsoc/master' into 454-allow-keyword-mutes-to-skip-mentions David Yip 2018-06-12 16:39:30 -05:00
4d8d1fa129 Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master Jenkins 2018-06-12 13:17:21 +00:00
6151308c47 Add missing tests for admin/accounts_controller (#7791) Shuhei Kitagawa 2018-06-12 21:24:46 +09:00
0979d4275a

Bump version to 2.4.1 Eugen Rochko 2018-06-10 17:20:56 +02:00
7e27a3c225 Uniform media and video spoiler settings and fix them of the light theme (#7778) Lynx Kotoura 2018-06-10 23:54:22 +09:00
01ee460ceb Weblate translations (2018-06-10) (#7779) Yamagishi Kazutoshi 2018-06-10 23:53:49 +09:00
a99179d31f Control the focus when clicking the "CW" button. (#7776) kedama 2018-06-10 23:13:30 +09:00
268d90e810 Rename emoji sheet to avoid caching issue (#7777) Renato "Lond" Cerqueira 2018-06-10 16:12:47 +02:00
35ae960122

Bump version to 2.4.1rc4 Eugen Rochko 2018-06-10 00:39:56 +02:00
6310dd233a Migration to cleanup blocked users that are still following (#7773) nightpool 2018-06-09 18:38:17 -04:00
7086aa598b Add tests for intents_controller (#7763) Shuhei Kitagawa 2018-06-10 05:47:50 +09:00
10f51c9886

Fix domain hiding logic (#7765) Eugen Rochko 2018-06-09 22:46:54 +02:00
91e5d9f8af Fix background color of emoji-mart-bar in light theme (#7768) Lynx Kotoura 2018-06-10 05:21:37 +09:00
3df8c40508 Adjust emoji-mart-anchor-bar for environments that use display scaling (#7772) Lynx Kotoura 2018-06-10 05:20:57 +09:00
17dc07f667

Fix has_one association on Web::PushSubscription (#7767) Eugen Rochko 2018-06-09 21:11:14 +02:00
a043f8d277

Ensure emoji-mart dependency is updated (#7771) Eugen Rochko 2018-06-09 21:10:53 +02:00
34f1fd2a62

Merge pull request #538 from ThibG/glitch-soc/fixes/obsolote-constants David Yip 2018-06-09 11:42:56 -05:00
7d3c0e4cb4 Delete references to removed constants (fixes #537) Thibaut Girka 2018-06-09 18:14:23 +02:00
f9eb4ea80a

Merge pull request #506 from ThibG/glitch-soc/fixes/static-500 David Yip 2018-06-09 10:39:55 -05:00
fc132915ec Update Chinese (Simplified) translations (#7769) SerCom_KC 2018-06-09 23:07:23 +08:00
18e1de6a16

Migrate old web push subscriptions to ensure deliveries (#7764) Eugen Rochko 2018-06-09 13:33:04 +02:00
85470ec872 Fix issues with updated emoji mart (#7761) Renato "Lond" Cerqueira 2018-06-08 13:28:04 +02:00
a9515f3186

Merge pull request #535 from glitch-soc/merge-upstream David Yip 2018-06-08 00:33:09 -05:00
6671297e7a Weblate translations (2018-06-08) (#7759) Yamagishi Kazutoshi 2018-06-08 11:50:52 +09:00
6ba7d9d0d9

Do not accept ActivityPub follow requests from blocked user (#7756) Eugen Rochko 2018-06-08 00:14:06 +02:00
9b9e96eae5

Add "Edit profile" link to public profile page, increase bottom padding (#7754) Eugen Rochko 2018-06-07 22:40:55 +02:00
0c3ce41031 Update to emojimart 2.6.1 (#7746) Renato "Lond" Cerqueira 2018-06-07 19:40:23 +02:00
8142bd2553

Merge remote-tracking branch 'tootsuite/master' into merge-upstream David Yip 2018-06-07 05:13:49 -05:00
f8d50a4070

Merge pull request #509 from ThibG/glitch-soc/fixes/router-history-navigation David Yip 2018-06-06 23:56:48 -05:00
2304d52599 🌍🇵🇱 (#7753) Marcin Mikołajczak 2018-06-06 21:37:43 -07:00
158cd7ee74

Bump version to 2.4.1rc3 Eugen Rochko 2018-06-06 21:27:06 +02:00
59b42188a7

Filter out blocked/muted people from profile timelines (#7747) Eugen Rochko 2018-06-06 21:13:30 +02:00
683707839f Fix fetch of remote image with multiple Content-Type headers (#7749) Yamagishi Kazutoshi 2018-06-07 03:50:07 +09:00
c75493755f

Preserve newlines in delete & redraft and desktop notifications (#7750) Eugen Rochko 2018-06-06 20:49:53 +02:00
b7b331ad0d Add missing dot for remote image (#7751) Yamagishi Kazutoshi 2018-06-07 03:49:39 +09:00
68373e799b

Merge pull request #534 from glitch-soc/restructure-kw-as-word-lists David Yip 2018-06-05 21:38:04 -05:00
12fa2500c4 Add missing tests for sessions controller (#7744) Shuhei Kitagawa 2018-06-06 10:23:22 +09:00
d8b4f39007 Weblate translations 20180605 (#7743) Renato "Lond" Cerqueira 2018-06-05 20:28:29 +02:00
aa177bdca7 Add missing locale strings (#7742) Renato "Lond" Cerqueira 2018-06-05 20:11:03 +02:00
fab65fb7e5

Bump version to 2.4.1rc2 Eugen Rochko 2018-06-05 11:53:30 +00:00
a640c322c1

Escape metacharacters in non-whole-word keyword mutes. Fixes #533. David Yip 2018-06-05 02:49:28 -05:00
bd0791d800

Add redraft function (#7735) Eugen Rochko 2018-06-05 00:17:38 +02:00
f009fef40b

Merge pull request #530 from glitch-soc/restructure-kw-as-word-lists David Yip 2018-06-04 15:58:23 -05:00
5fb013878f Fix context performance by partially reverting #7083 (#7734) nightpool 2018-06-04 16:20:12 -04:00
dc73241bd9 Detect extname from Content-Type (#7733) Yamagishi Kazutoshi 2018-06-05 01:58:36 +09:00
1637d24af4 fix RuboCop error (#7442) Chikahiro Tokoro 2018-06-04 14:49:10 +02:00
e3fb528d12 Skip processing when HEAD method returns 501 (#7730) Yamagishi Kazutoshi 2018-06-04 20:42:53 +09:00
e0354aba7c Add vendor prefix for background-clip (#7727) Yamagishi Kazutoshi 2018-06-04 20:24:20 +09:00
bb0edbd988 Change border color of activity-stream (#7724) Lynx Kotoura 2018-06-04 20:13:31 +09:00
64d7a63f18 Submit report using meta key (#7729) Yamagishi Kazutoshi 2018-06-04 20:09:52 +09:00
c0fc4e9935 Remove unnecessary underline on accounts table (#7728) Yamagishi Kazutoshi 2018-06-04 20:09:36 +09:00
97d2df77aa

Add apply-to-mentions option to keyword mute UI. #454. David Yip 2018-06-03 23:10:59 -05:00
cf28049f0a

Add a FeedManager example demonstrating non-mention keywords. #454. David Yip 2018-06-03 23:04:00 -05:00
a40e322f4b

Fix spacing in some FeedManager examples. David Yip 2018-06-03 23:02:01 -05:00
26573ad7e6

Thread scopes through #matches?. #454. David Yip 2018-06-03 19:41:54 -05:00
1bbe81030c

Display numbers in account header using shortNumberFormat for consistency (#7723) Eugen Rochko 2018-06-04 05:15:50 +02:00
5bf5003384 Do not mark remote status sensitive even if spoiler text is present (#7395) Akihiko Odaki 2018-06-04 11:46:14 +09:00
73923ea6c4 Fix activity-stream-tabs colors and set text variables for text colors (#7722) Lynx Kotoura 2018-06-04 11:39:42 +09:00
c7405fda11

Fix missing column in select in mastodon:feeds:build task (#7720) Eugen Rochko 2018-06-04 04:21:15 +02:00
e18390cfe6

Fix bug in order of conversations in web UI (#7721) Eugen Rochko 2018-06-04 04:19:16 +02:00
22caa32ba2 Add tests for embeds controller (#7719) Shuhei Kitagawa 2018-06-04 10:35:56 +09:00
6b2f4f8c09

"Show" instead of "return to" after (remote)-following (#7718) Eugen Rochko 2018-06-04 03:00:36 +02:00
c55263027a

Merge remote-tracking branch 'origin/master' into gs-master David Yip 2018-06-03 19:44:05 -05:00
0deb9fa6b9

Remove trending hashtags (#7711) Eugen Rochko 2018-06-04 02:18:18 +02:00
37d495eeeb

keyword mute: Store keywords as a list David Yip 2018-06-03 18:12:55 -05:00
0f979c3460

Merge pull request #529 from glitch-soc/tweak-491 David Yip 2018-06-03 04:22:20 -05:00
d757c8a644

prefs: Note that favourite confirmation applies to Glitch flavour only (#491) David Yip 2018-06-03 03:40:27 -05:00
5dd2a78034

Merge pull request #528 from glitch-soc/merge-upstream David Yip 2018-06-03 03:01:09 -05:00
8343f56b2c

Whoops, forgot to clean up a conflict. David Yip 2018-06-03 02:35:54 -05:00
cfdbb36bdf

Merge pull request #519 from ThibG/glitch-soc/fixes/status-node-null David Yip 2018-06-02 16:19:06 -05:00
3550470c18

Merge remote-tracking branch 'origin/master' into gs-master David Yip 2018-06-02 16:15:36 -05:00
a641d1b5b8

Merge remote-tracking branch 'personal/merge/tootsuite/master' into gs-master David Yip 2018-06-02 16:08:31 -05:00
00512ecf87 Add tests for migrations_controller (#7707) Shuhei Kitagawa 2018-06-02 18:52:16 +09:00
89c86ee521 Weblate translations (2018-06-02) (#7705) Yamagishi Kazutoshi 2018-06-02 10:03:08 +09:00
6e6c0e9613

Use different algorithm for trending tags (#7697) Eugen Rochko 2018-06-01 19:19:44 +02:00
8d6e4e0485

Fix margin between compose warning, reply indicator and textarea (#7701) Eugen Rochko 2018-06-01 19:19:30 +02:00
73c0c36e7b

Improve trends layout (#7700) Eugen Rochko 2018-06-01 19:18:37 +02:00
69b45350fe Add loading indicator for trending tags (#7693) Yamagishi Kazutoshi 2018-06-01 21:22:42 +09:00
bfa12239e8 Update ESLint for Code Climate (#7696) Yamagishi Kazutoshi 2018-06-01 21:03:19 +09:00
15ce60f610 Fix duplicate key attributes (#7694) Yamagishi Kazutoshi 2018-06-01 21:02:49 +09:00
9ad5de8a3a

Merge pull request #501 from ThibG/glitch-soc/features/red-bookmarks David Yip 2018-06-01 00:36:48 -05:00
0aba716fe1

Merge pull request #471 from impiaaa/thread-icon David Yip 2018-06-01 00:35:13 -05:00
e5f25a73f2 Adjust spacing between status icons Spencer Alves 2018-05-31 21:55:44 -07:00
7d2e6429c2 Merge branch 'glitch' into thread-icon Spencer Alves 2018-05-31 21:33:16 -07:00
fb1ae0152d

Wrong exception class: ActiveRecord::RecordNotUnique, not PG::UniqueViolation (#7688) Eugen Rochko 2018-05-31 17:22:33 +02:00
19b4c666f7

Improve account index migration (#7684) Eugen Rochko 2018-05-31 17:09:09 +02:00
1e938b966e

Exclude unlisted, private and direct toots from affecting trends (#7686) Eugen Rochko 2018-05-31 16:47:28 +02:00
0ce5339a7b

Make the refresh trends button refresh trends (#7685) Eugen Rochko 2018-05-31 16:46:02 +02:00
691107263c Put the CW field between the toot we are replying to and the toot field (#7508) Mélanie Chauvel (ariasuni) 2018-05-31 15:16:31 +02:00
b9fdeceb3c Make active bookmarks red (fixes #493) Thibaut Girka 2018-05-21 18:57:51 +02:00
cc396f085d Use history.state to decide whether we should goBack() or go to / (fixes #247) Thibaut Girka 2018-05-23 14:17:05 +02:00
f86d280fd6 Use props.router instead of context.router, as we are using withRouter Thibaut Girka 2018-05-23 12:55:31 +02:00
e8a9627f66 Hardcode default skin/theme in error layout (fixes #373) Thibaut Girka 2018-05-22 18:29:11 +02:00
893f2aff20 Prevent a rare crash when a status' root node is undefined Thibaut Girka 2018-05-26 19:21:02 +02:00
e396fbfe3b Fix direct timeline Thibaut Girka 2018-05-31 14:13:35 +02:00
648a22637c Weblate translations (2018-05-31) (#7681) Yamagishi Kazutoshi 2018-05-31 20:00:40 +09:00
063d4d4ccc 🌍: 🇵🇱⬆️ (#7679) Marcin Mikołajczak 2018-05-31 04:15:38 +02:00
165b5dc7f5 Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master Jenkins 2018-05-31 01:17:25 +00:00
c61c4565ab

Fix nil error in migration (#7680) Eugen Rochko 2018-05-31 02:30:37 +02:00
ad40bf5e0c

Speed up some rake tasks by moving execution to Sidekiq (#7678) Eugen Rochko 2018-05-30 21:09:30 +02:00
a29f196f95

Bump version to 2.4.1rc1 Eugen Rochko 2018-05-30 19:16:41 +02:00
3623aea6c9

Redirect / to home on mobile layout, to getting started on desktop (#7677) Eugen Rochko 2018-05-30 18:42:06 +02:00
1a7a74ff76

Improve getting started column (#7676) Eugen Rochko 2018-05-30 18:41:47 +02:00
9130b3cda9 Fix broken migrate (regression from #7658) (#7674) Yamagishi Kazutoshi 2018-05-30 16:39:52 +09:00
a16e06bbf5

Deduplicate accounts and make unique username/domain index case-insensitive (#7658) Eugen Rochko 2018-05-30 02:51:26 +02:00
a7d726c383

Improve counter caches on Status and Account (#7644) Eugen Rochko 2018-05-30 02:50:23 +02:00
461542784b

Reduce wasted work in RemoveStatusService due to inactive followers (#7672) Eugen Rochko 2018-05-29 22:55:33 +02:00
e7b3a4263e [Glitch] Fix low-contrasted cancel button of reply indicator Thibaut Girka 2018-05-27 16:13:26 +02:00
08dbe29e29 [Glitch] Improve load gap styling in web UI Thibaut Girka 2018-05-27 20:23:56 +02:00
cc589d6ec0 [Glitch] Use randomized setTimeout when fallback-polling and re-add since_id Thibaut Girka 2018-05-27 19:42:45 +02:00
fbc25bdd2d [Glitch] Do not crash in getStatusIds when there is a gap in the timeline Thibaut Girka 2018-05-27 19:35:27 +02:00
5cc4d34250 [Glitch] Fix gap insertion for timeline disconnection Thibaut Girka 2018-05-27 19:34:50 +02:00
15bef77add [Glitch] Fix ID duplication in timelines Thibaut Girka 2018-05-27 19:34:08 +02:00
4b38ac3bed [Glitch] Fix comparing id Thibaut Girka 2018-05-27 19:33:28 +02:00
6020a21130 [Glitch] Fix LoadMore on account media gallery Thibaut Girka 2018-05-27 19:32:25 +02:00
5d16fd3f28 [Glitch] Add missing null handling in notification reducer Thibaut Girka 2018-05-27 19:31:46 +02:00
4eba8c50c3 [Glitch] Allow clients to fetch notifications made while they were offline Thibaut Girka 2018-05-27 19:30:52 +02:00
0ad3eedd4c [Glitch] Allow clients to fetch statuses made while they were offline Thibaut Girka 2018-05-27 19:10:37 +02:00
7706ed038f Fix context building in the reducer (#7671) unarist 2018-05-30 00:42:29 +09:00
532fb8e215 Fix error when unmuting a domain without listing muted domains first Thibaut Girka 2018-05-29 15:19:27 +02:00
0345cd5a0f Fix error when unmuting a domain without listing muted domains first (#7670) ThibG 2018-05-29 16:25:05 +02:00
6a1544bd46

Merge pull request #525 from ThibG/glitch-soc/merge-upstream David Yip 2018-05-29 09:06:00 -05:00
c087738270 Merge branch 'master' into glitch-soc/merge-upstream Thibaut Girka 2018-05-29 13:52:26 +02:00
90908fc24b Fix N+1 on AtomSerializer (#7669) abcang 2018-05-29 20:34:02 +09:00
13b60e6a14 Use URL polyfill (#7664) Yamagishi Kazutoshi 2018-05-29 20:33:20 +09:00
8bb74e50be

Add GET /api/v2/search which returns rich tag objects, adjust web UI (#7661) Eugen Rochko 2018-05-29 02:01:24 +02:00
90b64c0069

Always display tab navigation on local/federated timeline even when empty (#7663) Eugen Rochko 2018-05-29 02:01:04 +02:00
e599d7caf2 Rescue Mastodon::DimensionsValidationError in Remoteable (#7662) Eugen Rochko 2018-05-29 01:39:02 +02:00
d95642f6d9 Cache attachments on external host with service worker (#7493) Akihiko Odaki 2018-05-29 07:43:47 +09:00
03f4c214b4 fix: Don't validate MX record in development (#7654) takayamaki 2018-05-29 02:14:24 +09:00
c0355878ba Fix embed, error and onboarding modals in light theme (#7656) Lynx Kotoura 2018-05-29 02:13:20 +09:00
04a2cf8bcc

Fix incomplete flex style on trends items (#7655) Eugen Rochko 2018-05-28 19:12:53 +02:00
b0b34a5e38 Add a test for emojis_controller (#7652) Shuhei Kitagawa 2018-05-28 22:56:58 +09:00
b87a1229c7 optimize direct timeline (#7614) tateisu 2018-05-28 18:04:06 +09:00
ab36e0ef72 Record trending tags from ActivityPub, too (#7647) Eugen Rochko 2018-05-28 05:21:04 +02:00
dfbadd6837

Replace recursion in status mapStateToProps (#7645) Eugen Rochko 2018-05-28 02:42:06 +02:00
9bd23dc4e5

Track trending tags (#7638) Eugen Rochko 2018-05-27 21:45:30 +02:00
8b98afa781 [Glitch] Replace onScrollToBottom with onLoadMore Thibaut Girka 2018-05-27 17:46:48 +02:00
a81ed7b205 Do not needlessly refresh pinned toots Thibaut Girka 2018-05-27 17:42:54 +02:00
60addb14ce [Glitch] Change icon for domain blocks Thibaut Girka 2018-05-27 17:41:32 +02:00
b7508940b7 [Glitch] Add option to show only local toots in timeline preview Thibaut Girka 2018-05-27 17:06:13 +02:00
1fa3586db5 [Glitch] Use streaming API for standalone timelines on /about and /tag pages Thibaut Girka 2018-05-27 17:10:48 +02:00
d959d04133 Change direct message warning to match upstream Thibaut Girka 2018-05-24 18:11:43 +02:00
458ec31791

Merge pull request #520 from ThibG/glitch-soc/merge-upstream ThibG 2018-05-27 14:24:57 +02:00
659b8a12ec Merge branch 'master' into glitch-soc/merge-upstream Thibaut Girka 2018-05-27 13:20:15 +02:00
c2e528916c Implement client-size image resizing from upstream Thibaut Girka 2018-05-25 11:26:37 +02:00
d253449ff0 Port upstream's result section headers (fixes #366) Thibaut Girka 2018-05-22 12:21:50 +02:00
63c7b91572 Validate that e-mail resolves with MX and it's not blacklisted (#7631) Eugen Rochko 2018-05-27 04:58:08 +02:00
182bdbc5f4 Don't use Object.assign with Notification, only display actions for mentions (#7632) Eugen Rochko 2018-05-27 04:55:19 +02:00
422f92f3f8 Fix lock icon position in account card (#7630) bsky 2018-05-26 22:29:32 +09:00
22bc07998c

Merge pull request #508 from ThibG/glitch-soc/fixes/remove-leftover-from-attachment-url-insertion ThibG 2018-05-26 13:22:49 +02:00
18d9a7fd71 Fix caret position after inserting suggestions (fixes #281) Thibaut Girka 2018-05-22 21:09:07 +02:00
d8793e1bee Remove unneeded code now that attachment URL isn't appended to toots Thibaut Girka 2018-05-22 20:21:09 +02:00
07054ee6f7 Add right margin of notification message (#7628) Lynx Kotoura 2018-05-26 17:53:53 +09:00
a0b4754231 Fix color mistakes in mastodon-light theme (#7626) Lynx Kotoura 2018-05-26 17:53:44 +09:00
62cb3b199f Weblate translations (2018-05-26) (#7624) Yamagishi Kazutoshi 2018-05-26 11:45:58 +09:00
ebf2fef029

Catch ActionController::UnknownFormat and return HTTP 406 (#7621) Eugen Rochko 2018-05-26 01:09:30 +02:00
d87649db07

Disable AMS logging (#7623) Eugen Rochko 2018-05-26 01:08:31 +02:00
a5c25242af

Merge pull request #514 from ThibG/glitch-soc/fixes/fix-hardcoded-fav ThibG 2018-05-25 22:03:31 +02:00
a4f68f90db

Merge pull request #518 from ThibG/glitch-soc/merge-master ThibG 2018-05-25 21:41:25 +02:00
11cc2e099a Merge branch 'master' into glitch-soc/merge-master Thibaut Girka 2018-05-25 18:59:02 +02:00
c7ac039697 Remove Puma pidfile before boot if container receives SIGTERM (#7052) Isatis 2018-05-25 09:50:31 -07:00
023fe5181b Introduce flat layout to contexts reducer (#7150) Akihiko Odaki 2018-05-26 01:46:28 +09:00
8182b61518 Enable media timeline (#7598) Yamagishi Kazutoshi 2018-05-26 01:36:46 +09:00
7ea91dcbb3 More polished light theme (#7620) Lynx Kotoura 2018-05-26 01:36:26 +09:00
6042403621 Fix color of /about/more link anchors (#7618) Lynx Kotoura 2018-05-25 23:48:17 +09:00
9b75a13104

Merge pull request #517 from ThibG/glitch-soc/fixes/max_toot_chars ThibG 2018-05-25 14:44:20 +02:00
3f8f5642a1 Added the law requirements for the EU/EEA (#7605) Jeroen 2018-05-25 14:27:14 +02:00
cdbdf7f98b Ignore multiple occurrences of a hashtag within a status (fixes #7585) (#7606) ThibG 2018-05-25 14:26:45 +02:00
c1d0f96bb4 Add missing comma in InitalStateSerializer (fixes #516) Thibaut Girka 2018-05-25 14:06:48 +02:00
4c91215e1f [Glitch] Use .star-icon instead of hardcoding color in detailed statuses Thibaut Girka 2018-05-25 11:16:11 +02:00
2587fcdd27 Use .star-icon instead of hardcoding color in detailed statuses (fixes #7610) (#7613) ThibG 2018-05-25 03:03:22 +02:00