catstodon

CatCatNya/catstodon

Fork 0

forked from glitch-soc-github-mirror/mastodon

Commit graph

553170b77a Fix #1097 When onClick is falsy, do not make status content clickable (#1434) Stephen Burgess 2017-04-10 14:31:26 -05:00
8a6096a3de Allow typing a toot while an image uploads (#1429) Jessica Stokes 2017-04-11 05:30:58 +10:00
d2f6d9b9fb Fix issue with missing emojify class in views (#1455) Matt Jankowski 2017-04-10 15:27:52 -04:00
dbe9f33fdc Admin base controller (#1465) Matt Jankowski 2017-04-10 15:27:03 -04:00
1be6aa0c7f Fix references to "v1" API (#1460) Alexsander Akers 2017-04-10 21:11:59 +02:00
087ca3009b Adjust background of emoji panel (#1461) Corey Dutson 2017-04-10 14:56:14 -04:00
db7c7d1af1 Improve scrolling behaviour (#1415) Jessica Stokes 2017-04-11 00:27:30 +10:00
42fb4faa0f Fix icon and emoji sizes (#1403) Ram Lmn 2017-04-10 16:32:09 +05:30
9bb398ee91 Minor clarifications (#1386) Ryan Freebern 2017-04-10 07:01:43 -04:00
9043b32183 Add Russian translation (ru) (#1023) Ratmir Karabut 2017-04-10 13:52:06 +03:00
e30bbb1cb0 Fix for Import issue from URL (#1416) Jantso Porali 2017-04-10 12:49:34 +02:00
8bdf02812c Add search to emoji picker (#1395) Gavin Mogan 2017-04-10 00:58:09 -07:00
93db265be7 Do not store last visited URL from API controllers (#1330) Eugen 2017-04-09 22:21:52 +02:00
c172919745 Fix #1339 - better Atom titles (#1343) Eugen 2017-04-09 20:55:54 +02:00
15d442cf9d Fix /api/v1/accounts/update_credentials tests (#1357) Eugen 2017-04-09 20:23:14 +02:00
43f955e31f Minor change to Entity on API.md (Relationship) (#1356) Ornithologist Coder 2017-04-09 19:10:38 +02:00
4ea4ef9d0f update portuguese translation (#1280) Hugo Gameiro 2017-04-09 17:49:26 +01:00
d19ed18388 Get handle from atom feed's author/email field instead of guessing from URL (#1344) ThibG 2017-04-09 18:43:48 +02:00
f0bd439486 Use HTTP Accept-Language to detect locale (#1166) David Authier 2017-04-09 18:40:24 +02:00
b16fbd52b2 Minor API.md changes (#1351) Ornithologist Coder 2017-04-09 18:36:03 +02:00
3b34c28bee Minor change on API.md (#1352) Ornithologist Coder 2017-04-09 18:35:51 +02:00
8bfdbf0aa6 Add comment to settings.yml to nudge admins towards editing values via Web UI (#1289) R Tucker 2017-04-09 12:34:29 -04:00
d4fe6cd2bf Allow users to update their Account in the API (#1179) David Celis 2017-04-09 09:33:40 -07:00
ea6c930c04 Helper cleanup (#1348) Matt Jankowski 2017-04-09 11:11:37 -04:00
12e29c9660 Update fr.jsx (#1329) StefOfficiel 2017-04-09 14:58:08 +02:00
082bef3027 French translation update (#1271) Olivier Humbert 2017-04-09 14:55:58 +02:00
e6b48a7048 French typo (#1257) spf 2017-04-09 14:54:47 +02:00
ba2aea3a80 add empty notifications french translation (#1111) Jonathan Klee 2017-04-09 14:54:02 +02:00
e5282e4ec0 Clean up about page (#1282) Matt Jankowski 2017-04-09 08:47:25 -04:00
53eb31f124 Fixes #1311 margin shouldn't stay fixed (#1312) Brian Mock 2017-04-09 05:45:26 -07:00
388ec0d5b6 Search cleanup (#1333) Matt Jankowski 2017-04-09 08:45:01 -04:00
71706f21c2 Ignore implied formats for catch all route requests (#1340) Matt Jankowski 2017-04-09 08:39:41 -04:00
b1881a3d48 Fix nonworking clear notices button (#1316) Rachel H 2017-04-09 02:35:23 -07:00
d5a675099a Add env variable to disable prepared statements (#1293) Eugen 2017-04-09 05:46:32 +02:00
c3e7bac1cc Allows setting log level in env variable (#1290) Ash Furrow 2017-04-08 19:42:13 -04:00
6e3925521d Adds user confirmation rake task (#1300) Ash Furrow 2017-04-08 19:09:46 -04:00
b89f007862 Make public timelines API not require user context/app credentials (#1291) Eugen 2017-04-08 23:39:31 +02:00
9acdb166e8 Fix #795, fix #704, fix #835 - 2FA requires confirmation to be enabled (#1278) Eugen 2017-04-08 22:20:08 +02:00
470eb0042e Improve responsiveness of registration form and closed banner (#1265) Pavel Djundik 2017-04-08 19:31:50 +03:00
fc146a19cc Improve about page responsiveness (#1252) Pavel Djundik 2017-04-08 16:28:23 +03:00
941a593ea8 Add mst3k.interlinked.me to list of instances (#1235) Elizabeth Myers 2017-04-08 06:48:16 -05:00
982fef811e Fix #1141, fix #1126 - Avatar/profile info fetching (#1215) Eugen 2017-04-08 13:26:03 +02:00
41f8fde83e Update french translation (#1148) Thomas Citharel 2017-04-08 13:11:16 +02:00
157f0a2aa7 Add titles to more icons, and change clear notifications icon. (#1101) Markus Amalthea Magnuson 2017-04-08 13:07:55 +02:00
49043f644d Update mastodon.brussels instance name on List of Instances kadiix 2017-04-08 13:05:49 +02:00
c803f5b440 Updated German translation (#1248) Nicolai von Neudeck 2017-04-08 13:04:58 +02:00
f860eb7d71 Fixed two translation errors (#1139) Sebastian Hübner 2017-04-08 13:03:11 +02:00
8f9a11b642 Update simple_form.de.yml (#971) Korbinian 2017-04-08 13:02:07 +02:00
c6b0707cf6 Update mastodon.nuzgo.net (#1242) Thibaut (Eychics) 2017-04-08 12:34:53 +02:00
b79c80b620 Add OTP_SECRET to Heroku app.json (#1246) James Smith 2017-04-08 11:31:33 +01:00
211920b622 Revert "add persistance to Postresql container" (#1251) Eugen 2017-04-08 12:25:23 +02:00
01d8003867 Updated about page in Finnish language (#1170) Jantso Porali 2017-04-08 12:17:34 +02:00
ed3dfd0bee French translation update (#1188) Olivier Humbert 2017-04-08 12:16:49 +02:00
35eff3f2d0 Add some missing strings to prevent some React warning in the console (#1230) Alda Marteau-Hardi 2017-04-08 12:16:16 +02:00
ca44c13455 Use Setting.site_title value for og:site_name occurrences (#1194) Matt Jankowski 2017-04-08 06:15:40 -04:00
a345eb44fc Merge pull request #1239 from ineffyble/patch-2 Eugen 2017-04-08 11:40:43 +02:00
7b814d5bcb Merge pull request #1238 from milmazz/hunter-client Eugen 2017-04-08 11:40:20 +02:00
9f9f4b248e Merge pull request #887 from valentin2105/master Eugen 2017-04-08 11:39:25 +02:00
3660f01f60 Merge pull request #1115 from vmincev/patch-1 Eugen 2017-04-08 11:38:54 +02:00
a2ec54a20b Merge pull request #1198 from huertanix/patch-1 Eugen 2017-04-08 11:38:33 +02:00
e33dcb79c6 Merge pull request #1221 from rbaumert/patch-1 Eugen 2017-04-08 11:37:51 +02:00
7d5ea5c170 Merge pull request #1224 from chrisheninger/patch-1 Eugen 2017-04-08 11:37:37 +02:00
33849acfa7 Merge pull request #1218 from R0ckweb/patch-2 Eugen 2017-04-08 11:37:13 +02:00
c141f0a886 Merge pull request #1216 from tootsuite/fix-default-locale-regression Eugen 2017-04-08 11:36:43 +02:00
55d03da303 Merge pull request #1213 from tootsuite/fix-accounts-initial-case Eugen 2017-04-08 11:36:35 +02:00
2c3a730eae Merge pull request #1225 from tootsuite/yiskah-patch-1 Eugen 2017-04-08 11:35:40 +02:00
b04cbb9f5d

Add reference to Elixir client for Mastodon API Milton Mazzarri 2017-04-08 02:48:52 -05:00
75aade3de2 Fix my URL Effy Elden 2017-04-08 16:22:07 +10:00
ac0b84534e Merge branch 'master' into patch-1 rbaumert 2017-04-07 21:39:24 -07:00
3c48c9ac2e Merge branch 'master' into master Valentin Ouvrard 2017-04-08 15:11:20 +11:00
ecf0320a78 Close instance list to additions Shel R 2017-04-07 23:51:30 -04:00
40703b96fa Merge branch 'master' into fix-default-locale-regression Kurtis Rainbolt-Greene 2017-04-07 20:50:21 -07:00
1e4453405b Merge branch 'master' into patch-2 Kurtis Rainbolt-Greene 2017-04-07 20:48:27 -07:00
0ad694f96b Add SVG version of logo to repo Chris Heninger 2017-04-07 20:40:18 -07:00
541c538f9b Merge pull request #1137 from Noiwex/patch-1 Shel R 2017-04-07 23:16:46 -04:00
50910d1543 Merge branch 'master' into patch-1 Shel R 2017-04-07 23:15:17 -04:00
4ff8653d6c Merge pull request #1197 from blakebarnett/add_indigo_zone_instance Shel R 2017-04-07 23:10:25 -04:00
17690f51a2 Merge branch 'master' into add_indigo_zone_instance Shel R 2017-04-07 23:09:50 -04:00
cf80cb5e8b Merge pull request #1196 from mouse-reeve/list-oulipo-social Shel R 2017-04-07 23:09:09 -04:00
315ff648c8 Merge branch 'master' into list-oulipo-social Shel R 2017-04-07 23:08:41 -04:00
41923d1c6b Merge pull request #1186 from Aguay-val/patch-2 Shel R 2017-04-07 23:07:50 -04:00
63686fd36f Merge branch 'master' into patch-2 Shel R 2017-04-07 23:05:08 -04:00
ae9d2f4a32 Merge branch 'master' into patch-1 Shel R 2017-04-07 23:03:07 -04:00
741bbba6ff Merge branch 'master' into patch-1 Shel R 2017-04-07 22:59:07 -04:00
a25a384af3 Merge pull request #1107 from YDrogen/patch-1 Shel R 2017-04-07 22:54:44 -04:00
971c4de18c Merge branch 'master' into patch-1 Shel R 2017-04-07 22:54:25 -04:00
394c8ef680 Merge pull request #1090 from gled-rs/master Shel R 2017-04-07 22:54:14 -04:00
3c5b0c55cb Merge branch 'master' into master Shel R 2017-04-07 22:53:42 -04:00
0dcf3c6abe Merge pull request #1085 from isati/patch-2 Shel R 2017-04-07 22:49:34 -04:00
b67b60fec3 Merge branch 'master' into patch-2 Shel R 2017-04-07 22:49:14 -04:00
2c0ef75f58 fixed a sentence in readme rbaumert 2017-04-07 19:48:46 -07:00
cc16fa7513 Merge pull request #1084 from genesixx/patch-4 Shel R 2017-04-07 22:48:02 -04:00
d6827e38a6 Merge branch 'master' into patch-4 Shel R 2017-04-07 22:47:42 -04:00
29ed448445 Merge pull request #1074 from kadiix/patch-1 Shel R 2017-04-07 22:47:00 -04:00
e7d7a99fbc Merge branch 'master' into patch-1 Shel R 2017-04-07 22:46:36 -04:00
8d27de32b3 Merge pull request #1069 from Awea/master Shel R 2017-04-07 22:45:15 -04:00
abab82ec1e Merge branch 'master' into master Shel R 2017-04-07 22:44:40 -04:00
f0797bf8ce Merge pull request #1066 from jack-michaud/master Shel R 2017-04-07 22:43:46 -04:00
38c5130930 Merge branch 'master' into master Shel R 2017-04-07 22:43:13 -04:00
ee8af9083a Merge pull request #1051 from Tiwy57/patch-1 Shel R 2017-04-07 22:42:34 -04:00
c9f15f7991 Merge branch 'master' into patch-1 Shel R 2017-04-07 22:42:14 -04:00
91afe1f8fd Merge pull request #1050 from lfuelling/patch-1 Shel R 2017-04-07 22:41:37 -04:00
9edee2e64f Merge branch 'master' into patch-1 Shel R 2017-04-07 22:41:07 -04:00
d7e1a282fe Merge pull request #1046 from raymestalez/patch-2 Shel R 2017-04-07 22:40:29 -04:00
c890b86ef6 Merge branch 'master' into patch-2 Shel R 2017-04-07 22:39:59 -04:00
5b571fc434 Merge branch 'master' into master Valentin Ouvrard 2017-04-08 13:39:31 +11:00
3e4eb9c95f Merge branch 'master' into master Valentin Ouvrard 2017-04-08 13:39:09 +11:00
ceba26d527 Merge pull request #1041 from R0ckweb/patch-1 Shel R 2017-04-07 22:39:05 -04:00
7826b5e93d Merge branch 'master' into patch-1 Shel R 2017-04-07 22:38:37 -04:00
fc7b830719 Merge pull request #1036 from wirehack7/patch-1 Shel R 2017-04-07 22:37:51 -04:00
c945f29e96 Merge branch 'master' into patch-1 Shel R 2017-04-07 22:35:45 -04:00
0d4d42dce6 Merge pull request #1035 from gfaivre/add-elao-com-instance Shel R 2017-04-07 22:35:08 -04:00
cf03634e74 Merge branch 'master' into add-elao-com-instance Shel R 2017-04-07 22:34:45 -04:00
698d74a15f Merge pull request #1030 from derekcecillewis/add-infinimatix.net-instance Shel R 2017-04-07 22:34:10 -04:00
d7d165db5b Merge branch 'master' into add-infinimatix.net-instance Shel R 2017-04-07 22:33:40 -04:00
d7f4300ee3 Merge pull request #1009 from ngerakines/patch-1 Shel R 2017-04-07 22:25:45 -04:00
7632178300 Merge branch 'master' into patch-1 Shel R 2017-04-07 22:23:50 -04:00
e4e948a21b Merge pull request #797 from AndreLewin/master Shel R 2017-04-07 22:21:48 -04:00
fef478781d Merge branch 'master' into master Shel R 2017-04-07 22:21:21 -04:00
c1a553d2c2 Merge pull request #1006 from Ninetailed/master Shel R 2017-04-07 22:18:11 -04:00
3e8c1a1c36 Merge branch 'master' into master Shel R 2017-04-07 22:17:53 -04:00
9fd8bbe15c Merge pull request #992 from Eychics/master Shel R 2017-04-07 22:16:49 -04:00
1b42f717f2 Merge branch 'master' into master Shel R 2017-04-07 22:15:55 -04:00
7004c69204 Merge pull request #991 from vladooku/patch-1 Shel R 2017-04-07 22:15:12 -04:00
9981972844 Merge branch 'master' into patch-1 Shel R 2017-04-07 22:14:08 -04:00
5f61ef2417 Merge pull request #989 from MTNDevelopment/master Shel R 2017-04-07 22:13:34 -04:00
cf13c97cb2 Merge branch 'master' into master Shel R 2017-04-07 22:13:06 -04:00
90a408f592 Merge pull request #986 from estuans/patch-2 Shel R 2017-04-07 22:11:55 -04:00
451b7431c9 Merge branch 'master' into patch-2 Shel R 2017-04-07 22:11:24 -04:00
530725ba3c Merge pull request #985 from Motoma/patch-1 Shel R 2017-04-07 22:10:22 -04:00
6efaee30b1 Merge branch 'master' into patch-1 Shel R 2017-04-07 22:09:55 -04:00
698fe3686a Merge pull request #982 from foxiehkins/master Shel R 2017-04-07 22:09:15 -04:00
05be34a94b Merge branch 'master' into master Shel R 2017-04-07 22:08:54 -04:00
cb58694a81 Merge pull request #976 from shug0/patch-1 Shel R 2017-04-07 22:06:06 -04:00
e51b6bba94 Merge branch 'master' into patch-1 Shel R 2017-04-07 22:05:38 -04:00
7f393a0b68 Merge pull request #975 from tomfhowe/patch-4 Shel R 2017-04-07 22:03:35 -04:00
9f43e3b428 Merge branch 'master' into patch-4 Shel R 2017-04-07 22:02:26 -04:00
4a40b40324 Merge pull request #973 from ZiiX/patch-1 Shel R 2017-04-07 21:59:51 -04:00
4c05f0e630 Merge branch 'master' into patch-1 Shel R 2017-04-07 21:59:21 -04:00
d438eab673 Merge pull request #972 from amandavisconti/master Shel R 2017-04-07 21:56:57 -04:00
7b7bff04df Merge branch 'master' into master Shel R 2017-04-07 21:54:32 -04:00
e659608797 Merge pull request #970 from estuans/patch-1 Shel R 2017-04-07 21:49:57 -04:00
ed332693fe Merge branch 'master' into patch-1 Shel R 2017-04-07 21:49:18 -04:00
881e4277fd Merge pull request #969 from Fortyseven/patch-1 Shel R 2017-04-07 21:48:58 -04:00
5dfc9854f1 Merge branch 'master' into patch-1 Shel R 2017-04-07 21:48:19 -04:00
b300bb3b4e Merge pull request #959 from mkody/patch-1 Shel R 2017-04-07 21:45:06 -04:00
6d519e6fd1 Merge branch 'master' into patch-1 Shel R 2017-04-07 21:44:16 -04:00
d2c9cc31de Merge pull request #953 from Technowix/patch-1 Shel R 2017-04-07 21:43:20 -04:00
065defefac Merge branch 'master' into patch-1 Shel R 2017-04-07 21:42:10 -04:00
6bfe068904 Merge pull request #944 from VirtuBox/patch-1 Shel R 2017-04-07 21:35:34 -04:00
bc237d17a7 Merge branch 'master' into patch-1 Shel R 2017-04-07 21:34:41 -04:00
485d75a805 #1141 on remote follow Yann GUERN 2017-04-08 03:24:35 +02:00
4b621188ad Fix #1165 - before_action was called before protect_from_forgery Eugen Rochko 2017-04-08 02:30:50 +02:00
4fb24a70d3 Merge branch 'master' into patch-1 David Huerta 2017-04-07 19:46:07 -04:00
b2a7218ab7 Fix #801 - Respect webfinger's canonical response of username/domain Eugen Rochko 2017-04-08 01:07:42 +02:00
a872f2f4c6 Merge pull request #1204 from benklop/patch-1 Eugen 2017-04-08 01:00:32 +02:00
32a6f0884c Merge pull request #1200 from huertanix/patch-2 Eugen 2017-04-08 01:00:06 +02:00
a54af44975 Merge pull request #1210 from raymestalez/patch-3 Eugen 2017-04-08 00:59:02 +02:00
f113af5350 Add HackerNewsBot Ray Alez 2017-04-07 15:56:02 -07:00
f578cf8331 Update Administration-guide.md benklop 2017-04-07 16:31:50 -06:00
3cb13bdd84 Merge pull request #1125 from jasonrhodes/patch-1 Eugen 2017-04-08 00:24:38 +02:00
0bf31f5436 Merge pull request #1147 from fmauNeko/docker_smaller_image Eugen 2017-04-07 23:45:48 +02:00
a7ab2204d4 Update Heroku-guide.md David Huerta 2017-04-07 17:44:32 -04:00
36a83cc4f9 Update Heroku-guide.md David Huerta 2017-04-07 17:29:21 -04:00
30903d5f02 Add indigo.zone to list of instances Blake 2017-04-07 14:10:37 -07:00
94536af96d Adds Oulipo.social to Mastodons list Mouse Reeve 2017-04-07 14:06:49 -07:00
0b32b5108e Merge pull request #1191 from d3vgru/master Eugen 2017-04-07 23:02:49 +02:00
12f1cdeed1

Fix npm/yarn cache cleaning Florian Maunier 2017-04-07 13:31:18 +02:00
e2f024147c Merge pull request #1172 from mjankowski/mj-heroku-docs Eugen 2017-04-07 22:50:31 +02:00
1961825ff9 Merge pull request #1183 from thoughtbot/cp-post-status-service-specs Eugen 2017-04-07 22:30:28 +02:00
32748c0f71 Merge pull request #1184 from thoughtbot/extract-proper-status Eugen 2017-04-07 22:28:15 +02:00
37a36b0bec Merge pull request #1192 from seekr/patch-2 Eugen 2017-04-07 22:25:48 +02:00
c7d9b81d41 Merge pull request #1193 from thoughtbot/status-specs Eugen 2017-04-07 22:25:10 +02:00
4fdeac21f4 Implement pending specs on Status Joël Quenneville 2017-04-07 15:30:36 -04:00
131f505fd0 typo seekr 2017-04-07 16:33:13 -03:00
27012aaeb6 change suggested cipher for nginx Ed Knutson 2017-04-07 14:10:39 -05:00
4c751d25e5 Add mastodon.fun Aguay-val 2017-04-07 20:33:52 +02:00
ad5ddd5e95 Use I18n for media attachment validation errors Chad Pytel 2017-04-07 14:19:16 -04:00
13c0077003 Add specs for PostStatusService Chad Pytel 2017-04-07 13:48:38 -04:00
d4c94fa004 DRY up reblog vs original status check Joël Quenneville 2017-04-07 14:18:30 -04:00
38bec79811 Add specs for media attachment validations Chad Pytel 2017-04-07 12:50:43 -04:00
0f4fa59812 Update heroku instructions Matt Jankowski 2017-04-07 11:34:10 -04:00
41396de7a9 Merge branch 'master' into master foxiehkins 2017-04-07 14:01:20 +01:00
2ac8a590cd Moved into a comment per feedback Jason Rhodes 2017-04-07 07:43:44 -04:00
4e41cd9ab8 Merge pull request #1146 from tootsuite/fix-object-type-nil-exception Eugen 2017-04-07 13:08:51 +02:00
10459241a8 Merge pull request #1145 from tootsuite/feature-customized-default-locale Eugen 2017-04-07 13:08:27 +02:00
c9b23a93c7 Merge branch 'master' into fix-object-type-nil-exception Eugen 2017-04-07 13:07:36 +02:00
0adee18d73 Merge branch 'master' into feature-customized-default-locale Eugen 2017-04-07 13:07:03 +02:00
8a6d8de60a Fix nil#object_type error Eugen Rochko 2017-04-07 13:05:34 +02:00
786e6f94b9 Update Finnish translations, add sample Minio config (#954) Jantso Porali 2017-04-07 12:58:12 +02:00
0c4e9fdda0 Merge branch 'master' into patch-4 Erwan Leboucher 2017-04-07 12:43:56 +02:00
e3a3422a65 Allow setting of default language through config Eugen Rochko 2017-04-07 12:40:26 +02:00
624a9a7136 Re-add forgotten <author> element on standalone <entry> Eugen Rochko 2017-04-07 12:21:00 +02:00
1c351709bc Force UTF8 encoding on generated XML (#1140) Eugen 2017-04-07 11:09:14 +02:00
8e7d0bda40 Update List-of-Mastodon-instances.md Sergei Č 2017-04-07 11:54:41 +03:00
6d6a429af8 Rewrite Atom generation from stream entries to use Ox instead of Nokogiri (#1124) Eugen 2017-04-07 05:56:56 +02:00
5d43a9cae2 Email service options :P Jason Rhodes 2017-04-06 22:48:17 -04:00
8a4ff30ceb updated instance hostname Tristan Mahé 2017-04-06 17:18:40 -07:00
56f4a94e7b Update Production-guide.md Vladimir Mincev 2017-04-07 01:05:32 +02:00
31597fd377 Low-hanging fruit of query optimization, these indices were missing Eugen Rochko 2017-04-07 00:04:09 +02:00