Commit Graph

1690 Commits (f735efdbc163e262a5e725de0f76e5ade96e1645)
 

Author SHA1 Message Date
Eugen f735efdbc1 Merge pull request #846 from TrollDecker/master
Update social.diskseven.com's IPv6 status
8 years ago
Eugen 1709dee0f1 Merge pull request #842 from Angristan/patch-2
Missing quotes
8 years ago
Eugen 1c634ad21a Merge pull request #845 from thurloat/patch-1
Add mastodon.club to running instances list
8 years ago
Eugen 682c8a6fc8 Merge pull request #848 from ProgVal/patch-3
Add oc.todon.fr to the list of instances.
8 years ago
Eugen 66ec005bf8 Merge pull request #854 from Angristan/patch-3
Fix crontab edit
8 years ago
Eugen c12214963e Merge pull request #866 from kklleemm/patch-1
Fix typos on french translations
8 years ago
Eugen aa8dacbc8a Merge pull request #792 from chapeaumeinfreund/master
Updated and fixed german orthography
8 years ago
Eugen ce524cbb49 Merge pull request #790 from chapeaumeinfreund/patch-1
Updated and fixed german orthography
8 years ago
Eugen 117b22e905 Merge pull request #852 from peterkeen/email-whitelist-817
[#817] Add email whitelist
8 years ago
Eugen d3dab68978 Merge pull request #891 from ashfurrow/patch-1
Adds instructions for adding admin users for Heroku installs
8 years ago
Eugen 57466d542b Merge pull request #805 from nevillepark/master
Changed "reblogs" to "boosts"
8 years ago
Eugen 417273326a Merge pull request #894 from asm/mastodon_cc
Adding https://mastodon.cc
8 years ago
Eugen 909d81923e Merge pull request #898 from SirCmpwn/remote-follow-improvements
Remote follow improvements
8 years ago
Eugen 2edeb3fe1c Merge pull request #858 from krainboltgreene/patch-6
Use active record shorthand
8 years ago
Ash Furrow dd441606aa Updates instructions. 8 years ago
Eugen feea517046 Merge pull request #872 from kwaio/patch-1
typo in admin doc
8 years ago
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.
8 years ago
Eugen e55fbdede3 Merge pull request #868 from Angristan/patch-4
Add file package
8 years ago
Eugen Rochko bda37489ac Remove PuSH subscriptions when delivery is answered with a 4xx error 8 years ago
Jason Snell 50a88d6a6e Adding https://mastodon.cc 8 years ago
Ash Furrow 04225ed72e Adds instructions for adding admin users. 8 years ago
Eugen ed22f65b3c Merge pull request #876 from krainboltgreene/patch-7
Quick attempt to get pull requests passing
8 years ago
Kurtis Rainbolt-Greene 9ae9ecdebe Quick attempt to get pull requests passing 8 years ago
Nope Nope dcda852b5f typo in admin doc
s/rails/rake/
8 years ago
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.
8 years ago
Eugen Rochko 6fd865c000 Spawn FeedInsertWorker to deliver status into personal feed 8 years ago
Clément D 350958babf Fix typos on french translations 8 years ago
Valentin Lorentz 22000ef7a9 Add oc.todon.fr to the list of instances.
[SKIP CI]
8 years ago
Kurtis Rainbolt-Greene 731e650681 Use active record shorthand 8 years ago
Angristan 2fcf8d79ad Fix crontab edit
Missing -u parameter to specify the mastodon user.
8 years ago
Pete Keen e9a6da6bc7 [#817] Add email whitelist
This adds the ability to filter user signup with a whitelist
instead of or in addition to a blacklist.

Fixes #817
8 years ago
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.
8 years ago
Adam Thurlow 192f079776 Add mastodon.club to running instances list 8 years ago
Angristan 665ec615e3 Missing quotes 8 years ago
Eugen Rochko 5f54981846 New admin setting: open/close registrations, with custom message, from the admin UI 8 years ago
Eugen 405c495c23 Merge pull request #804 from fhalna/development
Accessibility Fix.
8 years ago
Eugen fee3312193 Merge pull request #803 from 0xa/patch-1
Add octodon.social
8 years ago
Eugen 48dfdad492 Merge branch 'master' into patch-1 8 years ago
Eugen ed4a723a82 Merge pull request #800 from unascribed/patch-1
Add fern.surgeplay.com to the instances list
8 years ago
Eugen c359e60034 Merge pull request #799 from Wonderfall/master
update social.targaryen.house info
8 years ago
Eugen 4bb623a595 Merge pull request #832 from ndarville/patch-1
Fix typo in ISSUE_TEMPLATE
8 years ago
Eugen 7c075b5551 Merge pull request #788 from yiskah/patch-5
Add instances from instances.mastodon.xyz
8 years ago
Niclas Darville 904f9266ef Fix typo in ISSUE_TEMPLATE 8 years ago
Eugen 1e81cad3f3 Merge pull request #815 from walfie/patch-1
Fix typo in Heroku guide
8 years ago
Eugen 8e693b8e41 Merge pull request #816 from leowzukw/patch-1
More consistent typography
8 years ago
Eugen 60d07c06c3 Merge pull request #831 from ndarville/patch-1
Create ISSUE_TEMPLATE.md to bring down duplicate issues
8 years ago
Niclas Darville be2e7e1802 Create ISSUE_TEMPLATE.md 8 years ago
Eugen Rochko 38b504b7a7 Remove sidekiq-merger 8 years ago
Eugen Rochko 82aaedec46 Reduce number of items in feeds, optimize regeneration worker slightly,
make regeneration worker unique, (only schedule/execute once at a time)
8 years ago
Eugen Rochko b1f3499c38 Optimize FeedManager#unmerge, and slightly optimize FeedManager#merge 8 years ago