catstodon

CatCatNya/catstodon

Fork 0

forked from glitch-soc-github-mirror/mastodon

Commit graph

4b08b7c502 Added masto.razrnet.fr YDrogen 2017-04-06 23:59:56 +02:00
8cb7d157bd Merge pull request #1100 from mjankowski/mj-reduce-image-size Eugen 2017-04-06 22:59:48 +02:00
acf10a2c87 Merge pull request #1103 from alimony/vagrant-tweaks-01 Eugen 2017-04-06 22:58:44 +02:00
7596de1aec Add a couple of network performance tweaks to Vagrantfile. Markus Amalthea Magnuson 2017-04-06 22:34:59 +02:00
97ae53daa8 Reduce size of background-photo.jpeg Matt Jankowski 2017-04-06 16:24:57 -04:00
cd77c75d6c Merge pull request #1088 from Wonderfall/master Eugen 2017-04-06 21:35:10 +02:00
cfbd90cf44 Added pericles.world in the list of instances Tristan Mahé 2017-04-06 12:05:37 -07:00
ed2bfdee67

add Docker microbadger to README.md Wonderfall 2017-04-06 20:59:20 +02:00
a3318814e1

add metadata to Dockerfile Wonderfall 2017-04-06 20:57:16 +02:00
acf6436a99 Add manx.social instance isati 2017-04-06 19:31:25 +01:00
a0f1f9c664 Update List-of-Mastodon-instances.md Erwan Leboucher 2017-04-06 20:18:56 +02:00
f0d1107c53 Merge branch 'master' into patch-1 kadiix 2017-04-06 19:33:36 +02:00
02c1ad5347 Update List-of-Mastodon-instances.md kadiix 2017-04-06 19:33:17 +02:00
fa494dbb1d Merge pull request #1038 from wade-r/optimize-dockerfile Eugen 2017-04-06 19:32:50 +02:00
a736b28646 Merge branch 'master' into patch-1 kadiix 2017-04-06 19:32:31 +02:00
c392c54271 Merge pull request #1042 from johnsudaar/feature/scalingo_one_click Eugen 2017-04-06 19:32:12 +02:00
0d5d3c7abe Add an instance. kadiix 2017-04-06 19:15:57 +02:00
c441208e29 Merge branch 'master' into patch-1 VirtuBox 2017-04-06 19:11:39 +02:00
5e63828917 Merge pull request #1048 from ashfurrow/slugignore Eugen 2017-04-06 19:09:45 +02:00
ea86f4db15 Merge pull request #1070 from alexgleason/patch-4 Eugen 2017-04-06 19:02:14 +02:00
a3d204e982 Linux users must enable NFS for Vagrant Alex Gleason 2017-04-06 12:16:39 -04:00
07495cc13f Update List-of-Mastodon-instances.md awea 2017-04-06 18:07:15 +02:00
6a88151eda Add meow.social Julien 2017-04-06 14:51:42 +02:00
30619a6716 add my instance Lukas Fülling 2017-04-06 14:22:01 +02:00
a2adf84858

Updates slugignore. Ash Furrow 2017-04-06 07:53:48 -04:00
eadac4e7f4 Added an instance to the list Ray Alez 2017-04-06 03:12:34 -07:00
0209b7d1b5 Update List-of-Mastodon-instances.md Yann GUERN 2017-04-06 11:07:33 +02:00
a2637c1720 Optimize Dockerfile Ryan Wade 2017-04-06 15:41:00 +08:00
c62696bc46 Update List-of-Mastodon-instances.md Markus R 2017-04-06 08:52:15 +02:00
83530f0eef

