catstodon

CatCatNya/catstodon

Fork 0

forked from glitch-soc-github-mirror/mastodon

Commit graph

48dfdad492 Merge branch 'master' into patch-1 Eugen 2017-04-04 14:51:42 +02:00
ed4a723a82 Merge pull request #800 from unascribed/patch-1 Eugen 2017-04-04 14:51:01 +02:00
c359e60034 Merge pull request #799 from Wonderfall/master Eugen 2017-04-04 14:50:35 +02:00
4bb623a595 Merge pull request #832 from ndarville/patch-1 Eugen 2017-04-04 14:50:14 +02:00
7c075b5551 Merge pull request #788 from yiskah/patch-5 Eugen 2017-04-04 14:49:48 +02:00
904f9266ef Fix typo in ISSUE_TEMPLATE Niclas Darville 2017-04-04 14:49:31 +02:00
1e81cad3f3 Merge pull request #815 from walfie/patch-1 Eugen 2017-04-04 14:49:06 +02:00
8e693b8e41 Merge pull request #816 from leowzukw/patch-1 Eugen 2017-04-04 14:48:51 +02:00
60d07c06c3 Merge pull request #831 from ndarville/patch-1 Eugen 2017-04-04 14:48:22 +02:00
be2e7e1802 Create ISSUE_TEMPLATE.md Niclas Darville 2017-04-04 14:46:08 +02:00
38b504b7a7 Remove sidekiq-merger Eugen Rochko 2017-04-04 14:28:57 +02:00
82aaedec46 Reduce number of items in feeds, optimize regeneration worker slightly, make regeneration worker unique, (only schedule/execute once at a time) Eugen Rochko 2017-04-04 13:58:34 +02:00
b1f3499c38 Optimize FeedManager#unmerge, and slightly optimize FeedManager#merge Eugen Rochko 2017-04-04 13:43:36 +02:00
b21f7c28f6 Move OStatus processing back into default queue Eugen Rochko 2017-04-04 13:02:49 +02:00
ce9df2fa82 Optimize filter methods in FeedManager a bit, use redis pipelining on merge/unmerge feed methods, do not re-create a dynamic class on each feed push call, make sure redis-rb uses hiredis Eugen Rochko 2017-04-04 13:01:14 +02:00
3abb0f7bc7 Merge branch 'master' into development halna_Tanaguru 2017-04-04 12:06:53 +02:00
db4a41cf58 Merge branch 'master' into master JantsoP 2017-04-04 08:41:46 +02:00
dc89fc17cc updated translation JantsoP 2017-04-04 08:29:53 +02:00
b8243c1b49 changed line 25 for better translation JantsoP 2017-04-04 08:26:59 +02:00
e81ba26be9 More consistent typography Leo Wzukw 2017-04-04 06:58:17 +02:00
c22388fc79 Fix typo in Heroku guide walfie 2017-04-04 00:00:56 -04:00
eb023beb49 Fix #808 - smaller elephant friend PNG for frontpage Eugen Rochko 2017-04-04 02:03:16 +02:00
b510a56c0c Only call regeneration worker after first login after a 14 day break Eugen Rochko 2017-04-04 02:00:10 +02:00
4c53af64f0 Fix ActionController::Parameters in API issue Eugen Rochko 2017-04-04 01:33:34 +02:00
f722bd2387 Separate background jobs into different queues. ATTENTION: new queue "pull" must be added to the Sidekiq invokation in your systemd file Eugen Rochko 2017-04-04 00:53:20 +02:00
ce1ca28594 Changed "reblogs" to "boosts" Neville Park 2017-04-03 17:45:36 -04:00
5b6f4fdeb4 Add octodon.social Alice 2017-04-03 23:05:03 +02:00
8232f76c48 Add check for visibility.nil? even though it can't ever be, to check for race conditions Eugen Rochko 2017-04-03 22:54:46 +02:00
3f30ae1f97 accessibility fix halna_Tanaguru 2017-04-03 22:45:29 +02:00
1ed37fae9b Add fern.surgeplay.com to the instances list Aesen 2017-04-03 15:52:33 -04:00
cc451e1fcb update social.targaryen.house info Wonderfall 2017-04-03 21:36:28 +02:00
0700521ef3 added Esperanto (eo) axolotl 2017-04-03 20:22:50 +02:00
98a93aa07e Fix norwegian translation being malformed Eugen Rochko 2017-04-03 19:50:55 +02:00
68f829e11c Add basic logging of who resolved report Eugen Rochko 2017-04-03 19:27:30 +02:00
71458dc6df When taking action on a report (silence/suspend), it dismisses all other reports for that user automatically Eugen Rochko 2017-04-03 19:17:56 +02:00
ec8029a955 Updated and fixed orthography Korbinian 2017-04-03 19:10:48 +02:00
7dd5ba42a3 Updated and fixed german orthography Korbinian 2017-04-03 19:01:17 +02:00
b7c1b12367 Make default admin UI page reports. Add admin UI for creating a domain block Eugen Rochko 2017-04-03 18:55:06 +02:00
8a45a97e2e Add instances from instances.mastodon.xyz shel 2017-04-03 12:28:36 -04:00
f6e9251054 Merge pull request #777 from chriswk/master Eugen 2017-04-03 18:06:37 +02:00
9738aaf5fb Merge pull request #782 from wxcafe/patch-1 Eugen 2017-04-03 18:06:16 +02:00
ce433e22f6 Merge pull request #784 from singingwolfboy/github-capitalized Eugen 2017-04-03 18:06:02 +02:00
5652f00d81 GitHub should be capitalized David Baumgold 2017-04-03 11:44:11 -04:00
d06c810b16 Adds social.wxcafe.net wxcafé 2017-04-03 17:32:25 +02:00
5cb011b66b Add Norwegian locale Christopher Kolstad 2017-04-03 15:44:05 +02:00
663e5378c0 Merge pull request #775 from JantsoP/master Eugen 2017-04-03 15:04:51 +02:00
65d667dc6c another typo. fuck me JantsoP 2017-04-03 14:56:13 +02:00
d3fde60297 fixed an sneaky peaky tpy JantsoP 2017-04-03 14:54:53 +02:00
85a8b62ca2 add finnish translation JantsoP 2017-04-03 14:43:07 +02:00
97803600ed add finnish translation JantsoP 2017-04-03 14:20:50 +02:00
a229840ffe fixed typo JantsoP 2017-04-03 14:16:03 +02:00
bfa99981e5 Merge branch 'master' into master JantsoP 2017-04-03 13:50:57 +02:00
6501ffdadc add finnish translation JantsoP 2017-04-03 13:35:12 +02:00
ae95f35fe6 add finnish translation JantsoP 2017-04-03 13:34:26 +02:00
22f88b845a add finnish translation JantsoP 2017-04-03 13:33:43 +02:00
eabb86b124 add finnish language JantsoP 2017-04-03 13:32:10 +02:00
b0f4c9b91f finnish translation JantsoP 2017-04-03 13:25:46 +02:00
f9b4f30de6 updated final translation JantsoP 2017-04-03 13:07:09 +02:00
01b79beca4 Merge pull request #769 from Angristan/patch-1 Eugen 2017-04-03 12:59:41 +02:00
5d854f37b4 Merge pull request #764 from ticky/tweak-quick-start-area Eugen 2017-04-03 12:59:16 +02:00
92a0b3d73a Merge pull request #765 from marrus-sh/mastodon-API-update Eugen 2017-04-03 12:58:38 +02:00
2f7139c6b5 Merge pull request #768 from marvinkopf/mutedropdown Eugen 2017-04-03 12:53:49 +02:00
87854745e9 Create new translation file JantsoP 2017-04-03 12:42:09 +02:00
69fc95a2f5 Create Finnish translation for Mastodon JantsoP 2017-04-03 12:09:33 +02:00
c97fc5c1f4 Improve french translation Angristan 2017-04-03 11:04:00 +02:00
1236a12cae add mute option in status dropdown Marvin Kopf 2017-04-03 09:56:01 +02:00
b455cbc6d3 "direct" in statuses#create Kibigo! 2017-04-03 01:23:37 -07:00
a9db64cf26 Forgot direct statuses :P Kibigo! 2017-04-02 22:46:10 -07:00
5d2f1d600d Typofixes Kibigo! 2017-04-02 21:17:07 -07:00
5d65aa3bf9 Code now code Kibigo! 2017-04-02 21:13:15 -07:00
565568dd9c Merging 'upstream' updates Kibigo! 2017-04-02 21:07:07 -07:00
6e41ef55ed Updated API docs Kibigo! 2017-04-02 21:03:49 -07:00
2d384850cb Fix the position of the Mastodon mascot in the UI Jessica Stokes 2017-04-03 13:16:14 +10:00
1a5ab538de Merge pull request #760 from ProgVal/patch-2 Eugen 2017-04-03 03:40:34 +02:00
3f650c06b6 Merge pull request #757 from yiskah/patch-4 Eugen 2017-04-03 03:40:20 +02:00
71b9205679 Merge pull request #759 from Wonderfall/master Eugen 2017-04-03 03:40:00 +02:00
6b9c50117f Merge pull request #748 from ProgVal/patch-1 Eugen 2017-04-03 03:39:35 +02:00
fbcba65f81 Improve French translation Valentin Lorentz 2017-04-03 03:16:37 +02:00
b7beb4368c

