Commit Graph

2198 Commits (7447e7a2ea3749fb84dac38387a1f207554749ec)
 

Author SHA1 Message Date
Eugen 57466d542b Merge pull request from nevillepark/master
Changed "reblogs" to "boosts"
Eugen 417273326a Merge pull request from asm/mastodon_cc
Adding https://mastodon.cc
Eugen 909d81923e Merge pull request from SirCmpwn/remote-follow-improvements
Remote follow improvements
Eugen 2edeb3fe1c Merge pull request from krainboltgreene/patch-6
Use active record shorthand
Ash Furrow dd441606aa Updates instructions.
Eugen feea517046 Merge pull request from kwaio/patch-1
typo in admin doc
Drew DeVault f7e35d90db Remote follow improvements
This stores the @username@instance you provide in your session and
reuses it the next time you remote follow someone from this instance.
Eugen e55fbdede3 Merge pull request from Angristan/patch-4
Add file package
Eugen Rochko bda37489ac Remove PuSH subscriptions when delivery is answered with a 4xx error
Jason Snell 50a88d6a6e Adding https://mastodon.cc
Samy KACIMI 5af0ecbcd9 alphebatically order test gem group as required by rubocop
Samy KACIMI 79ef756f64 fix rubocop issues
Ash Furrow 04225ed72e Adds instructions for adding admin users.
Samy KACIMI 073f92fc76 Merge branch 'master' into add_more_tests_to_models
Samy KACIMI 46c0e8b0e7 update account_spec
Samy KACIMI 7762467b47 rollback database.yml update
Samy KACIMI 81c76fe375 add more tests to models
Valentin_NC 4512fde181 add persistance to Postresql container
Udo Kramer 1e5a1b9abd Update Production-guide.md
Eugen ed22f65b3c Merge pull request from krainboltgreene/patch-7
Quick attempt to get pull requests passing
Kurtis Rainbolt-Greene 9ae9ecdebe Quick attempt to get pull requests passing
axolotl 8736ef50ad Added Esperanto translation inside the javascripts folder
Nope Nope dcda852b5f typo in admin doc
s/rails/rake/
Angristan 6091b9b1a9 Add file package
If the file package is not installed, we get "Validation failed: File has contents that are not what they are reported to be" when upload media.
Eugen Rochko 6fd865c000 Spawn FeedInsertWorker to deliver status into personal feed
Clément D 350958babf Fix typos on french translations
Thibaut (Eychics) 9a5d6e9715 Add closed_registrations message on French language
Pierre Ozoux 41ba74b511 Update the list of instances
Valentin Lorentz 22000ef7a9 Add oc.todon.fr to the list of instances.
[SKIP CI]
Sébastien Santoro 7015578655 Add social.nasqueron.org instance
Kurtis Rainbolt-Greene 731e650681 Use active record shorthand
Angristan 2fcf8d79ad Fix crontab edit
Missing -u parameter to specify the mastodon user.
Pete Keen e9a6da6bc7 [] Add email whitelist
This adds the ability to filter user signup with a whitelist
instead of or in addition to a blacklist.

Fixes 
Jo Decker d8855150a0 Update social.diskseven.com's IPv6 status
As far as I'm aware, my instance should be supporting IPv6 now. Was an error on my part that it wasn't working before.
Adam Thurlow 192f079776 Add mastodon.club to running instances list
Florian Maunier 58bdb9b42e Update List-of-Mastodon-instances.md
Add my own instance
Angristan 665ec615e3 Missing quotes
Eugen Rochko 5f54981846 New admin setting: open/close registrations, with custom message, from the admin UI
JantsoP 10a8666e04 updated line 28 about GitHub
Eugen 405c495c23 Merge pull request from fhalna/development
Accessibility Fix.
Eugen fee3312193 Merge pull request from 0xa/patch-1
Add octodon.social
Eugen 48dfdad492 Merge branch 'master' into patch-1
Eugen ed4a723a82 Merge pull request from unascribed/patch-1
Add fern.surgeplay.com to the instances list
Eugen c359e60034 Merge pull request from Wonderfall/master
update social.targaryen.house info
Eugen 4bb623a595 Merge pull request from ndarville/patch-1
Fix typo in ISSUE_TEMPLATE
Eugen 7c075b5551 Merge pull request from yiskah/patch-5
Add instances from instances.mastodon.xyz
Niclas Darville 904f9266ef Fix typo in ISSUE_TEMPLATE
Eugen 1e81cad3f3 Merge pull request from walfie/patch-1
Fix typo in Heroku guide
Eugen 8e693b8e41 Merge pull request from leowzukw/patch-1
More consistent typography
Eugen 60d07c06c3 Merge pull request from ndarville/patch-1
Create ISSUE_TEMPLATE.md to bring down duplicate issues