1727 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
Eugen	8814f90eb5	Merge pull request #903 from yiskah/patch-6 ... Corrected misinformation regarding Direct Posts	2017-04-05 10:24:25 +02:00
Eugen	6b566c6b88	Merge pull request #908 from krainboltgreene/application-worker-for-shared-logic ... ApplicationWorker for shared worker behavior	2017-04-05 10:23:52 +02:00
Eugen	6b02591fa3	Merge pull request #910 from krainboltgreene/master ... Mastodon isn't using jbuilder or sdoc, and it prevents an upgrade to 2.4.0	2017-04-05 10:23:32 +02:00
Eugen	aab818717e	Merge pull request #914 from bradurani/bu/query_cleanup ... Eliminate unnecessary queries and query clauses with none and all	2017-04-05 10:23:10 +02:00
Brad Urani	6a1da87cd3	Eliminate unnecessary queries and query clauses with none and all	2017-04-05 06:02:58 +00:00
Kurtis Rainbolt-Greene	03adb5d727	Mastodon isn't using jbuilder or sdoc, and it prevents an upgrade to 2.4.0	2017-04-04 21:31:02 -07:00
Kurtis Rainbolt-Greene	22dcadedb4	We're going to want these nice helper methods, lets share them with a parent class that matches Rails 5 practices (application level abstraction)	2017-04-04 21:14:37 -07:00
shel	7d354cc8c5	Corrected misinformation regarding Direct Posts ... Unless something changed recently I have no clue why this said that direct posts do not federate because they do.	2017-04-04 21:47:13 -04:00
Eugen Rochko	ccb6a658fd	Merge branch 'fakenine-add_more_tests_to_models'	2017-04-05 03:31:45 +02:00
Eugen Rochko	667ffafef8	Fix spec	2017-04-05 03:31:26 +02:00
Eugen	4c92f15664	Merge branch 'master' into add_more_tests_to_models	2017-04-05 03:27:38 +02:00
Eugen	94d00f2788	Merge pull request #885 from optikfluffel/patch-1 ... Update Production-guide.md	2017-04-05 03:24:08 +02:00
Eugen	afdcdce551	Merge pull request #839 from SirCmpwn/profile-readability ... Improve readability of text on profiles	2017-04-05 03:23:16 +02:00
Eugen	731f397b08	Merge pull request #860 from pierreozoux/patch-1 ... Update the list of instances	2017-04-05 03:20:51 +02:00
Eugen	aa464aa0d8	Merge branch 'master' into patch-1	2017-04-05 03:20:37 +02:00
Eugen	a23123e49c	Merge pull request #859 from dereckson/patch-1 ... Add social.nasqueron.org instance	2017-04-05 03:20:01 +02:00
Eugen	78c1e2e958	Merge branch 'master' into patch-1	2017-04-05 03:19:14 +02:00
Eugen	ab98591af8	Merge pull request #843 from fmauNeko/patch-1 ... Update List-of-Mastodon-instances.md	2017-04-05 03:18:48 +02:00
Eugen	bdaf31bcc9	Merge branch 'master' into patch-1	2017-04-05 03:18:42 +02:00
Drew DeVault	c106b6d3e0	Improve readability of text on profiles	2017-04-04 21:13:23 -04:00
Eugen	086a88f3bb	Merge pull request #863 from Eychics/master ... Add closed_registrations message on French language	2017-04-05 03:11:13 +02:00
Eugen	e76dd52b08	Merge pull request #818 from JantsoP/master ... Updated Finnish Translation	2017-04-05 03:09:20 +02:00
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