cincodenada
/
mastodon
forked from cybrespace/mastodon
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity
1,907 Commits 28 Branches 0 Tags 213 MiB
Commit Graph

1907 Commits

Author SHA1 Message Date
Eugen f735efdbc1 Merge pull request #846 from TrollDecker/master 
Update social.diskseven.com's IPv6 status
 2017-04-05 03:08:59 +02:00
Eugen 1709dee0f1 Merge pull request #842 from Angristan/patch-2 
Missing quotes
 2017-04-05 03:08:24 +02:00
Eugen 1c634ad21a Merge pull request #845 from thurloat/patch-1 
Add mastodon.club to running instances list
 2017-04-05 03:07:59 +02:00
Eugen 682c8a6fc8 Merge pull request #848 from ProgVal/patch-3 
Add oc.todon.fr to the list of instances.
 2017-04-05 03:07:46 +02:00
Eugen 66ec005bf8 Merge pull request #854 from Angristan/patch-3 
Fix crontab edit
 2017-04-05 03:07:28 +02:00
Eugen c12214963e Merge pull request #866 from kklleemm/patch-1 
Fix typos on french translations
 2017-04-05 03:06:41 +02:00
Eugen aa8dacbc8a Merge pull request #792 from chapeaumeinfreund/master 
Updated and fixed german orthography
 2017-04-05 03:05:50 +02:00
Eugen ce524cbb49 Merge pull request #790 from chapeaumeinfreund/patch-1 
Updated and fixed german orthography
 2017-04-05 03:05:31 +02:00
Eugen 117b22e905 Merge pull request #852 from peterkeen/email-whitelist-817 
[#817] Add email whitelist
 2017-04-05 03:04:58 +02:00
Eugen d3dab68978 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 57466d542b Merge pull request #805 from nevillepark/master 
Changed "reblogs" to "boosts"
 2017-04-05 03:00:57 +02:00
Eugen 417273326a Merge pull request #894 from asm/mastodon_cc 
Adding https://mastodon.cc
 2017-04-05 02:56:54 +02:00
Eugen 909d81923e Merge pull request #898 from SirCmpwn/remote-follow-improvements 
Remote follow improvements
 2017-04-05 02:54:03 +02:00
Eugen 2edeb3fe1c Merge pull request #858 from krainboltgreene/patch-6 
Use active record shorthand
 2017-04-05 02:53:39 +02:00
Ash Furrow dd441606aa Updates instructions. 2017-04-04 20:53:31 -04:00
Eugen feea517046 Merge pull request #872 from kwaio/patch-1 
typo in admin doc
 2017-04-05 02:53:09 +02:00
Drew DeVault f7e35d90db 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 e55fbdede3 Merge pull request #868 from Angristan/patch-4 
Add file package
 2017-04-05 02:52:00 +02:00
Eugen Rochko bda37489ac Remove PuSH subscriptions when delivery is answered with a 4xx error 2017-04-05 02:34:33 +02:00
Jason Snell 50a88d6a6e Adding https://mastodon.cc 2017-04-04 16:35:57 -07:00
Samy KACIMI 5af0ecbcd9 alphebatically order test gem group as required by rubocop 2017-04-05 00:52:55 +02:00
Samy KACIMI 79ef756f64 fix rubocop issues 2017-04-05 00:47:17 +02:00
Ash Furrow 04225ed72e Adds instructions for adding admin users. 2017-04-04 18:45:24 -04:00
Samy KACIMI 073f92fc76 Merge branch 'master' into add_more_tests_to_models 2017-04-05 00:43:10 +02:00
Samy KACIMI 46c0e8b0e7 update account_spec 2017-04-05 00:37:23 +02:00
Samy KACIMI 7762467b47 rollback database.yml update 2017-04-05 00:31:31 +02:00
Samy KACIMI 81c76fe375 add more tests to models 2017-04-05 00:29:56 +02:00
Udo Kramer 1e5a1b9abd Update Production-guide.md 2017-04-04 23:45:29 +02:00
Eugen ed22f65b3c 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 9ae9ecdebe Quick attempt to get pull requests passing 2017-04-04 12:14:44 -07:00
axolotl 8736ef50ad Added Esperanto translation inside the javascripts folder 2017-04-04 20:54:42 +02:00
Nope Nope dcda852b5f typo in admin doc 
s/rails/rake/
 2017-04-04 20:45:32 +02:00
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.
 2017-04-04 19:23:53 +02:00
Eugen Rochko 6fd865c000 Spawn FeedInsertWorker to deliver status into personal feed 2017-04-04 19:21:37 +02:00
Clément D 350958babf Fix typos on french translations 2017-04-04 19:09:54 +02:00
Thibaut (Eychics) 9a5d6e9715 Add closed_registrations message on French language 2017-04-04 18:58:19 +02:00
Pierre Ozoux 41ba74b511 Update the list of instances 2017-04-04 17:28:29 +01:00
Valentin Lorentz 22000ef7a9 Add oc.todon.fr to the list of instances. 
[SKIP CI]
 2017-04-04 18:11:41 +02:00
Sébastien Santoro 7015578655 Add social.nasqueron.org instance 2017-04-04 18:11:14 +02:00
Kurtis Rainbolt-Greene 731e650681 Use active record shorthand 2017-04-04 09:04:07 -07:00
Angristan 2fcf8d79ad Fix crontab edit 
Missing -u parameter to specify the mastodon user.
 2017-04-04 17:23:56 +02:00
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
 2017-04-04 11:20:15 -04:00
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.
 2017-04-04 15:29:07 +01:00
Adam Thurlow 192f079776 Add mastodon.club to running instances list 2017-04-04 11:14:51 -03:00
Florian Maunier 58bdb9b42e Update List-of-Mastodon-instances.md 
Add my own instance
 2017-04-04 16:03:05 +02:00
Angristan 665ec615e3 Missing quotes 2017-04-04 15:57:37 +02:00
Eugen Rochko 5f54981846 New admin setting: open/close registrations, with custom message, from the admin UI 2017-04-04 15:28:12 +02:00
JantsoP 10a8666e04 updated line 28 about GitHub 2017-04-04 15:07:15 +02:00
Eugen 405c495c23 Merge pull request #804 from fhalna/development 
Accessibility Fix.
 2017-04-04 14:52:27 +02:00
Eugen fee3312193 Merge pull request #803 from 0xa/patch-1 
Add octodon.social
 2017-04-04 14:51:47 +02:00