mastodon

vbatts/mastodon

Fork 0

Commit graph

350958babf Fix typos on french translations Clément D 2017-04-04 19:09:54 +02:00
9a5d6e9715 Add closed_registrations message on French language Thibaut (Eychics) 2017-04-04 18:58:19 +02:00
41ba74b511 Update the list of instances Pierre Ozoux 2017-04-04 17:28:29 +01:00
22000ef7a9 Add oc.todon.fr to the list of instances. Valentin Lorentz 2017-04-04 18:11:41 +02:00
7015578655 Add social.nasqueron.org instance Sébastien Santoro 2017-04-04 18:11:14 +02:00
731e650681 Use active record shorthand Kurtis Rainbolt-Greene 2017-04-04 09:04:07 -07:00
2fcf8d79ad Fix crontab edit Angristan 2017-04-04 17:23:56 +02:00
e9a6da6bc7 [#817] Add email whitelist Pete Keen 2017-04-04 11:04:44 -04:00
d8855150a0 Update social.diskseven.com's IPv6 status Jo Decker 2017-04-04 15:29:07 +01:00
192f079776 Add mastodon.club to running instances list Adam Thurlow 2017-04-04 11:14:51 -03:00
58bdb9b42e Update List-of-Mastodon-instances.md Florian Maunier 2017-04-04 16:03:05 +02:00
665ec615e3 Missing quotes Angristan 2017-04-04 15:57:37 +02:00
5f54981846 New admin setting: open/close registrations, with custom message, from the admin UI Eugen Rochko 2017-04-04 15:26:57 +02:00
10a8666e04 updated line 28 about GitHub JantsoP 2017-04-04 15:07:15 +02:00
405c495c23 Merge pull request #804 from fhalna/development Eugen 2017-04-04 14:52:27 +02:00
fee3312193 Merge pull request #803 from 0xa/patch-1 Eugen 2017-04-04 14:51:47 +02:00
48dfdad492 Merge branch 'master' into patch-1 Eugen 2017-04-04 14:51:42 +02:00
ed4a723a82 Merge pull request #800 from unascribed/patch-1 Eugen 2017-04-04 14:51:01 +02:00
c359e60034 Merge pull request #799 from Wonderfall/master Eugen 2017-04-04 14:50:35 +02:00
4bb623a595 Merge pull request #832 from ndarville/patch-1 Eugen 2017-04-04 14:50:14 +02:00
7c075b5551 Merge pull request #788 from yiskah/patch-5 Eugen 2017-04-04 14:49:48 +02:00
904f9266ef Fix typo in ISSUE_TEMPLATE Niclas Darville 2017-04-04 14:49:31 +02:00
1e81cad3f3 Merge pull request #815 from walfie/patch-1 Eugen 2017-04-04 14:49:06 +02:00
8e693b8e41 Merge pull request #816 from leowzukw/patch-1 Eugen 2017-04-04 14:48:51 +02:00
60d07c06c3 Merge pull request #831 from ndarville/patch-1 Eugen 2017-04-04 14:48:22 +02:00
be2e7e1802 Create ISSUE_TEMPLATE.md Niclas Darville 2017-04-04 14:46:08 +02:00
38b504b7a7 Remove sidekiq-merger Eugen Rochko 2017-04-04 14:28:57 +02:00
82aaedec46 Reduce number of items in feeds, optimize regeneration worker slightly, make regeneration worker unique, (only schedule/execute once at a time) Eugen Rochko 2017-04-04 13:58:34 +02:00
b1f3499c38 Optimize FeedManager#unmerge, and slightly optimize FeedManager#merge Eugen Rochko 2017-04-04 13:43:36 +02:00
b21f7c28f6 Move OStatus processing back into default queue Eugen Rochko 2017-04-04 13:02:49 +02:00
ce9df2fa82 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 Eugen Rochko 2017-04-04 13:01:14 +02:00
3abb0f7bc7 Merge branch 'master' into development halna_Tanaguru 2017-04-04 12:06:53 +02:00
db4a41cf58 Merge branch 'master' into master JantsoP 2017-04-04 08:41:46 +02:00
dc89fc17cc updated translation JantsoP 2017-04-04 08:29:53 +02:00
b8243c1b49 changed line 25 for better translation JantsoP 2017-04-04 08:26:59 +02:00
e81ba26be9 More consistent typography Leo Wzukw 2017-04-04 06:58:17 +02:00
c22388fc79 Fix typo in Heroku guide walfie 2017-04-04 00:00:56 -04:00
eb023beb49 Fix #808 - smaller elephant friend PNG for frontpage Eugen Rochko 2017-04-04 02:03:16 +02:00
b510a56c0c Only call regeneration worker after first login after a 14 day break Eugen Rochko 2017-04-04 02:00:10 +02:00
4c53af64f0 Fix ActionController::Parameters in API issue Eugen Rochko 2017-04-04 01:33:34 +02:00
f722bd2387 Separate background jobs into different queues. ATTENTION: new queue "pull" must be added to the Sidekiq invokation in your systemd file Eugen Rochko 2017-04-04 00:53:20 +02:00
ce1ca28594 Changed "reblogs" to "boosts" Neville Park 2017-04-03 17:45:36 -04:00
5b6f4fdeb4 Add octodon.social Alice 2017-04-03 23:05:03 +02:00
8232f76c48 Add check for visibility.nil? even though it can't ever be, to check for race conditions Eugen Rochko 2017-04-03 22:54:46 +02:00
3f30ae1f97 accessibility fix halna_Tanaguru 2017-04-03 22:45:29 +02:00
1ed37fae9b Add fern.surgeplay.com to the instances list Aesen 2017-04-03 15:52:33 -04:00
cc451e1fcb update social.targaryen.house info Wonderfall 2017-04-03 21:36:28 +02:00
0700521ef3 added Esperanto (eo) axolotl 2017-04-03 20:22:50 +02:00
98a93aa07e Fix norwegian translation being malformed Eugen Rochko 2017-04-03 19:50:55 +02:00
68f829e11c Add basic logging of who resolved report Eugen Rochko 2017-04-03 19:27:30 +02:00
71458dc6df When taking action on a report (silence/suspend), it dismisses all other reports for that user automatically Eugen Rochko 2017-04-03 19:17:56 +02:00
ec8029a955 Updated and fixed orthography Korbinian 2017-04-03 19:10:48 +02:00
7dd5ba42a3 Updated and fixed german orthography Korbinian 2017-04-03 19:01:17 +02:00
b7c1b12367 Make default admin UI page reports. Add admin UI for creating a domain block Eugen Rochko 2017-04-03 18:55:06 +02:00
8a45a97e2e Add instances from instances.mastodon.xyz shel 2017-04-03 12:28:36 -04:00
f6e9251054 Merge pull request #777 from chriswk/master Eugen 2017-04-03 18:06:37 +02:00
9738aaf5fb Merge pull request #782 from wxcafe/patch-1 Eugen 2017-04-03 18:06:16 +02:00
ce433e22f6 Merge pull request #784 from singingwolfboy/github-capitalized Eugen 2017-04-03 18:06:02 +02:00
5652f00d81 GitHub should be capitalized David Baumgold 2017-04-03 11:44:11 -04:00
d06c810b16 Adds social.wxcafe.net wxcafé 2017-04-03 17:32:25 +02:00
5cb011b66b Add Norwegian locale Christopher Kolstad 2017-04-03 15:44:05 +02:00
663e5378c0 Merge pull request #775 from JantsoP/master Eugen 2017-04-03 15:04:51 +02:00
65d667dc6c another typo. fuck me JantsoP 2017-04-03 14:56:13 +02:00
d3fde60297 fixed an sneaky peaky tpy JantsoP 2017-04-03 14:54:53 +02:00
85a8b62ca2 add finnish translation JantsoP 2017-04-03 14:43:07 +02:00
97803600ed add finnish translation JantsoP 2017-04-03 14:20:50 +02:00
a229840ffe fixed typo JantsoP 2017-04-03 14:16:03 +02:00
bfa99981e5 Merge branch 'master' into master JantsoP 2017-04-03 13:50:57 +02:00
6501ffdadc add finnish translation JantsoP 2017-04-03 13:35:12 +02:00
ae95f35fe6 add finnish translation JantsoP 2017-04-03 13:34:26 +02:00
22f88b845a add finnish translation JantsoP 2017-04-03 13:33:43 +02:00
eabb86b124 add finnish language JantsoP 2017-04-03 13:32:10 +02:00
b0f4c9b91f finnish translation JantsoP 2017-04-03 13:25:46 +02:00
f9b4f30de6 updated final translation JantsoP 2017-04-03 13:07:09 +02:00
01b79beca4 Merge pull request #769 from Angristan/patch-1 Eugen 2017-04-03 12:59:41 +02:00
5d854f37b4 Merge pull request #764 from ticky/tweak-quick-start-area Eugen 2017-04-03 12:59:16 +02:00
92a0b3d73a Merge pull request #765 from marrus-sh/mastodon-API-update Eugen 2017-04-03 12:58:38 +02:00
2f7139c6b5 Merge pull request #768 from marvinkopf/mutedropdown Eugen 2017-04-03 12:53:49 +02:00
87854745e9 Create new translation file JantsoP 2017-04-03 12:42:09 +02:00
69fc95a2f5 Create Finnish translation for Mastodon JantsoP 2017-04-03 12:09:33 +02:00
c97fc5c1f4 Improve french translation Angristan 2017-04-03 11:04:00 +02:00
1236a12cae add mute option in status dropdown Marvin Kopf 2017-04-03 09:56:01 +02:00
b455cbc6d3 "direct" in statuses#create Kibigo! 2017-04-03 01:23:37 -07:00
a9db64cf26 Forgot direct statuses :P Kibigo! 2017-04-02 22:46:10 -07:00
5d2f1d600d Typofixes Kibigo! 2017-04-02 21:17:07 -07:00
5d65aa3bf9 Code now code Kibigo! 2017-04-02 21:13:15 -07:00
565568dd9c Merging 'upstream' updates Kibigo! 2017-04-02 21:07:07 -07:00
6e41ef55ed Updated API docs Kibigo! 2017-04-02 21:03:49 -07:00
2d384850cb Fix the position of the Mastodon mascot in the UI Jessica Stokes 2017-04-03 13:16:14 +10:00
1a5ab538de Merge pull request #760 from ProgVal/patch-2 Eugen 2017-04-03 03:40:34 +02:00
3f650c06b6 Merge pull request #757 from yiskah/patch-4 Eugen 2017-04-03 03:40:20 +02:00
71b9205679 Merge pull request #759 from Wonderfall/master Eugen 2017-04-03 03:40:00 +02:00
6b9c50117f Merge pull request #748 from ProgVal/patch-1 Eugen 2017-04-03 03:39:35 +02:00
fbcba65f81 Improve French translation Valentin Lorentz 2017-04-03 03:16:37 +02:00
b7beb4368c

use alpine-based official images Wonderfall 2017-04-03 03:09:56 +02:00
e2526a62e7 Add social.imirhil.fr shel 2017-04-02 20:11:28 -04:00
61f90f15b0 Merge pull request #743 from Kazhnuz/master Eugen 2017-04-03 01:10:36 +02:00
d2358aefec Merge branch 'master' into master Eugen 2017-04-03 01:07:53 +02:00
30df1c8476 Merge pull request #751 from Wonderfall/master Eugen 2017-04-03 01:03:42 +02:00
b8d2373e0b Update Dockerfile Wonderfall 2017-04-03 00:56:05 +02:00