4751381a24
Merge pull request #852 from peterkeen/email-whitelist-817
...
[#817 ] Add email whitelist
2017-04-05 03:04:58 +02:00
ae1b33d594
Merge pull request #891 from ashfurrow/patch-1
...
Adds instructions for adding admin users for Heroku installs
2017-04-05 03:01:43 +02:00
2f7da4167f
Merge pull request #805 from nevillepark/master
...
Changed "reblogs" to "boosts"
2017-04-05 03:00:57 +02:00
dd839491b6
Merge pull request #894 from asm/mastodon_cc
...
Adding https://mastodon.cc
2017-04-05 02:56:54 +02:00
a8468cc6cc
Merge pull request #898 from SirCmpwn/remote-follow-improvements
...
Remote follow improvements
2017-04-05 02:54:03 +02:00
6a8bb89f80
Merge pull request #858 from krainboltgreene/patch-6
...
Use active record shorthand
2017-04-05 02:53:39 +02:00
bd371b6adb
Updates instructions.
2017-04-04 20:53:31 -04:00
a5f1a6bf01
Merge pull request #872 from kwaio/patch-1
...
typo in admin doc
2017-04-05 02:53:09 +02:00
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.
2017-04-04 20:52:31 -04:00
497fc3894a
Merge pull request #868 from Angristan/patch-4
...
Add file package
2017-04-05 02:52:00 +02:00
d2b7daf6bb
Remove PuSH subscriptions when delivery is answered with a 4xx error
2017-04-05 02:34:33 +02:00
1771eea458
Adding https://mastodon.cc
2017-04-04 16:35:57 -07:00
5e8e8ba01d
Adds instructions for adding admin users.
2017-04-04 18:45:24 -04:00
ebc2c97264
Merge pull request #876 from krainboltgreene/patch-7
...
Quick attempt to get pull requests passing
2017-04-04 23:11:34 +02:00
d6c7d89053
Quick attempt to get pull requests passing
2017-04-04 12:14:44 -07:00
583208f5ae
typo in admin doc
...
s/rails/rake/
2017-04-04 20:45:32 +02:00
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.
2017-04-04 19:23:53 +02:00
fa2a1af90a
Spawn FeedInsertWorker to deliver status into personal feed
2017-04-04 19:21:37 +02:00
8dace45447
Use active record shorthand
2017-04-04 09:04:07 -07:00
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
2017-04-04 11:20:15 -04:00
353a30810c
New admin setting: open/close registrations, with custom message, from the admin UI
2017-04-04 15:28:12 +02:00
79828478c6
Merge pull request #804 from fhalna/development
...
Accessibility Fix.
2017-04-04 14:52:27 +02:00
9edfbf2ec9
Merge pull request #803 from 0xa/patch-1
...
Add octodon.social
2017-04-04 14:51:47 +02:00
db5149b963
Merge branch 'master' into patch-1
2017-04-04 14:51:42 +02:00
7f543e1fca
Merge pull request #800 from unascribed/patch-1
...
Add fern.surgeplay.com to the instances list
2017-04-04 14:51:01 +02:00
180aab6e2e
Merge pull request #799 from Wonderfall/master
...
update social.targaryen.house info
2017-04-04 14:50:35 +02:00
5f88226ad0
Merge pull request #832 from ndarville/patch-1
...
Fix typo in ISSUE_TEMPLATE
2017-04-04 14:50:14 +02:00
b9c1c5bdd0
Merge pull request #788 from yiskah/patch-5
...
Add instances from instances.mastodon.xyz
2017-04-04 14:49:48 +02:00
8eec03bb70
Fix typo in ISSUE_TEMPLATE
2017-04-04 14:49:31 +02:00
4068de0eed
Merge pull request #815 from walfie/patch-1
...
Fix typo in Heroku guide
2017-04-04 14:49:06 +02:00
8e50f24a5c
Merge pull request #816 from leowzukw/patch-1
...
More consistent typography
2017-04-04 14:48:51 +02:00
283ef86463
Merge pull request #831 from ndarville/patch-1
...
Create ISSUE_TEMPLATE.md to bring down duplicate issues
2017-04-04 14:48:22 +02:00
1e5ecbdf23
Create ISSUE_TEMPLATE.md
2017-04-04 14:46:08 +02:00
e85ec98efb
Remove sidekiq-merger
2017-04-04 14:28:57 +02:00
e60c473917
Reduce number of items in feeds, optimize regeneration worker slightly,
...
make regeneration worker unique, (only schedule/execute once at a time)
2017-04-04 13:58:34 +02:00
9123aca6df
Optimize FeedManager#unmerge, and slightly optimize FeedManager#merge
2017-04-04 13:43:36 +02:00
1484df2db5
Move OStatus processing back into default queue
2017-04-04 13:02:49 +02:00
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
2017-04-04 13:01:14 +02:00
c7e14e496b
Merge branch 'master' into development
2017-04-04 12:06:53 +02:00
cb21bf5b40
More consistent typography
2017-04-04 06:58:17 +02:00
766eabf194
Fix typo in Heroku guide
2017-04-04 00:00:56 -04:00
5110975df4
Fix #808 - smaller elephant friend PNG for frontpage
2017-04-04 02:03:16 +02:00
7a56845060
Only call regeneration worker after first login after a 14 day break
2017-04-04 02:00:10 +02:00
24793cdbaa
Fix ActionController::Parameters in API issue
2017-04-04 01:33:34 +02:00
8eca42b265
Separate background jobs into different queues. ATTENTION: new queue "pull"
...
must be added to the Sidekiq invokation in your systemd file
The pull queue will handle link crawling, thread resolving, and OStatus
processing. Such tasks are more likely to hang for a longer time (due to
network requests) so it is more sensible to not make the "in-house" tasks
wait for them.
2017-04-04 00:53:20 +02:00
7b297cc6d2
Changed "reblogs" to "boosts"
2017-04-03 17:45:36 -04:00
c2787014e5
Add octodon.social
2017-04-03 23:05:03 +02:00
8796f7a125
Add check for visibility.nil? even though it can't ever be, to check for race conditions
2017-04-03 22:54:46 +02:00
4833f53a37
accessibility fix
...
eanable focus on ClearColumnButton
2017-04-03 22:45:29 +02:00
9a4a766ab3
Add fern.surgeplay.com to the instances list
...
It's hard to tell if this is supposed to be alphabetically sorted or not. I put it after epiktistes since it starts with F - let me know if it should go elsewhere.
2017-04-03 15:52:33 -04:00
Eugen