catstodon

CatCatNya/catstodon

Fork 0

forked from glitch-soc-github-mirror/mastodon

Commit graph

b1d4471e36 Throttle media post (#7337) Akihiko Odaki 2018-05-04 00:32:00 +09:00
7495a3470e Add el and te (#7332) Yamagishi Kazutoshi 2018-05-03 22:54:10 +09:00
e9c5c16ba0 Delete dump.rdb (#7334) Yamagishi Kazutoshi 2018-05-03 21:30:18 +09:00
581a5c9d29 Fixes/do not override timestamps (#7331) ThibG 2018-05-03 13:33:08 +02:00
d5fa4fbcd2

Revert "Do not override timestamps for incoming toots" (#7330) Eugen Rochko 2018-05-03 12:32:33 +02:00
dfa6bccb64 Weblate translations 20180503 (#7325) Renato "Lond" Cerqueira 2018-05-03 12:12:09 +02:00
58852695c8 Prevent timeline from moving when cursor is hovering over it (fixes #7278) (#7327) ThibG 2018-05-03 12:09:11 +02:00
ab773e4d5f Add pry-byebug (#7307) Shuhei Kitagawa 2018-05-03 19:08:54 +09:00
bd36791832 Do not override timestamps for incoming toots (#7326) ThibG 2018-05-03 11:42:52 +02:00
28b366d065 Add missing tests for report.rb (#7324) Shuhei Kitagawa 2018-05-03 17:42:36 +09:00
ad5d3134e4 Place emoji picker top if it is closer to the bottom of the viewport (fixes #7277) (#7314) ThibG 2018-05-03 10:42:18 +02:00
a5293fdf61

Fix n+1 queries in StatusThreadingConcern (#7321) Eugen Rochko 2018-05-03 10:41:58 +02:00
a3d84e705a

Fix cache_associated no longer working (#7320) Eugen Rochko 2018-05-03 10:41:41 +02:00
28bd4b9800

Serialize webfinger XML with Ox instead of Nokogiri (#7319) Eugen Rochko 2018-05-02 22:28:46 +02:00
658cbc9425

Improve PostStatusService performance (#7317) Eugen Rochko 2018-05-02 22:10:57 +02:00
cb5b5cb5f7

Slightly reduce RAM usage (#7301) Eugen Rochko 2018-05-02 18:58:48 +02:00
71a7cea73f Keep notification when muting_notifications is true (#7311) abcang 2018-05-02 23:14:51 +09:00
d0cdd5cf94 Accept actor object updates from all supported actor types (#7312) ThibG 2018-05-02 16:08:16 +02:00
cae933510c

Allow updating bio fields via PUT /api/v1/accounts/update_credentials (#7288) Eugen Rochko 2018-05-02 15:57:37 +02:00
f62539ce5c

Remove most behaviour disparities between blocks and mutes (#7231) Eugen Rochko 2018-05-02 15:50:20 +02:00
c5dcd7d836

Speed up test suite by not generating RSA keys in test environment (#7296) Eugen Rochko 2018-05-02 15:45:24 +02:00
965345316f

Guard against nil URLs in Request class (#7284) Eugen Rochko 2018-05-02 15:44:22 +02:00
6c40e567aa Add missing tests for user.rb (#7306) Shuhei Kitagawa 2018-05-02 21:13:52 +09:00
70a16d8858 [Glitch] Improve relative timestamps in web UI Thibaut Girka 2018-05-02 13:45:40 +02:00
dc786c0cf4 Support Actors/Statuses with multiple types (#7305) Surinna Curtis 2018-05-02 05:40:24 -05:00
86efccce2a Fix low-contrasted cancel button of reply indicator (#7300) Lynx Kotoura 2018-05-01 21:02:04 +09:00
3a47842223

Merge pull request #451 from glitch-soc/450-make-non-whole-word-mutes-case-insensitive David Yip 2018-04-30 22:38:10 -05:00
5f8f481425

Also treat non-whole-word mutes as case-insensitive. #450. David Yip 2018-04-30 20:08:22 -05:00
705f1d7bf1

Fix missing updated_at attribute on emoji EntityCache (#7297) Eugen Rochko 2018-04-30 22:49:33 +02:00
16468bdf1b [i18n] Occitan update (#7294) Yamagishi Kazutoshi 2018-04-30 20:14:50 +09:00
f62ee1ddb0

Disable API access when login is disabled (#7289) Eugen Rochko 2018-04-30 09:13:14 +02:00
295e3ef02b

Fix missing domain attribute in EntityCache for emoji (#7290) Eugen Rochko 2018-04-30 09:12:55 +02:00
54f34d3f2a

Return HTTP 410 for suspended accounts in GET /api/v1/accounts/:id (#7287) Eugen Rochko 2018-04-30 09:12:36 +02:00
da61352fab

Fix "Show more" URL on paginated threads for remote statuses (#7285) Eugen Rochko 2018-04-30 01:59:42 +02:00
356d0214c9 Implement tootsuite-style account fields Thibaut Girka 2018-04-29 16:24:15 +02:00
91fb82a4dd Fix style of account fields form Thibaut Girka 2018-04-29 16:30:05 +02:00
1c3ace23cb Remove unnecessary hyphen from restore_cache key (#7276) Yamagishi Kazutoshi 2018-04-28 18:20:30 +09:00
64be38da0c

Merge pull request #448 from m4sk1n/glitch-pl beatrix 2018-04-27 10:31:08 -04:00
8de8a621f5

Merge pull request #447 from ThibG/glitch-soc/features/unfold-thread beatrix 2018-04-27 10:30:26 -04:00
fc01ae31c6 🌍: 🇵🇱⬆️ (#7275) Marcin Mikołajczak 2018-04-27 15:12:14 +02:00
deb91f5989 🌍: 🇵🇱⬆️ Marcin Mikołajczak 2018-04-27 14:15:38 +02:00
a872392cd9

Add entity cache (#7271) Eugen Rochko 2018-04-27 01:38:10 +02:00
63553c6b5c

Add support for separate Redis for cache (#7272) Eugen Rochko 2018-04-27 01:37:59 +02:00
0ce06657c0 Update react-redux to 5.0.7 to fix an issue with getDerivedStateFromProps Thibaut Girka 2018-04-27 00:45:44 +02:00
1222e0a381 Use new getDerivedStateFromProps instead of deprecated componentWillReceiveProps Thibaut Girka 2018-04-26 20:23:25 +02:00
b39f3648a7 Tentative fix for #446 Thibaut Girka 2018-04-26 19:39:10 +02:00
f4ed38272b

Merge pull request #401 from ThibG/glitch-soc/features/unfold-thread beatrix 2018-04-26 11:34:14 -04:00
8f12afb599

Merge pull request #438 from ThibG/glitch-soc/fixes/j-k-hotkeys-pinned beatrix 2018-04-26 11:33:48 -04:00
1e9fe95e13

Merge pull request #439 from ThibG/glitch-soc/fixes/emoji-shortcode-inline beatrix 2018-04-26 11:33:36 -04:00
33691f4920

Merge pull request #440 from ThibG/glitch-soc/fixes/video-fullscreen beatrix 2018-04-26 11:33:24 -04:00
36b6631c12 Add Basque language support (#7267) Yamagishi Kazutoshi 2018-04-26 20:56:45 +09:00
3afdd6a17b Weblate translations 20180426 (#7266) Renato "Lond" Cerqueira 2018-04-26 11:58:22 +02:00
fa5b28df8a Better phrasing in swedish translation (#7263) Stefan Midjich 2018-04-26 00:36:52 +02:00
eb593a5a0c Append '.test' to hostname in stub data (#7260) MIYAGI Hikaru 2018-04-25 21:12:28 +09:00
f58dcbc981 HTTP proxy support for outgoing request, manage access to hidden service (#7134) MIYAGI Hikaru 2018-04-25 09:14:49 +09:00
9d4710ed00

Add RSS feeds for end-users (#7259) Eugen Rochko 2018-04-25 02:10:02 +02:00
bfc41711dd more sane phrasing in 🇸🇪 translation (#7256) Stefan Midjich 2018-04-25 01:54:24 +02:00
aebcf83b4d

Merge pull request #443 from unascribed/glitchsoc-pr-better-collapsed-statuses-fix David Yip 2018-04-24 14:26:53 -05:00
62bea7a290 Fix fade being colored wrongly for DMs and upon focus Una Thompson 2018-04-24 11:31:26 -04:00
7681ad8044 Weblate translations (2018-04-24) (#7252) Renato "Lond" Cerqueira 2018-04-24 11:48:11 +02:00
306267dbd2 Fix ID duplication in timelines (#7251) Akihiko Odaki 2018-04-24 18:47:27 +09:00
60b871d56c Implement the ability for instances to define a list of disallowed hashtags (#7176) Emelia Smith 2018-04-23 23:52:58 +02:00
65b8880ec9

Merge pull request #442 from ThibG/glitch-soc/fixes/actions-modal-mobile ThibG 2018-04-23 23:42:29 +02:00
240833c023 Fix actions modal on mobile (fixes #441) Thibaut Girka 2018-04-23 22:15:38 +02:00
495303d9b8 Prevent suspended accounts from appearing in AccountSearchService (#7246) Emelia Smith 2018-04-23 21:27:18 +02:00
51d276fb98 [Glitch] Fix fullscreen video player Thibaut Girka 2018-04-23 20:38:08 +02:00
53b1d88873 Fix fullscreen video player (fixes #7244) (#7245) ThibG 2018-04-23 20:12:16 +02:00
1258efa882 Paginate descendant statuses in public page (#7148) Akihiko Odaki 2018-04-24 02:27:35 +09:00
06817b3c1f tasks/mastodon: fix prompt for Redis password (#7241) Alejandro Martinez Ruiz 2018-04-23 15:03:58 +01:00
3ccca6cece 🌍: Make 🇵🇱 translation more consistent (#7239) Marcin Mikołajczak 2018-04-23 11:49:03 +02:00
9613a53cb3 Update dependencies for Ruby (2018-04-23) (#7237) Yamagishi Kazutoshi 2018-04-23 18:29:17 +09:00
7db7d68136

Detect and prevent image bombs, max. processable dimension 4096^2 (#7229) Eugen Rochko 2018-04-23 09:16:38 +02:00
3bf6da1ffc Move precompile step to build stage (#7235) Yamagishi Kazutoshi 2018-04-23 16:16:26 +09:00
0758b00bfd Refactor resizeImage method (#7236) Yamagishi Kazutoshi 2018-04-23 16:15:51 +09:00
660cb058e1

Improve relative timestamps in web UI (#7233) Eugen Rochko 2018-04-23 00:43:53 +02:00
05fb6f096d

Resize images before upload in web UI to reduce bandwidth (#7223) Eugen Rochko 2018-04-23 00:43:36 +02:00
003d114332 [Glitch] Fix the hot key (j, k) does not function correctly when there is a pinned toot in account timeline. Thibaut Girka 2018-04-22 22:08:30 +02:00
105ffaef8f [Glitch] Do not set emoji as inline-block Thibaut Girka 2018-04-22 22:10:53 +02:00
75c4ab9d12

Remove "nsfw" category for sensitive statuses in OStatus serializer (#7048) Eugen Rochko 2018-04-22 22:09:03 +02:00
b383c0688a [Glitch] Do not overwrite some status attributes in reducer Thibaut Girka 2018-03-29 17:52:41 +02:00
64d8d0464d Add show more/less toggle for entire threads in web UI Thibaut Girka 2018-03-28 19:56:46 +02:00
2888f74c12 Refactor the infamous three-valued boolean into two booleans, trying to simplify the logic Thibaut Girka 2018-03-28 15:40:34 +02:00
259bc9840b [Glitch] Fix style of legacy column headers Thibaut Girka 2018-03-28 17:13:13 +02:00
63d671b18f [Glitch] Fix button hiding when header title is too long Thibaut Girka 2018-03-16 17:21:28 +01:00
abf7c5b850 [Glitch] Fix column headers accessibility Thibaut Girka 2018-03-16 17:19:38 +01:00
06fc278e4c

Merge pull request #432 from ThibG/glitch-soc/features/reblog-private beatrix 2018-04-22 12:32:58 -04:00
8f1ec48cbe

Merge pull request #421 from ThibG/glitch-soc/features/custom-emoji-api beatrix 2018-04-22 12:10:48 -04:00
125e8c7f5a

Merge pull request #427 from ThibG/glitch-soc/fixes/scroll-behavior beatrix 2018-04-22 12:09:52 -04:00
cd5728b176

Merge pull request #434 from ThibG/glitch-soc/fixes/public-inline-video beatrix 2018-04-22 12:09:11 -04:00
6fb610f865

Merge pull request #433 from ThibG/glitch-soc/fixes/status-filtering beatrix 2018-04-22 12:08:12 -04:00
e88ce27855

Merge pull request #435 from ThibG/glitch-soc/features/public-modals beatrix 2018-04-22 12:07:29 -04:00
d7ae97c10a

Merge pull request #436 from unascribed/glitchsoc-pr-better-collapsed-statuses beatrix 2018-04-22 12:06:37 -04:00
5f9b85a0cf Add fade and margin to collapsed statuses Una Thompson 2018-04-22 11:29:01 -04:00
4ca2f73b12

Rescue Mastodon::LengthValidationError in Remoteable (#7228) Eugen Rochko 2018-04-22 15:42:00 +02:00
b305a23933 Fix: Use "exportierten" instead of "exportieren" in translation (#7186) jumoru 2018-04-22 14:46:19 +02:00
3c5006ec7f Fix text colors (#7227) Lynx Kotoura 2018-04-22 21:29:40 +09:00
597948fb13 Do not set emoji as inline-block (fixes #5743) (#7207) ThibG 2018-04-22 12:10:37 +02:00
ca9192d9ba Ability to specify Redis passwd on mastodon:setup (#7222) David Baucum 2018-04-22 05:49:16 -04:00
648d645c2f Fix randomly fail (similar #7219) (#7225) Yamagishi Kazutoshi 2018-04-22 18:41:39 +09:00
3fa3161472 Fix: Use "welches" instead of "dass" in translation (#7185) Matthias Beyer 2018-04-22 05:28:12 +02:00
3f6893c641 Reset locale on registration tests (#7219) Yamagishi Kazutoshi 2018-04-22 06:37:07 +09:00
9b8bb2a5df Replace badge to CircleCI (#7216) Yamagishi Kazutoshi 2018-04-22 04:56:40 +09:00
b8f0cfd6e3 Add parallel test processors (#7215) Yamagishi Kazutoshi 2018-04-22 04:36:22 +09:00
a4a36d994b Separate high contrast theme (#7213) Lynx Kotoura 2018-04-22 04:35:55 +09:00
d10447c3a8 Use raw status code on have_http_status (#7214) Yamagishi Kazutoshi 2018-04-22 04:35:07 +09:00
bfe26ef67b

Force convert to JPG for preview card thumbnails to avoid animations (#7109) Eugen Rochko 2018-04-21 21:34:36 +02:00
1a27f9f46f one grammar fix (#7212) goofy-bz 2018-04-21 20:07:25 +02:00
b438224751 Introduce rspec-retry (#7206) Yamagishi Kazutoshi 2018-04-21 02:31:30 +09:00
84214b864c Ignore keyevents during text composition (#7205) unarist 2018-04-21 01:36:52 +09:00
87e3f0a41d Fix spec for sr-Latn (#7203) Yamagishi Kazutoshi 2018-04-21 01:14:31 +09:00
23106844a1 Fix the hot key (j, k) does not function correctly when there is a pinned toot in account timeline. (#7202) TakesxiSximada 2018-04-21 01:14:21 +09:00
e4dff10934 Fix video player on toot public views Thibaut Girka 2018-04-20 16:08:46 +02:00
7a68079b3f [Glitch] Show media modal on public pages Thibaut Girka 2018-04-20 15:58:36 +02:00
ee2e0f694a Fix #6157: boosting own private toots (#7200) mayaeh 2018-04-20 21:58:33 +09:00
4e35ce8269 Fix Esc hotkey behavior (#7199) unarist 2018-04-20 21:04:16 +09:00
6f63cbb53c Replace Travis to CircleCI (#7196) Yamagishi Kazutoshi 2018-04-20 20:46:08 +09:00
084cf0babf Add extract_foreign_key_action to Mastodon::MigrationHelpers (#7195) Yamagishi Kazutoshi 2018-04-20 19:21:28 +09:00
a9c440637c

Improve report layout (#7188) Eugen Rochko 2018-04-20 02:28:48 +02:00
1663368724 Replace preload link tag to Rails helper (#7192) Yamagishi Kazutoshi 2018-04-20 09:06:53 +09:00
ed17e173d6 Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master Jenkins 2018-04-19 22:17:23 +00:00
ca2cbe8f0f Fix webkit scrollbars (#7191) beatrix 2018-04-19 17:35:47 -04:00
40006bcd03

Merge pull request #426 from ThibG/glitch-soc/features/display-focal-points David Yip 2018-04-19 10:03:49 -05:00
13fa8ec2c7 [Glitch] Fix status filtering in contexts reducer Thibaut Girka 2018-04-19 16:43:02 +02:00
f84b4d90cb [Glitch] Do not filter the status collection after muting and blocking Thibaut Girka 2018-04-19 16:42:27 +02:00
b9c35785e2 Reports: Merge contents and comment columns (#7189) Emelia Smith 2018-04-19 15:39:54 +02:00
694337d9bb Fix auto-collapsed toots making the TL jump (fixes #417) Thibaut Girka 2018-04-15 21:29:03 +02:00
931a4d1ebf Clean up dead code Thibaut Girka 2018-04-15 18:46:23 +02:00
8f8b71a278 Use React's new lifecycles for scrollable lists Thibaut Girka 2018-04-15 18:23:11 +02:00
3068384dbc Glitchsoc-specific changes to allow boosting own private toots Thibaut Girka 2018-01-17 11:48:30 +01:00
779aa707ec Only compute height dynamically for standalone media Thibaut Girka 2018-04-15 20:58:24 +02:00
52229405ed [Glitch] Make detailed status' media gallery standalone Thibaut Girka 2018-04-14 21:22:13 +02:00
dcc1c10937 [Glitch] Center thumbnails on focus point Thibaut Girka 2018-04-14 20:31:47 +02:00
f1e25b672a Use javascript to set MediaGallery height automatically Thibaut Girka 2018-04-14 19:38:00 +02:00
a95f8271be Revert some glitch-specific refactoring Thibaut Girka 2018-04-14 19:00:30 +02:00
1822ce89f9 [Glitch] retrieve custom emoji list via API instead of before page load Thibaut Girka 2018-04-07 22:05:21 +02:00
d55ab8e3e8 Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master Jenkins 2018-04-19 01:17:38 +00:00
ba917e15f6

Fix text color in "show more" link inside boost confirmation modal (#7183) Eugen Rochko 2018-04-19 02:36:31 +02:00
d2b28ea51d

Merge remote-tracking branch 'glitchsoc/master' into gs-master David Yip 2018-04-18 19:31:53 -05:00
78c145d3cb

db: make schema.rb version subsume bookmarks migration. David Yip 2018-04-18 19:08:35 -05:00
16d5217502

Merge remote-tracking branch 'origin/master' into gs-master David Yip 2018-04-18 18:48:12 -05:00
ff87d1bc3e

Rescue SSL errors when processing mentions, remove useless line (#7184) Eugen Rochko 2018-04-19 00:53:31 +02:00
1957209efd i18n: Update Polish translation (#7181) Marcin Mikołajczak 2018-04-18 17:14:21 +02:00
74dae9458d Add color variables of texts for better accesibility (#7125) Lynx Kotoura 2018-04-18 23:52:15 +09:00
0ba49eca8b Fix comparing id (#7180) abcang 2018-04-18 23:50:19 +09:00
7162a28c34 Add revealing/hiding statuses button to keyboard shortcuts legend column (#7178) Marcin Mikołajczak 2018-04-18 13:15:57 +02:00
156b916caf Direct messages column (#4514) Kaito Sinclaire 2018-04-18 04:09:06 -07:00
aedfea3554 zh-HK translation (#7177) luzi82 2018-04-18 13:28:26 +08:00
fad7b9f5f2 Adds keyboard hotkey for revealing/hiding statuses (#7173) Neil Moore 2018-04-17 21:33:59 -04:00
e5dd385431 Allow boosting own private toots (#6157) ThibG 2018-04-17 23:35:45 +02:00
11715454d0 Make scroll bars wider (#7060) Sam Schlinkert 2018-04-17 17:25:54 -04:00
897199910f Improve web api protect (#6343) abcang 2018-04-17 22:23:46 +09:00
204d72fbe4 Feature: add count of account notes to reports (#7130) Emelia Smith 2018-04-17 14:58:11 +02:00
ef12a2b74c Able to deactivate invites if they aren't expired (#7163) Jennifer Kruse 2018-04-17 06:52:08 -05:00
07a7d5959c

Fix missing "Administered by" when timeline preview disabled (#7161) Eugen Rochko 2018-04-17 13:51:14 +02:00
aab5581c43

Set Referrer-Policy to origin in web UI and public pages of private toots (#7162) Eugen Rochko 2018-04-17 13:51:01 +02:00
bb58fc003b

Fix warning about using SQL in order for Account#partitioned (#7159) Eugen Rochko 2018-04-17 13:50:48 +02:00
727917e91e Fix caret position after inserting emoji (#7167) abcang 2018-04-17 20:50:33 +09:00
609bf93029 Perform processing that does not use the database before connecting to the database (#7168) abcang 2018-04-17 20:49:09 +09:00
21837b291e

Merge pull request #430 from ThibG/glitch-soc/features/bookmarks ThibG 2018-04-17 11:46:31 +02:00
1aac83ef47 Fix the bookmark column pinning fix… Thibaut Girka 2018-04-17 11:24:07 +02:00
3c722fe687 Update French javascript locale file (#7165) Remi Rampin 2018-04-17 04:37:51 +02:00
84d0aa7b26

Merge pull request #429 from ThibG/glitch-soc/features/bookmarks ThibG 2018-04-16 23:24:51 +02:00
54f5170f59 Fix pinning the bookmarks column (fixes #428) Thibaut Girka 2018-04-16 22:52:25 +02:00
f879672554

Merge pull request #424 from ThibG/glitch-soc/features/video-player-improvements David Yip 2018-04-16 14:41:36 -05:00
1076204eb4

Merge pull request #425 from ThibG/glitch-soc/fixes/gifv-modal-size David Yip 2018-04-16 14:41:18 -05:00
7e0aed398f Fix scrolling behavior (#7151) ThibG 2018-04-16 21:04:24 +02:00
1c379b7ef4 Remove extra spaces from search API queries and public account headers (fixes #7129) (#7152) ThibG 2018-04-16 17:19:04 +02:00
1a37d7e252 Fix status filtering in contexts reducer (#7149) Akihiko Odaki 2018-04-16 18:34:34 +09:00
a1049e9380 Redirect to account status page for page of status stream entry (#7104) Akihiko Odaki 2018-04-16 17:04:31 +09:00
7c43ed04fe Weblate translations (2018-04-15) (#7141) Yamagishi Kazutoshi 2018-04-15 23:56:03 +09:00
9f5ae7c2e8 Add and revise Traditional Chinese (zh-TW) translation for serveral strings (#7002) YMHuang 2018-04-15 12:00:32 +00:00
fa04945365 Change icon for domain blocks (#7139) Marcin Mikołajczak 2018-04-15 13:58:47 +02:00
1e87ed44d5 docker-compose: Only bind ports 3000 and 4000 on localhost. (#7138) Valentin Lorentz 2018-04-15 13:57:58 +02:00
fed0b5ed04 i18n: Update Polish translation (#7131) Marcin Mikołajczak 2018-04-15 07:12:41 +02:00
5cc7c4b920 Fix extended video player (gifv) modal size Thibaut Girka 2018-04-14 21:47:56 +02:00
5d96c5ac41 [Glitch] Responsively enforce 16:9 ratio on video thumbnails in web UI Thibaut Girka 2018-04-14 17:14:04 +02:00
813da6788e

Merge remote-tracking branch 'origin/master' into gs-master David Yip 2018-04-14 09:12:50 -05:00
78ed4ab75f

Add bio fields (#6645) Eugen Rochko 2018-04-14 12:41:08 +02:00
c5dd4ed1d5 [Glitch] Fix media button type Thibaut Girka 2018-04-14 12:30:55 +02:00
dfe8abb8cd [Glitch] Handle preference to always display sensitive media Thibaut Girka 2018-04-14 12:27:14 +02:00
e3d0d72b29 Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master Jenkins 2018-04-14 09:17:23 +00:00
d66192f21c

Merge remote-tracking branch 'glitchsoc/master' into gs-master David Yip 2018-04-14 03:50:31 -05:00
78aca92689

ci: Tell Travis to expect before_script to be slow. David Yip 2018-04-14 03:04:32 -05:00
95a892accd

Merge pull request #422 from KnzkDev/ja-translation David Yip 2018-04-13 18:52:32 -05:00
dd4ad6300b

Add missing Japanese translation imncls 2018-04-14 07:53:56 +09:00
b7804028c2

Merge pull request #419 from ThibG/glitch-soc/features/bookmarks David Yip 2018-04-13 16:38:15 -05:00
ed490b781f

Merge remote-tracking branch 'origin/master' into gs-master David Yip 2018-04-13 16:36:46 -05:00
85ab30abf7 i18n: Add Japanese translations for privacy policy and more (#7049) mayaeh 2018-04-13 20:11:26 +09:00
778562c223

Ensure SynchronizeFeaturedCollectionWorker is unique and clean up (#7043) Eugen Rochko 2018-04-13 01:27:22 +02:00
9e45b051cf

When notification type filtered, ignore live updates for it (#7101) Eugen Rochko 2018-04-13 01:20:04 +02:00
14d86eb0d0 Allow more than the max pins if account is not local (#7105) Renato "Lond" Cerqueira 2018-04-12 20:36:02 +02:00
50529cbceb Upgrade Rails to version 5.2.0 (#5898) Yamagishi Kazutoshi 2018-04-12 21:45:17 +09:00
a817f084ea

Merge remote-tracking branch 'tootsuite/master' David Yip 2018-04-12 03:30:57 -05:00
eb72c3398c

Merge pull request #418 from ThibG/glitch-soc/fixes/composer-dropdowns David Yip 2018-04-12 03:28:22 -05:00
0b326950bf

Merge pull request #416 from ThibG/glitch-soc/features/media-modal David Yip 2018-04-12 00:20:19 -05:00
763cda91a8

Merge pull request #420 from ThibG/glitch-soc/fixes/reports-style David Yip 2018-04-11 15:21:17 -05:00
8e88a18316 update gem, test pam authentication (#7028) Alexander 2018-04-11 21:40:38 +02:00
acb434b0c9 Add glitch-soc front-end support for bookmarks Thibaut Girka 2018-04-11 19:42:25 +02:00
09240810b4 Add spec for bookmark endpoints Thibaut Girka 2018-04-11 21:05:08 +02:00
12f5f13fab Place privacy dropdown menu top if it is closer to the bottom of the viewport (#7106) ThibG 2018-04-11 20:42:50 +02:00