Samy KACIMI
|
073f92fc76
|
Merge branch 'master' into add_more_tests_to_models
|
8 years ago |
|
Samy KACIMI
|
46c0e8b0e7
|
update account_spec
|
8 years ago |
|
Samy KACIMI
|
7762467b47
|
rollback database.yml update
|
8 years ago |
|
Samy KACIMI
|
81c76fe375
|
add more tests to models
|
8 years ago |
Udo Kramer
|
1e5a1b9abd
|
Update Production-guide.md
|
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 |
Thibaut (Eychics)
|
9a5d6e9715
|
Add closed_registrations message on French language
|
8 years ago |
Pierre Ozoux
|
41ba74b511
|
Update the list of instances
|
8 years ago |
Valentin Lorentz
|
22000ef7a9
|
Add oc.todon.fr to the list of instances.
[SKIP CI]
|
8 years ago |
Sébastien Santoro
|
7015578655
|
Add social.nasqueron.org instance
|
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 |
Florian Maunier
|
58bdb9b42e
|
Update List-of-Mastodon-instances.md
Add my own instance
|
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 |
JantsoP
|
10a8666e04
|
updated line 28 about GitHub
|
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 |
|
Eugen Rochko
|
b21f7c28f6
|
Move OStatus processing back into default queue
|
8 years ago |
|
Eugen Rochko
|
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
|
8 years ago |
halna_Tanaguru
|
3abb0f7bc7
|
Merge branch 'master' into development
|
8 years ago |
|
JantsoP
|
db4a41cf58
|
Merge branch 'master' into master
|
8 years ago |
|
JantsoP
|
dc89fc17cc
|
updated translation
|
8 years ago |
|
JantsoP
|
b8243c1b49
|
changed line 25 for better translation
|
8 years ago |
Leo Wzukw
|
e81ba26be9
|
More consistent typography
|
8 years ago |
walfie
|
c22388fc79
|
Fix typo in Heroku guide
|
8 years ago |
|
Eugen Rochko
|
eb023beb49
|
Fix #808 - smaller elephant friend PNG for frontpage
|
8 years ago |
|
Eugen Rochko
|
b510a56c0c
|
Only call regeneration worker after first login after a 14 day break
|
8 years ago |
|
Eugen Rochko
|
4c53af64f0
|
Fix ActionController::Parameters in API issue
|
8 years ago |