Add mastodon.elao.com instance Guewen FAIVRE 2017-04-06 08:46:16 +02:00
73b8e67f4b Add infinimatix.net to instance list Derek Lewis 2017-04-06 01:11:16 -04:00
51d7caaf19 Fix wrong pubsub channel on public timelines Eugen Rochko 2017-04-06 04:03:23 +02:00
b5d87500d2 Add Northeastern University Mastodon Jack Michaud 2017-04-05 20:58:21 -04:00
a9c0062e80 Merge pull request #1013 from blackle/master Eugen 2017-04-06 02:35:34 +02:00
dbd529109e Fix notifications delivered to wrong pubsub channel, optimized RemoveStatusService, slightly optimized FanOutOnWriteService again Eugen Rochko 2017-04-06 02:26:59 +02:00
540d6efe88 Catch more errors in process_follows so it doesn't fail blackle 2017-04-05 20:04:13 -04:00
d025c5e593 Added off-the-clock.us to the list of instances Nick Gerakines 2017-04-05 19:19:44 -04:00
7aede8e720 Description in instance list for mastodon.ninetailed.uk Ninetailed 2017-04-05 22:35:35 +01:00
dea6e47de0 Merge pull request #993 from foozmeat/patch-1 Eugen 2017-04-05 23:26:44 +02:00
5442083b3c Split SalmonWorker into smaller parts, move profile updating into another job Eugen Rochko 2017-04-05 21:41:50 +02:00
c19e0f1212 Use NFS for the shared folder because it dramatically decreases latency for git operations. James Moore 2017-04-05 11:53:39 -07:00
bafbf63fcc Merge pull request #958 from yiskah/patch-1 Eugen 2017-04-05 20:48:19 +02:00
eb98c99924 Add mastodon.nuzgo.net Thibaut (Eychics) 2017-04-05 20:45:23 +02:00
6b41fb2e6f Update List-of-Mastodon-instances.md ava 2017-04-05 21:44:13 +03:00
bf7cefa516 Merge branch 'master' into master André Lewin 2017-04-05 20:28:58 +02:00
65b3a2a5a6 Adds mtndevelopment Brad Janke 2017-04-05 13:14:27 -05:00
d13d169922 Merge branch 'krainboltgreene-broadcast-to-worker' Eugen Rochko 2017-04-05 19:46:28 +02:00
5b95be1c42 Replace calls to FeedManager#inline_render and #broadcast Eugen Rochko 2017-04-05 19:45:18 +02:00
d755ce96da Merge branch 'broadcast-to-worker' of https://github.com/krainboltgreene/mastodon into krainboltgreene-broadcast-to-worker Eugen Rochko 2017-04-05 19:29:46 +02:00
29ffe1cad3 Make sure Rabl is using Oj Eugen Rochko 2017-04-05 18:51:15 +02:00
8fa8004a2b Update List-of-Mastodon-instances.md Ben Field 2017-04-05 18:20:08 +01:00
e5566ac6a6 Add Rich.GOP Christopher Gilbert 2017-04-05 13:05:27 -04:00
c9ebd5d19f Fix wrong variable used in publish channel Eugen 2017-04-05 18:58:32 +02:00
ac1989d2c0 Update description on good-dragon.com foxiehkins 2017-04-05 17:49:04 +01:00
1b8c244dff Add proper message to PushUpdateWorker, use redis directly Eugen 2017-04-05 18:48:41 +02:00
32d4b51939 Add good-dragon.com foxiehkins 2017-04-05 17:47:52 +01:00
3d8b80e1cc Merge branch 'master' into broadcast-to-worker Eugen 2017-04-05 18:44:33 +02:00
b38bd58921 Adding masto.raildecake.fr, french instance 🌻🐘 Thomas Alberola 2017-04-05 18:15:39 +02:00
8989569dd4 Update components.scss tom 2017-04-05 12:10:25 -04:00
96812a6c79 added instance ZiiX 2017-04-05 09:05:57 -07:00
a31f5765af Added digitalhumanities.club instance Amanda Visconti 2017-04-05 12:04:21 -04:00
41a78be25e Update Production-guide.md Ben Field 2017-04-05 16:56:51 +01:00
9cf0b5b255 Add social.bytestemplar.com to instances list Toby Deshane 2017-04-05 11:49:36 -04:00
b8218ca482 Make scalingo doc clearer Jonathan Hurter 2017-04-05 17:48:55 +02:00
4335dffe35 Fix wrong url in scalingo.json Jonathan Hurter 2017-04-05 17:28:11 +02:00
4de3182dc8 Added im-in.space Kody 2017-04-05 17:00:03 +02:00
ee758551d1 Correct innacurate info and other fixes shel 2017-04-05 10:58:41 -04:00
b142a2ebf5 Merge pull request #947 from johnsudaar/feature/scalingo_one_click Eugen 2017-04-05 16:50:46 +02:00
9a534d1df6 Add niu.moe, cuz it's kawaii Technowix 2017-04-05 16:18:52 +02:00
28fb01c71a Update List-of-Mastodon-instances.md VirtuBox 2017-04-05 16:02:47 +02:00
d6bab0c71c Add doc Jonathan Hurter 2017-04-05 16:00:48 +02:00
5e7ec0fe57 Use root repository url Jonathan Hurter 2017-04-05 15:52:06 +02:00
152a1e578c Add Scalingo one click on readme Jonathan Hurter 2017-04-05 15:26:36 +02:00
a371a9e002 Merge pull request #940 from fahy/patch-1 Eugen 2017-04-05 15:24:52 +02:00
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