Commit Graph

3353 Commits

Author SHA1 Message Date
Matt Jankowski
ca44c13455 Use Setting.site_title value for og:site_name occurrences (#1194)
* Add helper method to return Setting.site_title

* Use site_title helper in application layout

* Use site_title value for og:site_name
2017-04-08 12:15:40 +02:00
Eugen
a345eb44fc Merge pull request #1239 from ineffyble/patch-2
Fix my URL
2017-04-08 11:40:43 +02:00
Eugen
7b814d5bcb Merge pull request #1238 from milmazz/hunter-client
Add reference to Elixir client for Mastodon API
2017-04-08 11:40:20 +02:00
Eugen
9f9f4b248e Merge pull request #887 from valentin2105/master
add persistance to Postresql container
2017-04-08 11:39:25 +02:00
Eugen
3660f01f60 Merge pull request #1115 from vmincev/patch-1
Update Production-guide.md
2017-04-08 11:38:54 +02:00
Eugen
a2ec54a20b Merge pull request #1198 from huertanix/patch-1
Update Heroku-guide.md
2017-04-08 11:38:33 +02:00
Eugen
e33dcb79c6 Merge pull request #1221 from rbaumert/patch-1
fixed a sentence in readme
2017-04-08 11:37:51 +02:00
Eugen
7d5ea5c170 Merge pull request #1224 from chrisheninger/patch-1
Add SVG version of logo to repo
2017-04-08 11:37:37 +02:00
Eugen
33849acfa7 Merge pull request #1218 from R0ckweb/patch-2
Fix #1141 on remote follow
2017-04-08 11:37:13 +02:00
Eugen
c141f0a886 Merge pull request #1216 from tootsuite/fix-default-locale-regression
Fix #1165 - Default locale no longer breaks form submissions
2017-04-08 11:36:43 +02:00
Eugen
55d03da303 Merge pull request #1213 from tootsuite/fix-accounts-initial-case
Fix #801 - Respect webfinger's canonical response of username/domain
2017-04-08 11:36:35 +02:00
Eugen
2c3a730eae Merge pull request #1225 from tootsuite/yiskah-patch-1
Close instance list to additions
2017-04-08 11:35:40 +02:00
Milton Mazzarri
b04cbb9f5d
Add reference to Elixir client for Mastodon API 2017-04-08 02:48:52 -05:00
Effy Elden
75aade3de2 Fix my URL
Update my URL since toot.zone was shut down.
2017-04-08 16:22:07 +10:00
rbaumert
ac0b84534e Merge branch 'master' into patch-1 2017-04-07 21:39:24 -07:00
Valentin Ouvrard
3c48c9ac2e Merge branch 'master' into master 2017-04-08 15:11:20 +11:00
Shel R
ecf0320a78 Close instance list to additions 2017-04-07 23:51:30 -04:00
Kurtis Rainbolt-Greene
40703b96fa Merge branch 'master' into fix-default-locale-regression 2017-04-07 20:50:21 -07:00
Kurtis Rainbolt-Greene
1e4453405b Merge branch 'master' into patch-2 2017-04-07 20:48:27 -07:00
Chris Heninger
0ad694f96b Add SVG version of logo to repo 2017-04-07 20:40:18 -07:00
Shel R
541c538f9b Merge pull request #1137 from Noiwex/patch-1
Update List-of-Mastodon-instances.md
2017-04-07 23:16:46 -04:00
Shel R
50910d1543 Merge branch 'master' into patch-1 2017-04-07 23:15:17 -04:00
Shel R
4ff8653d6c Merge pull request #1197 from blakebarnett/add_indigo_zone_instance
Add indigo.zone to list of instances
2017-04-07 23:10:25 -04:00
Shel R
17690f51a2 Merge branch 'master' into add_indigo_zone_instance 2017-04-07 23:09:50 -04:00
Shel R
cf80cb5e8b Merge pull request #1196 from mouse-reeve/list-oulipo-social
Adds Oulipo.social to Mastodons list
2017-04-07 23:09:09 -04:00
Shel R
315ff648c8 Merge branch 'master' into list-oulipo-social 2017-04-07 23:08:41 -04:00
Shel R
41923d1c6b Merge pull request #1186 from Aguay-val/patch-2
Add mastodon.fun
2017-04-07 23:07:50 -04:00
Shel R
63686fd36f Merge branch 'master' into patch-2 2017-04-07 23:05:08 -04:00
Shel R
ae9d2f4a32 Merge branch 'master' into patch-1 2017-04-07 23:03:07 -04:00
Shel R
741bbba6ff Merge branch 'master' into patch-1 2017-04-07 22:59:07 -04:00
Shel R
a25a384af3 Merge pull request #1107 from YDrogen/patch-1
Added masto.razrnet.fr
2017-04-07 22:54:44 -04:00
Shel R
971c4de18c Merge branch 'master' into patch-1 2017-04-07 22:54:25 -04:00
Shel R
394c8ef680 Merge pull request #1090 from gled-rs/master
Added mastodon.host in the list of instances
2017-04-07 22:54:14 -04:00
Shel R
3c5b0c55cb Merge branch 'master' into master 2017-04-07 22:53:42 -04:00
Shel R
0dcf3c6abe Merge pull request #1085 from isati/patch-2
Add manx.social instance
2017-04-07 22:49:34 -04:00
Shel R
b67b60fec3 Merge branch 'master' into patch-2 2017-04-07 22:49:14 -04:00
rbaumert
2c0ef75f58 fixed a sentence in readme 2017-04-07 19:48:46 -07:00
Shel R
cc16fa7513 Merge pull request #1084 from genesixx/patch-4
Update List-of-Mastodon-instances.md
2017-04-07 22:48:02 -04:00
Shel R
d6827e38a6 Merge branch 'master' into patch-4 2017-04-07 22:47:42 -04:00
Shel R
29ed448445 Merge pull request #1074 from kadiix/patch-1
Add an instance.
2017-04-07 22:47:00 -04:00
Shel R
e7d7a99fbc Merge branch 'master' into patch-1 2017-04-07 22:46:36 -04:00
Shel R
8d27de32b3 Merge pull request #1069 from Awea/master
Add an instance
2017-04-07 22:45:15 -04:00
Shel R
abab82ec1e Merge branch 'master' into master 2017-04-07 22:44:40 -04:00
Shel R
f0797bf8ce Merge pull request #1066 from jack-michaud/master
Add Northeastern University Mastodon
2017-04-07 22:43:46 -04:00
Shel R
38c5130930 Merge branch 'master' into master 2017-04-07 22:43:13 -04:00
Shel R
ee8af9083a Merge pull request #1051 from Tiwy57/patch-1
Add an instance
2017-04-07 22:42:34 -04:00
Shel R
c9f15f7991 Merge branch 'master' into patch-1 2017-04-07 22:42:14 -04:00
Shel R
91afe1f8fd Merge pull request #1050 from lfuelling/patch-1
add my instance
2017-04-07 22:41:37 -04:00
Shel R
9edee2e64f Merge branch 'master' into patch-1 2017-04-07 22:41:07 -04:00
Shel R
d7e1a282fe Merge pull request #1046 from raymestalez/patch-2
Added an instance to the list
2017-04-07 22:40:29 -04:00