Eugen
|
b3523a6a8d
|
Merge pull request #854 from Angristan/patch-3
Fix crontab edit
|
8 years ago |
|
Eugen
|
cc82f3adff
|
Merge pull request #866 from kklleemm/patch-1
Fix typos on french translations
|
8 years ago |
|
Eugen
|
45c3772ddb
|
Merge pull request #792 from chapeaumeinfreund/master
Updated and fixed german orthography
|
8 years ago |
|
Eugen
|
27b758f328
|
Merge pull request #790 from chapeaumeinfreund/patch-1
Updated and fixed german orthography
|
8 years ago |
|
Eugen
|
4751381a24
|
Merge pull request #852 from peterkeen/email-whitelist-817
[#817] Add email whitelist
|
8 years ago |
|
Eugen
|
ae1b33d594
|
Merge pull request #891 from ashfurrow/patch-1
Adds instructions for adding admin users for Heroku installs
|
8 years ago |
|
Eugen
|
2f7da4167f
|
Merge pull request #805 from nevillepark/master
Changed "reblogs" to "boosts"
|
8 years ago |
|
Eugen
|
dd839491b6
|
Merge pull request #894 from asm/mastodon_cc
Adding https://mastodon.cc
|
8 years ago |
|
Eugen
|
a8468cc6cc
|
Merge pull request #898 from SirCmpwn/remote-follow-improvements
Remote follow improvements
|
8 years ago |
|
Eugen
|
6a8bb89f80
|
Merge pull request #858 from krainboltgreene/patch-6
Use active record shorthand
|
8 years ago |
Ash Furrow
|
bd371b6adb
|
Updates instructions.
|
8 years ago |
|
Eugen
|
a5f1a6bf01
|
Merge pull request #872 from kwaio/patch-1
typo in admin doc
|
8 years ago |
Drew DeVault
|
932b0b2f1f
|
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
|
497fc3894a
|
Merge pull request #868 from Angristan/patch-4
Add file package
|
8 years ago |
|
Eugen Rochko
|
d2b7daf6bb
|
Remove PuSH subscriptions when delivery is answered with a 4xx error
|
8 years ago |
Jason Snell
|
1771eea458
|
Adding https://mastodon.cc
|
8 years ago |
|
Ash Furrow
|
5e8e8ba01d
|
Adds instructions for adding admin users.
|
8 years ago |
|
Eugen
|
ebc2c97264
|
Merge pull request #876 from krainboltgreene/patch-7
Quick attempt to get pull requests passing
|
8 years ago |
Kurtis Rainbolt-Greene
|
d6c7d89053
|
Quick attempt to get pull requests passing
|
8 years ago |
Nope Nope
|
583208f5ae
|
typo in admin doc
s/rails/rake/
|
8 years ago |
Angristan
|
1447ba504b
|
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
|
fa2a1af90a
|
Spawn FeedInsertWorker to deliver status into personal feed
|
8 years ago |
Clément D
|
ba8744d0a7
|
Fix typos on french translations
|
8 years ago |
|
Kurtis Rainbolt-Greene
|
8dace45447
|
Use active record shorthand
|
8 years ago |
|
Angristan
|
3ab29e5a9d
|
Fix crontab edit
Missing -u parameter to specify the mastodon user.
|
8 years ago |
Pete Keen
|
f28fcf9080
|
[#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 |
|
Eugen Rochko
|
353a30810c
|
New admin setting: open/close registrations, with custom message, from the admin UI
|
8 years ago |
|
Eugen
|
79828478c6
|
Merge pull request #804 from fhalna/development
Accessibility Fix.
|
8 years ago |
|
Eugen
|
9edfbf2ec9
|
Merge pull request #803 from 0xa/patch-1
Add octodon.social
|
8 years ago |
|
Eugen
|
db5149b963
|
Merge branch 'master' into patch-1
|
8 years ago |
|
Eugen
|
7f543e1fca
|
Merge pull request #800 from unascribed/patch-1
Add fern.surgeplay.com to the instances list
|
8 years ago |
|
Eugen
|
180aab6e2e
|
Merge pull request #799 from Wonderfall/master
update social.targaryen.house info
|
8 years ago |
|
Eugen
|
5f88226ad0
|
Merge pull request #832 from ndarville/patch-1
Fix typo in ISSUE_TEMPLATE
|
8 years ago |
|
Eugen
|
b9c1c5bdd0
|
Merge pull request #788 from yiskah/patch-5
Add instances from instances.mastodon.xyz
|
8 years ago |
Niclas Darville
|
8eec03bb70
|
Fix typo in ISSUE_TEMPLATE
|
8 years ago |
|
Eugen
|
4068de0eed
|
Merge pull request #815 from walfie/patch-1
Fix typo in Heroku guide
|
8 years ago |
|
Eugen
|
8e50f24a5c
|
Merge pull request #816 from leowzukw/patch-1
More consistent typography
|
8 years ago |
|
Eugen
|
283ef86463
|
Merge pull request #831 from ndarville/patch-1
Create ISSUE_TEMPLATE.md to bring down duplicate issues
|
8 years ago |
|
Niclas Darville
|
1e5ecbdf23
|
Create ISSUE_TEMPLATE.md
|
8 years ago |
|
Eugen Rochko
|
e85ec98efb
|
Remove sidekiq-merger
|
8 years ago |
|
Eugen Rochko
|
e60c473917
|
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
|
9123aca6df
|
Optimize FeedManager#unmerge, and slightly optimize FeedManager#merge
|
8 years ago |
|
Eugen Rochko
|
1484df2db5
|
Move OStatus processing back into default queue
|
8 years ago |
|
Eugen Rochko
|
fbf64105a5
|
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
|
c7e14e496b
|
Merge branch 'master' into development
|
8 years ago |
Leo Wzukw
|
cb21bf5b40
|
More consistent typography
|
8 years ago |
walfie
|
766eabf194
|
Fix typo in Heroku guide
|
8 years ago |
|
Eugen Rochko
|
5110975df4
|
Fix #808 - smaller elephant friend PNG for frontpage
|
8 years ago |
|
Eugen Rochko
|
7a56845060
|
Only call regeneration worker after first login after a 14 day break
|
8 years ago |
|
Eugen Rochko
|
24793cdbaa
|
Fix ActionController::Parameters in API issue
|
8 years ago |
