Kurtis Rainbolt-Greene
d6c7d89053
Quick attempt to get pull requests passing
2017-04-04 12:14:44 -07:00
axolotl
f6463e595f
Added Esperanto translation inside the javascripts folder
2017-04-04 20:54:42 +02:00
Nope Nope
583208f5ae
typo in admin doc
...
s/rails/rake/
2017-04-04 20:45:32 +02:00
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.
2017-04-04 19:23:53 +02:00
Eugen Rochko
fa2a1af90a
Spawn FeedInsertWorker to deliver status into personal feed
2017-04-04 19:21:37 +02:00
Clément D
ba8744d0a7
Fix typos on french translations
2017-04-04 19:09:54 +02:00
Thibaut (Eychics)
6afd3a6eab
Add closed_registrations message on French language
2017-04-04 18:58:19 +02:00
Pierre Ozoux
ecbda73b27
Update the list of instances
2017-04-04 17:28:29 +01:00
Valentin Lorentz
3187e1b398
Add oc.todon.fr to the list of instances.
...
[SKIP CI]
2017-04-04 18:11:41 +02:00
Sébastien Santoro
8db8132504
Add social.nasqueron.org instance
2017-04-04 18:11:14 +02:00
Kurtis Rainbolt-Greene
8dace45447
Use active record shorthand
2017-04-04 09:04:07 -07:00
Angristan
3ab29e5a9d
Fix crontab edit
...
Missing -u parameter to specify the mastodon user.
2017-04-04 17:23:56 +02:00
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
2017-04-04 11:20:15 -04:00
Jo Decker
f9c2d86945
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.
2017-04-04 15:29:07 +01:00
Adam Thurlow
acc597fa98
Add mastodon.club to running instances list
2017-04-04 11:14:51 -03:00
Florian Maunier
53b2df62dd
Update List-of-Mastodon-instances.md
...
Add my own instance
2017-04-04 16:03:05 +02:00
Angristan
aee8798179
Missing quotes
2017-04-04 15:57:37 +02:00
Eugen Rochko
353a30810c
New admin setting: open/close registrations, with custom message, from the admin UI
2017-04-04 15:28:12 +02:00
JantsoP
c3db103305
updated line 28 about GitHub
2017-04-04 15:07:15 +02:00
Eugen
79828478c6
Merge pull request #804 from fhalna/development
...
Accessibility Fix.
2017-04-04 14:52:27 +02:00
Eugen
9edfbf2ec9
Merge pull request #803 from 0xa/patch-1
...
Add octodon.social
2017-04-04 14:51:47 +02:00
Eugen
db5149b963
Merge branch 'master' into patch-1
2017-04-04 14:51:42 +02:00
Eugen
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
Eugen
180aab6e2e
Merge pull request #799 from Wonderfall/master
...
update social.targaryen.house info
2017-04-04 14:50:35 +02:00
Eugen
5f88226ad0
Merge pull request #832 from ndarville/patch-1
...
Fix typo in ISSUE_TEMPLATE
2017-04-04 14:50:14 +02:00
Eugen
b9c1c5bdd0
Merge pull request #788 from yiskah/patch-5
...
Add instances from instances.mastodon.xyz
2017-04-04 14:49:48 +02:00
Niclas Darville
8eec03bb70
Fix typo in ISSUE_TEMPLATE
2017-04-04 14:49:31 +02:00
Eugen
4068de0eed
Merge pull request #815 from walfie/patch-1
...
Fix typo in Heroku guide
2017-04-04 14:49:06 +02:00
Eugen
8e50f24a5c
Merge pull request #816 from leowzukw/patch-1
...
More consistent typography
2017-04-04 14:48:51 +02:00
Eugen
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
Niclas Darville
1e5ecbdf23
Create ISSUE_TEMPLATE.md
2017-04-04 14:46:08 +02:00
Eugen Rochko
e85ec98efb
Remove sidekiq-merger
2017-04-04 14:28:57 +02:00
Eugen Rochko
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
Eugen Rochko
9123aca6df
Optimize FeedManager#unmerge, and slightly optimize FeedManager#merge
2017-04-04 13:43:36 +02:00
Eugen Rochko
1484df2db5
Move OStatus processing back into default queue
2017-04-04 13:02:49 +02:00
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
2017-04-04 13:01:14 +02:00
halna_Tanaguru
c7e14e496b
Merge branch 'master' into development
2017-04-04 12:06:53 +02:00
JantsoP
0c0e1c2519
Merge branch 'master' into master
2017-04-04 08:41:46 +02:00
JantsoP
0c0acb22e6
updated translation
2017-04-04 08:29:53 +02:00
JantsoP
fc2b031506
changed line 25 for better translation
2017-04-04 08:26:59 +02:00
Leo Wzukw
cb21bf5b40
More consistent typography
2017-04-04 06:58:17 +02:00
walfie
766eabf194
Fix typo in Heroku guide
2017-04-04 00:00:56 -04:00
Eugen Rochko
5110975df4
Fix #808 - smaller elephant friend PNG for frontpage
2017-04-04 02:03:16 +02:00
Eugen Rochko
7a56845060
Only call regeneration worker after first login after a 14 day break
2017-04-04 02:00:10 +02:00
Eugen Rochko
24793cdbaa
Fix ActionController::Parameters in API issue
2017-04-04 01:33:34 +02:00
Eugen Rochko
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
Neville Park
7b297cc6d2
Changed "reblogs" to "boosts"
2017-04-03 17:45:36 -04:00
Alice
c2787014e5
Add octodon.social
2017-04-03 23:05:03 +02:00
Eugen Rochko
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
halna_Tanaguru
4833f53a37
accessibility fix
...
eanable focus on ClearColumnButton
2017-04-03 22:45:29 +02:00
