catstodon

CatCatNya/catstodon

Fork 0

forked from glitch-soc-github-mirror/mastodon

Commit graph

be807ff7bd Merge pull request #930 from nicobz25/patch-1 Eugen 2017-04-05 15:24:40 +02:00
68e0421577 Merge pull request #939 from JantsoP/master Eugen 2017-04-05 15:24:24 +02:00
cbcfd92a14 Adding mastodon.irish Padraig Fahy 2017-04-05 14:00:35 +01:00
b45b4865a7 Merge pull request #938 from wxcafe/patch-3 Eugen 2017-04-05 14:57:38 +02:00
188172c401 Merge pull request #931 from farlistener/patch-3 Eugen 2017-04-05 14:57:14 +02:00
7c4dde56a3 Merge pull request #936 from Angristan/patch-7 Eugen 2017-04-05 14:57:01 +02:00
837030db98 updated blocking translation Jantso Porali 2017-04-05 14:53:35 +02:00
deb001bba8 updated two-way auth and preferences translation Jantso Porali 2017-04-05 14:49:29 +02:00
d3bf0307db updated translation for about page Jantso Porali 2017-04-05 14:47:42 +02:00
bf523fcd16 Add node_modules and .cache to slugignore Jonathan Hurter 2017-04-05 14:13:34 +02:00
220bc48e8e Only render public payload once in FanOutOnWrite Eugen Rochko 2017-04-05 14:26:17 +02:00
259e626165 Update List-of-Mastodon-instances.md wxcafé 2017-04-05 14:21:45 +02:00
5ed2de6be2 Add git and curl as dependencies Angristan 2017-04-05 14:11:08 +02:00
79765d61f5 Install nodejs before ruby Jonathan Hurter 2017-04-05 13:53:30 +02:00
6201fba2d3 Merge branch 'master' into patch-1 nicobz25 2017-04-05 13:48:31 +02:00
0a984e90d3 Add scalingo support Jonathan Hurter 2017-04-05 13:45:03 +02:00
cfe91ac984 Add index on mentions status_id Eugen Rochko 2017-04-05 13:32:57 +02:00
8530f9413b Replace ActionCable broadcast call with simple redis publish Eugen Rochko 2017-04-05 13:28:46 +02:00
85c768bf16 Typography on partY Cédric Levieux 2017-04-05 13:19:34 +02:00
9572282a55 Update List-of-Mastodon-instances.md nicobz25 2017-04-05 13:13:09 +02:00
f8a5ff95ec Merge pull request #923 from jguerder/patch-1 Eugen 2017-04-05 12:33:02 +02:00
af0decf597 Merge pull request #925 from Angristan/patch-6 Eugen 2017-04-05 12:26:17 +02:00
ba5e23ecce Merge pull request #926 from farlistener/patch-2 Eugen 2017-04-05 12:26:02 +02:00
a107de07c9 Merge pull request #922 from Angristan/patch-5 Eugen 2017-04-05 12:18:57 +02:00
93e53a3311 add mastodon.cloud to List of instances Valentin_NC 2017-04-05 20:36:21 +11:00
bdf3ac95b8 Add mastodon.partipirate.org Cédric Levieux 2017-04-05 11:24:21 +02:00
fa6f7c8898 Add mstdn.io Angristan 2017-04-05 11:16:56 +02:00
5963fce131 Added mastodon.cx Jordan Guerder 2017-04-05 10:52:56 +02:00
5dbcd92193 ECDH only Angristan 2017-04-05 10:44:08 +02:00
792389da38 Merge pull request #909 from scriptjunkie/master Eugen 2017-04-05 10:29:58 +02:00
8b8839978a Merge branch 'master' into master Eugen 2017-04-05 10:29:52 +02:00
78cf0fe1c7 Merge pull request #901 from ashfurrow/patch-3 Eugen 2017-04-05 10:29:14 +02:00
18d0e817dd Merge pull request #911 from IMcD23/patch-1 Eugen 2017-04-05 10:28:58 +02:00
1904a1aa14 Merge pull request #919 from JantsoP/master Eugen 2017-04-05 10:27:12 +02:00
b5f8273312 Merge pull request #902 from asm/ssl_best_practices Eugen 2017-04-05 10:26:32 +02:00
3504da5cac Fix API method URL typo Eugen 2017-04-05 10:25:05 +02:00
8814f90eb5 Merge pull request #903 from yiskah/patch-6 Eugen 2017-04-05 10:24:25 +02:00
6b566c6b88 Merge pull request #908 from krainboltgreene/application-worker-for-shared-logic Eugen 2017-04-05 10:23:52 +02:00
6b02591fa3 Merge pull request #910 from krainboltgreene/master Eugen 2017-04-05 10:23:32 +02:00
aab818717e Merge pull request #914 from bradurani/bu/query_cleanup Eugen 2017-04-05 10:23:10 +02:00
20b53e6add Merge branch 'master' into master JantsoP 2017-04-05 10:07:17 +02:00
3ec221d3b7 updated reblog to boost translation JantsoP 2017-04-05 09:57:25 +02:00
b8a867adcc updated translation JantsoP 2017-04-05 09:56:10 +02:00
473e4f7813 udpdated display_name translation JantsoP 2017-04-05 09:52:31 +02:00
b845ef395d updated reblog translation JantsoP 2017-04-05 09:51:35 +02:00
6a1da87cd3 Eliminate unnecessary queries and query clauses with none and all Brad Urani 2017-04-05 06:02:58 +00:00
8040d1d8ce Update List-of-Mastodon-instances.md Ian McDowell 2017-04-04 23:43:57 -05:00
03adb5d727 Mastodon isn't using jbuilder or sdoc, and it prevents an upgrade to 2.4.0 Kurtis Rainbolt-Greene 2017-04-04 21:31:02 -07:00
29efeecb9e Add https://securitymastod.one/ scriptjunkie 2017-04-04 23:21:00 -05:00
22dcadedb4 We're going to want these nice helper methods, lets share them with a parent class that matches Rails 5 practices (application level abstraction) Kurtis Rainbolt-Greene 2017-04-04 21:14:37 -07:00
7bed4e51db Moved to the worker Kurtis Rainbolt-Greene 2017-04-04 20:51:44 -07:00
9638894233 Moving in the inline render Kurtis Rainbolt-Greene 2017-04-04 20:51:18 -07:00
220051b8b2 I don't actually think we need that. Kurtis Rainbolt-Greene 2017-04-04 20:48:22 -07:00
0069c01285 Moving the queue_at into the worker Kurtis Rainbolt-Greene 2017-04-04 20:39:14 -07:00
dc5704b0b0 This method isn't used anymore Kurtis Rainbolt-Greene 2017-04-04 20:38:07 -07:00
96ef933820 Replacing the broadcast method with the one defined in the feed manager Kurtis Rainbolt-Greene 2017-04-04 20:36:03 -07:00
1e96ce378e By pushing this into a worker we can reduce the amount of time the feed manager using workers eat up a connection Kurtis Rainbolt-Greene 2017-04-04 20:16:53 -07:00
b73cee9774 add volume for redis container Valentin_NC 2017-04-05 14:13:22 +11:00
7d354cc8c5 Corrected misinformation regarding Direct Posts shel 2017-04-04 21:47:13 -04:00
fa7b74cf51 SSL best practices for nginx Jason Snell 2017-04-04 18:43:21 -07:00
128dcb2825 Adds mastodon.technology Ash Furrow 2017-04-04 21:35:45 -04:00
ccb6a658fd Merge branch 'fakenine-add_more_tests_to_models' Eugen Rochko 2017-04-05 03:31:45 +02:00
667ffafef8 Fix spec Eugen Rochko 2017-04-05 03:31:26 +02:00
4c92f15664 Merge branch 'master' into add_more_tests_to_models Eugen 2017-04-05 03:27:38 +02:00
94d00f2788 Merge pull request #885 from optikfluffel/patch-1 Eugen 2017-04-05 03:24:08 +02:00
afdcdce551 Merge pull request #839 from SirCmpwn/profile-readability Eugen 2017-04-05 03:23:16 +02:00
731f397b08 Merge pull request #860 from pierreozoux/patch-1 Eugen 2017-04-05 03:20:51 +02:00
aa464aa0d8 Merge branch 'master' into patch-1 Eugen 2017-04-05 03:20:37 +02:00
a23123e49c Merge pull request #859 from dereckson/patch-1 Eugen 2017-04-05 03:20:01 +02:00
78c1e2e958 Merge branch 'master' into patch-1 Eugen 2017-04-05 03:19:14 +02:00
ab98591af8 Merge pull request #843 from fmauNeko/patch-1 Eugen 2017-04-05 03:18:48 +02:00
bdaf31bcc9 Merge branch 'master' into patch-1 Eugen 2017-04-05 03:18:42 +02:00
c106b6d3e0 Improve readability of text on profiles Drew DeVault 2017-04-04 09:26:21 -04:00
086a88f3bb Merge pull request #863 from Eychics/master Eugen 2017-04-05 03:11:13 +02:00
e76dd52b08 Merge pull request #818 from JantsoP/master Eugen 2017-04-05 03:09:20 +02:00
f735efdbc1 Merge pull request #846 from TrollDecker/master Eugen 2017-04-05 03:08:59 +02:00
1709dee0f1 Merge pull request #842 from Angristan/patch-2 Eugen 2017-04-05 03:08:24 +02:00
1c634ad21a Merge pull request #845 from thurloat/patch-1 Eugen 2017-04-05 03:07:59 +02:00
682c8a6fc8 Merge pull request #848 from ProgVal/patch-3 Eugen 2017-04-05 03:07:46 +02:00
66ec005bf8 Merge pull request #854 from Angristan/patch-3 Eugen 2017-04-05 03:07:28 +02:00
c12214963e Merge pull request #866 from kklleemm/patch-1 Eugen 2017-04-05 03:06:41 +02:00
aa8dacbc8a Merge pull request #792 from chapeaumeinfreund/master Eugen 2017-04-05 03:05:50 +02:00
ce524cbb49 Merge pull request #790 from chapeaumeinfreund/patch-1 Eugen 2017-04-05 03:05:31 +02:00
117b22e905 Merge pull request #852 from peterkeen/email-whitelist-817 Eugen 2017-04-05 03:04:58 +02:00
d3dab68978 Merge pull request #891 from ashfurrow/patch-1 Eugen 2017-04-05 03:01:43 +02:00
57466d542b Merge pull request #805 from nevillepark/master Eugen 2017-04-05 03:00:57 +02:00
417273326a Merge pull request #894 from asm/mastodon_cc Eugen 2017-04-05 02:56:54 +02:00
909d81923e Merge pull request #898 from SirCmpwn/remote-follow-improvements Eugen 2017-04-05 02:54:03 +02:00
2edeb3fe1c Merge pull request #858 from krainboltgreene/patch-6 Eugen 2017-04-05 02:53:39 +02:00
dd441606aa Updates instructions. Ash Furrow 2017-04-04 20:53:31 -04:00
feea517046 Merge pull request #872 from kwaio/patch-1 Eugen 2017-04-05 02:53:09 +02:00
f7e35d90db Remote follow improvements Drew DeVault 2017-04-04 20:16:14 -04:00
e55fbdede3 Merge pull request #868 from Angristan/patch-4 Eugen 2017-04-05 02:52:00 +02:00
bda37489ac Remove PuSH subscriptions when delivery is answered with a 4xx error Eugen Rochko 2017-04-05 02:32:18 +02:00
50a88d6a6e Adding https://mastodon.cc Jason Snell 2017-04-04 16:35:57 -07:00
5af0ecbcd9 alphebatically order test gem group as required by rubocop Samy KACIMI 2017-04-05 00:52:55 +02:00
79ef756f64 fix rubocop issues Samy KACIMI 2017-04-05 00:47:17 +02:00
04225ed72e Adds instructions for adding admin users. Ash Furrow 2017-04-04 18:45:24 -04:00
073f92fc76 Merge branch 'master' into add_more_tests_to_models Samy KACIMI 2017-04-05 00:43:10 +02:00
46c0e8b0e7 update account_spec Samy KACIMI 2017-04-05 00:37:23 +02:00
7762467b47 rollback database.yml update Samy KACIMI 2017-04-05 00:31:31 +02:00
81c76fe375 add more tests to models Samy KACIMI 2017-04-05 00:29:56 +02:00
4512fde181 add persistance to Postresql container Valentin_NC 2017-04-05 09:06:08 +11:00
1e5a1b9abd Update Production-guide.md Udo Kramer 2017-04-04 23:45:29 +02:00
ed22f65b3c Merge pull request #876 from krainboltgreene/patch-7 Eugen 2017-04-04 23:11:34 +02:00
9ae9ecdebe Quick attempt to get pull requests passing Kurtis Rainbolt-Greene 2017-04-04 12:14:44 -07:00
8736ef50ad Added Esperanto translation inside the javascripts folder axolotl 2017-04-04 20:54:42 +02:00
dcda852b5f typo in admin doc Nope Nope 2017-04-04 20:45:32 +02:00
6091b9b1a9 Add file package Angristan 2017-04-04 19:23:53 +02:00
6fd865c000 Spawn FeedInsertWorker to deliver status into personal feed Eugen Rochko 2017-04-04 19:21:37 +02:00
350958babf Fix typos on french translations Clément D 2017-04-04 19:09:54 +02:00
9a5d6e9715 Add closed_registrations message on French language Thibaut (Eychics) 2017-04-04 18:58:19 +02:00
41ba74b511 Update the list of instances Pierre Ozoux 2017-04-04 17:28:29 +01:00
22000ef7a9 Add oc.todon.fr to the list of instances. Valentin Lorentz 2017-04-04 18:11:41 +02:00
7015578655 Add social.nasqueron.org instance Sébastien Santoro 2017-04-04 18:11:14 +02:00
731e650681 Use active record shorthand Kurtis Rainbolt-Greene 2017-04-04 09:04:07 -07:00
2fcf8d79ad Fix crontab edit Angristan 2017-04-04 17:23:56 +02:00
e9a6da6bc7 [#817] Add email whitelist Pete Keen 2017-04-04 11:04:44 -04:00
d8855150a0 Update social.diskseven.com's IPv6 status Jo Decker 2017-04-04 15:29:07 +01:00
192f079776 Add mastodon.club to running instances list Adam Thurlow 2017-04-04 11:14:51 -03:00
58bdb9b42e Update List-of-Mastodon-instances.md Florian Maunier 2017-04-04 16:03:05 +02:00
665ec615e3 Missing quotes Angristan 2017-04-04 15:57:37 +02:00
5f54981846 New admin setting: open/close registrations, with custom message, from the admin UI Eugen Rochko 2017-04-04 15:26:57 +02:00
10a8666e04 updated line 28 about GitHub JantsoP 2017-04-04 15:07:15 +02:00
405c495c23 Merge pull request #804 from fhalna/development Eugen 2017-04-04 14:52:27 +02:00
fee3312193 Merge pull request #803 from 0xa/patch-1 Eugen 2017-04-04 14:51:47 +02:00
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