use alpine-based official images Wonderfall 2017-04-03 03:09:56 +02:00
e2526a62e7 Add social.imirhil.fr shel 2017-04-02 20:11:28 -04:00
61f90f15b0 Merge pull request #743 from Kazhnuz/master Eugen 2017-04-03 01:10:36 +02:00
d2358aefec Merge branch 'master' into master Eugen 2017-04-03 01:07:53 +02:00
30df1c8476 Merge pull request #751 from Wonderfall/master Eugen 2017-04-03 01:03:42 +02:00
b8d2373e0b Update Dockerfile Wonderfall 2017-04-03 00:56:05 +02:00
92d35c52d9 update Dockerfile Wonderfall 2017-04-03 00:46:44 +02:00
d7d60073f9 Merge pull request #744 from fpiesche/master Eugen 2017-04-03 00:26:24 +02:00
61894582b8 Merge pull request #746 from eramdam/feature/improve-french-locales Eugen 2017-04-03 00:25:56 +02:00
ce495138ac Merge pull request #747 from Themimitoof/patch-1 Eugen 2017-04-03 00:25:37 +02:00
9ca548c17e Also fix the start command. Valentin Lorentz 2017-04-03 00:10:51 +02:00
82ae07e48b Fix install instructions. Valentin Lorentz 2017-04-03 00:08:40 +02:00
b69e97c40b add link to another mastodon instance. Michael Vieira 2017-04-03 00:04:54 +02:00
c76d20c2a0 Add forgotten comma Kazhnuz 2017-04-02 23:39:41 +02:00
590558d52c Update images to standard sizes. Write up Federated/Local timelines and rename relevant image. Florian Piesche 2017-04-02 22:31:43 +01:00
4f7cce25ac Add more lcoales in fr.jsx Damien Erambert 2017-04-02 14:23:40 -07:00
633e5ec6f6 Update French Translation Kazhnuz 2017-04-02 23:18:01 +02:00
e92796b49c Add info on CW tags not automatically hiding images. Florian Piesche 2017-04-02 22:07:23 +01:00
a729d0c2b1 Add user guide to README toc Florian Piesche 2017-04-02 22:05:21 +01:00
71cf9d0608 Fix typo in simple_form.fr.yml Damien Erambert 2017-04-02 14:04:06 -07:00
5e45982ed9 Improve translation of data import in fr.yml Damien Erambert 2017-04-02 14:03:57 -07:00
b829460b4a Better translation for revoked token in doorkeeper.fr.yml Damien Erambert 2017-04-02 14:03:41 -07:00
65e6a00817 Fix date format in doorkeeper.fr.yml Damien Erambert 2017-04-02 14:03:31 -07:00
60a82c9022 Update to catch up with new features and add missing images. Florian Piesche 2017-04-02 22:03:00 +01:00
b277e88aae Write up reporting. Florian Piesche 2017-04-02 21:45:51 +01:00
03b2f37b46 Add information about the Direct privacy setting. Florian Piesche 2017-04-02 21:39:05 +01:00
0f274589dd Add information on following remote users or using the Search box to find them. Florian Piesche 2017-04-02 21:33:39 +01:00
2cd792fc3d Merge pull request #737 from nevillepark/patch-2 Eugen 2017-04-02 22:23:11 +02:00
09b4b65fde Merge pull request #740 from 0x70b1a5/master Eugen 2017-04-02 22:22:56 +02:00
48cb2dccd2 Merge pull request #741 from eramdam/feature/improve-french-locales Eugen 2017-04-02 22:22:44 +02:00
a23e4380b2 Avoid re-loading already loaded relationships. Also fixes issue where wrong button would be displayed in account lists for unloaded relationships Eugen Rochko 2017-04-02 22:02:38 +02:00
aaa4d1b0fb Keep track of which timelines are connected live to avoid redundant refreshes on navigation Eugen Rochko 2017-04-02 21:44:06 +02:00
3618cc04ff Add heartbeat to websockets streaming API connections Eugen Rochko 2017-04-02 21:27:14 +02:00
2d07cb5771 Catching rack timeout from rails doesn't work Eugen Rochko 2017-04-02 21:12:18 +02:00
f25fc04ea1 single-quotes Tobias Merkle 2017-04-02 14:55:13 -04:00
ca21be3e16 remove black border on buttons Tobias Merkle 2017-04-02 14:54:24 -04:00
5b12624847 Add proper error page for request timeouts Eugen Rochko 2017-04-02 19:43:09 +02:00
54c796c8df Corrected spelling mistake Neville Park 2017-04-02 13:01:55 -04:00
34ff11c496 Merge pull request #729 from Abzol/master Eugen 2017-04-02 17:53:00 +02:00
25ed563cdb Merge pull request #735 from TheKinrar/patch-3 Eugen 2017-04-02 17:50:15 +02:00
9f219d8968 Add link to instances.mastodon.xyz TheKinrar 2017-04-02 17:48:25 +02:00
30da6440d0 Merge branch 'master' of github.com:tootsuite/mastodon Olivia Mossberg 2017-04-02 17:04:31 +02:00
f4b5fe9caf Fix word-break in account profiles Olivia Mossberg 2017-04-02 16:54:24 +02:00
4b7dca4713 Fix wording "show reblogs" -> "show boosts", order reports chronologically in admin UI Eugen Rochko 2017-04-02 16:45:49 +02:00
3a62721e54 Merge pull request #728 from bottitytto/add-mashek Eugen 2017-04-02 16:30:30 +02:00
d6b965cf08 Fix issue with feed merge-in code as well Eugen Rochko 2017-04-02 15:58:25 +02:00
e809caa0e1 Fix feed regeneration bug Eugen Rochko 2017-04-02 15:46:31 +02:00
aaea7e1e7c Adding social.mashek.net Sina Mashek 2017-04-02 16:22:13 +03:00
750662d9e2 Merge branch 'maximeborges-master' Eugen Rochko 2017-04-02 12:38:11 +02:00
34aff3e269 Merge branch 'master' of https://github.com/maximeborges/mastodon into maximeborges-master Eugen Rochko 2017-04-02 12:36:26 +02:00
e70661b495 Merge pull request #723 from jkap/patch-1 Eugen 2017-04-02 12:33:34 +02:00
a2fa09518f Merge branch 'master' into patch-1 Eugen 2017-04-02 12:33:29 +02:00
3e84a86eb8 Merge pull request #727 from TheKinrar/patch-2 Eugen 2017-04-02 12:32:17 +02:00
f5d434e433 Add IPv6 column in list and remove dead instance TheKinrar 2017-04-02 12:05:32 +02:00
3ed75efc31 Add fr locale for community_timeline in fr.jsx Damien Erambert 2017-04-01 23:45:53 -07:00
cb1989cbd8 Add locale in devise.fr.yml Damien Erambert 2017-04-01 23:38:40 -07:00
03d676faa8 Add french translation for "scopes" in doorkeeper.fr.yml Damien Erambert 2017-04-01 23:35:11 -07:00
9e26af264e Fix small typo in doorkeeper.fr.yml Damien Erambert 2017-04-01 23:34:37 -07:00
f9f6098e22 Complete localization of in simple_form.fr.yml Damien Erambert 2017-04-01 23:26:26 -07:00
2c881e6717 Improve french locales on the backend (WIP) Damien Erambert 2017-04-01 23:15:49 -07:00
1389d5d7fd Updated list of instances for gay.crime.team jenn kaplan 2017-04-01 22:37:10 -07:00
433cb198fa Fix landing page sign up form ignoring username field Eugen Rochko 2017-04-02 04:10:22 +02:00
3ffa27e812 Merge pull request #720 from 0x70b1a5/master Eugen 2017-04-02 03:15:22 +02:00
ae43978433 improve video button visibililty Tobias Merkle 2017-04-01 21:02:30 -04:00
0f05643f5d Merge pull request #718 from Wonderfall/master Eugen 2017-04-02 01:27:02 +02:00
7ccc9b8b02

