Olivier Humbert
|
10a0055a2a
|
French translation update (#1188)
* Update fr.yml
one typo fix
* Update simple_form.fr.yml
one translation consistency
|
2017-04-08 12:16:49 +02:00 |
|
Alda Marteau-Hardi
|
f34314fd52
|
Add some missing strings to prevent some React warning in the console (#1230)
|
2017-04-08 12:16:16 +02:00 |
|
Matt Jankowski
|
0d9a420c1a
|
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
|
5b69583ffb
|
Merge pull request #1239 from ineffyble/patch-2
Fix my URL
|
2017-04-08 11:40:43 +02:00 |
|
Eugen
|
d9a1e9dcb6
|
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
|
56eef22b14
|
Merge pull request #887 from valentin2105/master
add persistance to Postresql container
|
2017-04-08 11:39:25 +02:00 |
|
Eugen
|
a42df988b9
|
Merge pull request #1115 from vmincev/patch-1
Update Production-guide.md
|
2017-04-08 11:38:54 +02:00 |
|
Eugen
|
7fc70f03ba
|
Merge pull request #1198 from huertanix/patch-1
Update Heroku-guide.md
|
2017-04-08 11:38:33 +02:00 |
|
Eugen
|
58600bde61
|
Merge pull request #1221 from rbaumert/patch-1
fixed a sentence in readme
|
2017-04-08 11:37:51 +02:00 |
|
Eugen
|
cc6ec445b8
|
Merge pull request #1224 from chrisheninger/patch-1
Add SVG version of logo to repo
|
2017-04-08 11:37:37 +02:00 |
|
Eugen
|
0b8bd5a9ce
|
Merge pull request #1218 from R0ckweb/patch-2
Fix #1141 on remote follow
|
2017-04-08 11:37:13 +02:00 |
|
Eugen
|
eb68ecc9d7
|
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
|
22eff0449f
|
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
|
a98291c382
|
Merge pull request #1225 from tootsuite/yiskah-patch-1
Close instance list to additions
|
2017-04-08 11:35:40 +02:00 |
|
Milton Mazzarri
|
eeb8cc0fa0
|
Add reference to Elixir client for Mastodon API
|
2017-04-08 02:48:52 -05:00 |
|
Effy Elden
|
1a6ed073fa
|
Fix my URL
Update my URL since toot.zone was shut down.
|
2017-04-08 16:22:07 +10:00 |
|
rbaumert
|
44420086b5
|
Merge branch 'master' into patch-1
|
2017-04-07 21:39:24 -07:00 |
|
Valentin Ouvrard
|
88af022912
|
Merge branch 'master' into master
|
2017-04-08 15:11:20 +11:00 |
|
Shel R
|
fb23e13cc5
|
Close instance list to additions
|
2017-04-07 23:51:30 -04:00 |
|
Kurtis Rainbolt-Greene
|
b399356fa5
|
Merge branch 'master' into fix-default-locale-regression
|
2017-04-07 20:50:21 -07:00 |
|
Kurtis Rainbolt-Greene
|
a1ab8bff51
|
Merge branch 'master' into patch-2
|
2017-04-07 20:48:27 -07:00 |
|
Chris Heninger
|
68e2f357c0
|
Add SVG version of logo to repo
|
2017-04-07 20:40:18 -07:00 |
|
Shel R
|
435c4d98f6
|
Merge pull request #1137 from Noiwex/patch-1
Update List-of-Mastodon-instances.md
|
2017-04-07 23:16:46 -04:00 |
|
Shel R
|
22598c0887
|
Merge branch 'master' into patch-1
|
2017-04-07 23:15:17 -04:00 |
|
Shel R
|
68d0ac7e42
|
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
|
d01f588d77
|
Merge branch 'master' into add_indigo_zone_instance
|
2017-04-07 23:09:50 -04:00 |
|
Shel R
|
ef88e00c30
|
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
|
4e9312bba3
|
Merge branch 'master' into list-oulipo-social
|
2017-04-07 23:08:41 -04:00 |
|
Shel R
|
dc0c19502b
|
Merge pull request #1186 from Aguay-val/patch-2
Add mastodon.fun
|
2017-04-07 23:07:50 -04:00 |
|
Shel R
|
a876a87890
|
Merge branch 'master' into patch-2
|
2017-04-07 23:05:08 -04:00 |
|
Shel R
|
9397634b9c
|
Merge branch 'master' into patch-1
|
2017-04-07 23:03:07 -04:00 |
|
Shel R
|
05b6aa25dc
|
Merge branch 'master' into patch-1
|
2017-04-07 22:59:07 -04:00 |
|
Shel R
|
c0d857714d
|
Merge pull request #1107 from YDrogen/patch-1
Added masto.razrnet.fr
|
2017-04-07 22:54:44 -04:00 |
|
Shel R
|
45f9242902
|
Merge branch 'master' into patch-1
|
2017-04-07 22:54:25 -04:00 |
|
Shel R
|
9a408b42cb
|
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
|
2d0cf0e690
|
Merge branch 'master' into master
|
2017-04-07 22:53:42 -04:00 |
|
Shel R
|
af150540e0
|
Merge pull request #1085 from isati/patch-2
Add manx.social instance
|
2017-04-07 22:49:34 -04:00 |
|
Shel R
|
a063083b1a
|
Merge branch 'master' into patch-2
|
2017-04-07 22:49:14 -04:00 |
|
rbaumert
|
9075862af1
|
fixed a sentence in readme
|
2017-04-07 19:48:46 -07:00 |
|
Shel R
|
23d8d91034
|
Merge pull request #1084 from genesixx/patch-4
Update List-of-Mastodon-instances.md
|
2017-04-07 22:48:02 -04:00 |
|
Shel R
|
1969549e50
|
Merge branch 'master' into patch-4
|
2017-04-07 22:47:42 -04:00 |
|
Shel R
|
80d7527b4d
|
Merge pull request #1074 from kadiix/patch-1
Add an instance.
|
2017-04-07 22:47:00 -04:00 |
|
Shel R
|
b3ebd07861
|
Merge branch 'master' into patch-1
|
2017-04-07 22:46:36 -04:00 |
|
Shel R
|
7bc26b9e90
|
Merge pull request #1069 from Awea/master
Add an instance
|
2017-04-07 22:45:15 -04:00 |
|
Shel R
|
4dc42528b2
|
Merge branch 'master' into master
|
2017-04-07 22:44:40 -04:00 |
|
Shel R
|
528980fd32
|
Merge pull request #1066 from jack-michaud/master
Add Northeastern University Mastodon
|
2017-04-07 22:43:46 -04:00 |
|
Shel R
|
758cf4ef65
|
Merge branch 'master' into master
|
2017-04-07 22:43:13 -04:00 |
|
Shel R
|
8f77841110
|
Merge pull request #1051 from Tiwy57/patch-1
Add an instance
|
2017-04-07 22:42:34 -04:00 |
|
Shel R
|
9ab9130d04
|
Merge branch 'master' into patch-1
|
2017-04-07 22:42:14 -04:00 |
|
Shel R
|
4b5749f7a2
|
Merge pull request #1050 from lfuelling/patch-1
add my instance
|
2017-04-07 22:41:37 -04:00 |
|