me/glitchier-soc
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity
1682 commits 2 branches 0 tags 429 MiB
Commit graph

1682 commits

This branch
This branch
All branches
Author SHA1 Message Date
Eugen
b3523a6a8d Merge pull request #854 from Angristan/patch-3 
Fix crontab edit
 2017-04-05 03:07:28 +02:00
Eugen
cc82f3adff Merge pull request #866 from kklleemm/patch-1 
Fix typos on french translations
 2017-04-05 03:06:41 +02:00
Eugen
45c3772ddb Merge pull request #792 from chapeaumeinfreund/master 
Updated and fixed german orthography
 2017-04-05 03:05:50 +02:00
Eugen
27b758f328 Merge pull request #790 from chapeaumeinfreund/patch-1 
Updated and fixed german orthography
 2017-04-05 03:05:31 +02:00
Eugen
4751381a24 Merge pull request #852 from peterkeen/email-whitelist-817 
[#817] Add email whitelist
 2017-04-05 03:04:58 +02:00
Eugen
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
Eugen
2f7da4167f Merge pull request #805 from nevillepark/master 
Changed "reblogs" to "boosts"
 2017-04-05 03:00:57 +02:00
Eugen
dd839491b6 Merge pull request #894 from asm/mastodon_cc 
Adding https://mastodon.cc
 2017-04-05 02:56:54 +02:00
Eugen
a8468cc6cc Merge pull request #898 from SirCmpwn/remote-follow-improvements 
Remote follow improvements
 2017-04-05 02:54:03 +02:00
Eugen
6a8bb89f80 Merge pull request #858 from krainboltgreene/patch-6 
Use active record shorthand
 2017-04-05 02:53:39 +02:00
Ash Furrow
bd371b6adb Updates instructions. 2017-04-04 20:53:31 -04:00
Eugen
a5f1a6bf01 Merge pull request #872 from kwaio/patch-1 
typo in admin doc
 2017-04-05 02:53:09 +02:00
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.
 2017-04-04 20:52:31 -04:00
Eugen
497fc3894a Merge pull request #868 from Angristan/patch-4 
Add file package
 2017-04-05 02:52:00 +02:00
Eugen Rochko
d2b7daf6bb Remove PuSH subscriptions when delivery is answered with a 4xx error 2017-04-05 02:34:33 +02:00
Jason Snell
1771eea458 Adding https://mastodon.cc 2017-04-04 16:35:57 -07:00
Ash Furrow
5e8e8ba01d Adds instructions for adding admin users. 2017-04-04 18:45:24 -04:00
Eugen
ebc2c97264 Merge pull request #876 from krainboltgreene/patch-7 
Quick attempt to get pull requests passing
 2017-04-04 23:11:34 +02:00
Kurtis Rainbolt-Greene
d6c7d89053 Quick attempt to get pull requests passing 2017-04-04 12:14:44 -07: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
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
Eugen Rochko
353a30810c New admin setting: open/close registrations, with custom message, from the admin UI 2017-04-04 15:28:12 +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
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