Add social.targaryen.house to instances list Wonderfall 2017-04-01 23:53:00 +02:00
55d275d30f Merge pull request #714 from TheKinrar/patch-1 Eugen 2017-04-01 23:10:39 +02:00
a8c2e44fee Fix broken reference Eugen Rochko 2017-04-01 22:29:20 +02:00
808017ff18 Paperclip will complain on its own if this variable is missing Eugen Rochko 2017-04-01 22:16:26 +02:00
60ebfa182f Made modal system more generic Eugen Rochko 2017-04-01 22:11:28 +02:00
f693ab69f3 Fix word-break in profile's note on profile page and profile component Maxime BORGES 2017-04-01 20:17:28 +02:00
355168b939 Add mastodon.xyz to instances list TheKinrar 2017-04-01 18:00:52 +02:00
13dfd8d109 Improve mobile tabs a little Eugen Rochko 2017-04-01 15:17:35 +02:00
d93d6f5124 Fix reworked search Eugen Rochko 2017-03-31 22:44:12 +02:00
7ddda65269 Merge pull request #706 from alexgleason/patch-3 Eugen 2017-03-31 21:25:31 +02:00
b4046c5957 Rework search Eugen Rochko 2017-03-31 19:59:54 +02:00
d835647ec0 Put line breaks between API methods in docs Alex Gleason 2017-03-31 14:55:08 -04:00
553e6dd07c Merge pull request #685 from yiskah/patch-2 Eugen 2017-03-31 16:36:29 +02:00
1ee292b4cc Merge pull request #703 from alexgleason/patch-1 Eugen 2017-03-31 16:36:21 +02:00
e4c10b32b3 Mastodon is not an alternative, it is a solution Alex Gleason 2017-03-31 10:34:21 -04:00
f20f6b25b9 Merge branch 'master' into patch-2 shel 2017-03-31 10:34:14 -04:00
680f9efe9c Fix web UI profile clickable area overlapping with follow button area Eugen Rochko 2017-03-31 14:23:44 +02:00
bde5c0eaf9 Fix some views still not using counter caches Eugen Rochko 2017-03-31 14:02:07 +02:00
5e26295e06 Fix #700 - hide spoilers on static pages Eugen Rochko 2017-03-31 13:54:36 +02:00
188cddefe9 Add maintenance task for updating counter caches Eugen Rochko 2017-03-31 13:01:00 +02:00
3ac4455160 :active and :focus states same as :hover for buttons Eugen Rochko 2017-03-31 12:08:51 +02:00
bf61bc1b96 Fix drag & drop overlay flickering Eugen Rochko 2017-03-31 11:48:25 +02:00
e8875c6046 Import feature for following/blocking lists (addresses #62, #177, #201, #454) Eugen Rochko 2017-03-30 19:42:33 +02:00
03fb6c16ec Fix up null values on latest migration, add notes Eugen Rochko 2017-03-30 16:06:27 +02:00
87513b31e0 Do NOT try to update the new fields from the migration. Takes too long on a live DB Needs to be a separate task with no locking Eugen Rochko 2017-03-30 15:50:34 +02:00
30964350b2 Merge branch 'master' into development Eugen Rochko 2017-03-30 15:07:27 +02:00
de22c202f5 Add counter caches for a large performance increase on API requests Eugen Rochko 2017-03-30 15:06:59 +02:00
35933167c0 Add counter caches for a large performance increase on API requests Eugen Rochko 2017-03-30 04:47:04 +02:00
333e44c3fc Improve emojis - use SVGs where possible Eugen Rochko 2017-03-29 22:27:24 +02:00
bb7006bda1 Hide drag & drop area on drop event regardless of success Eugen Rochko 2017-03-28 14:17:24 +02:00
139fc994e2 Fix #408 - link @ names in bios Eugen Rochko 2017-03-28 14:16:08 +02:00
1c6b02f936 Fix #690 - Webfinger should handle new shortform profile URLs now (nice) Eugen Rochko 2017-03-28 11:23:33 +02:00
448a07cc3f Merge pull request #688 from yiskah/patch-3 Eugen 2017-03-26 21:45:49 +02:00
5181702a60 Update amaroq name shel 2017-03-26 15:45:16 -04:00
76188d61f2 Clarify post privacy warning shel 2017-03-26 12:49:14 -04:00
c334541011 Add tooltip to privacy dropdown Eugen Rochko 2017-03-26 13:30:57 +02:00
f864fee116 Fix up some localizations Eugen Rochko 2017-03-26 13:22:38 +02:00
ebe53cb38c Merge branch 'leopku-feature/language_zh-cn' Eugen Rochko 2017-03-26 13:13:57 +02:00
efbbd42216 Fix style issue Eugen Rochko 2017-03-26 13:13:41 +02:00
dddb2eb84f Merge branch 'feature/language_zh-cn' of https://github.com/leopku/mastodon into leopku-feature/language_zh-cn Eugen Rochko 2017-03-26 13:10:04 +02:00
6ec6fe259a Compose form layout fixes Eugen Rochko 2017-03-26 13:08:15 +02:00
874d91126c Merge branch 'yiskah-patch-1' Eugen Rochko 2017-03-26 12:49:31 +02:00
d5d5afff9c 🌐 add simplified chinese language leopku 2017-03-26 14:13:18 +08:00
5f7c997654 Change to using variables shel 2017-03-25 20:42:49 -04:00
2b7e3d56c8 Increase color contrast shel 2017-03-25 20:02:36 -04:00
c66dc0d114 Clarify privacy options shel 2017-03-25 19:59:38 -04:00
1fd88e3bad Fix up visual indicators for compose form privacy Eugen Rochko 2017-03-25 20:24:30 +01:00
b8f9de8636 Improve sign up page on small screens Eugen Rochko 2017-03-25 20:13:34 +01:00
a9303e7062 When replying to status with content warning, prefill content warning Eugen Rochko 2017-03-25 19:30:56 +01:00
ad1af951fb Temporary spacing fix Eugen Rochko 2017-03-25 19:27:31 +01:00
bd1ceb1daa Privacy dropdown i18n Eugen Rochko 2017-03-25 19:22:24 +01:00
99ca63a543 Fix public profile pagination links Eugen Rochko 2017-03-25 19:16:17 +01:00
d8c5a83827 Redesigned compose form Eugen Rochko 2017-03-25 00:01:43 +01:00
fc9bbdfd34 🚧 chinese translation WIP leopku 2017-03-24 19:03:14 +08:00
349c6cfa2b 🌐 add chinese language file leopku 2017-03-24 18:53:41 +08:00
9bf4c34919 Fix #675 - return created_at in notifications API Eugen Rochko 2017-03-24 03:54:24 +01:00
d7c6c6dbe1 Fancier drag & drop indicator, emoji icon for emoji, upload progress (fix #295) Eugen Rochko 2017-03-24 03:50:30 +01:00