catstodon

CatCatNya/catstodon

Fork 0

forked from glitch-soc-github-mirror/mastodon

Commit graph

71965cbef2

Adjust empty list timeline message (#5997) Eugen Rochko 2017-12-13 02:40:32 +01:00
0128b86d30

Use streaming API for standalone timelines on /about and /tag pages (#5998) Eugen Rochko 2017-12-13 02:12:41 +01:00
0370ba7b0a Update: #5985 and #5817 (#5996) Quenty31 2017-12-12 20:48:26 +01:00
c986218c3a Improve error handling in streaming/index.js (#5968) erin 2017-12-12 13:19:33 -06:00
0c8b1eb577 Make detect empty string before assign image description (#5994) Neetshin 2017-12-12 18:57:22 +00:00
cfa3f55221 Remove duplicate indexes in lists (#5990) abcang 2017-12-13 01:38:42 +09:00
f9f6918148 Store preview image for embedded photo in preview cards (#5986) Akihiko Odaki 2017-12-12 23:54:38 +09:00
b6ded7119e travis fixes cwm 2017-12-12 08:50:31 -06:00
65d083338d

Merge pull request #263 from KnzkDev/optimize-paperclip beatrix 2017-12-12 09:15:52 -05:00
2a61b9f000 Update Chinese (Simplified) translations (#5991) SerCom_KC 2017-12-12 22:13:47 +08:00
cfea28216f make it possible to stream public timelines without authorization (#5977) nullkal 2017-12-12 23:13:24 +09:00
19257d91bf Return false if object does not respond to url (#5988) Renato "Lond" Cerqueira 2017-12-12 15:12:09 +01:00
fe180f18ff Change conditional to avoid nil into string error in sidekiq (#5987) Renato "Lond" Cerqueira 2017-12-12 15:11:13 +01:00
1486fd64cc Move files for GitHub to .github directory (#5989) Yamagishi Kazutoshi 2017-12-12 23:10:12 +09:00
504c3d650f

Merge pull request #264 from KnzkDev/add-ja beatrix 2017-12-12 08:49:19 -05:00
be33247235

Remove themes.default from nl and pt-BR locales. David Yip 2017-12-12 03:28:15 -06:00
a057ed5cfe

Merge remote-tracking branch 'tootsuite/master' into merge-upstream David Yip 2017-12-12 02:54:13 -06:00
9b7208f4b4 readded connect for onboarding modal cwm 2017-12-12 00:17:07 -06:00
b358483ef2 remove unneeded imports from getting_started_misc cwm 2017-12-12 00:09:18 -06:00
37ced4c903 add components to getting started column cwm 2017-12-12 00:01:17 -06:00
b93ad3d0e8 add ja ncls7615 2017-12-12 13:13:54 +09:00
c0c4526283 add ja for fav conf ncls7615 2017-12-12 13:05:48 +09:00
04eaa1943f

Merge pull request #262 from chriswmartin/fix-oauth-pack Gô Shoemake 2017-12-11 19:34:19 -08:00
c95af71da5 optimize paperclip ncls7615 2017-12-12 12:29:09 +09:00
14c4a33cd9 Change account_id non-nullable in lists (#5979) Akihiko Odaki 2017-12-12 12:11:17 +09:00
30d2ea03b0

Improve public status page title (#5985) Eugen Rochko 2017-12-12 03:56:30 +01:00
1356ed72cd

Fix #5953 - Add GET /api/v1/accounts/:id/lists (#5983) Eugen Rochko 2017-12-12 03:55:39 +01:00
481fac7c84

Exclude moved accounts from search results (#5984) Eugen Rochko 2017-12-12 02:14:33 +01:00
0a52e37648 change pack to 'auth' cwm 2017-12-11 18:14:41 -06:00
44992df257 load pack cwm 2017-12-11 17:54:40 -06:00
2efffe77dc reblog_service.rb: Status#local_only -> local_only? Erin 2017-12-11 17:39:11 -06:00
c5a4eda694 move outbox filtering to Status#permitted_for (as per @ekiru) Erin 2017-12-11 15:28:04 -06:00
3ec47e732b post_status_service: stylistic change (local_only -> local_only?) Erin 2017-12-11 15:27:31 -06:00
c588fcf4bc Tiny little change (#5981) Quenty31 2017-12-11 20:53:29 +01:00
8aa527434c Fixed index in webpack config kibigo! 2017-12-11 10:45:21 -08:00
7d024a6b68

Merge pull request #259 from KnzkDev/flavours-ja beatrix 2017-12-11 10:56:41 -05:00
d8206d1931 add ja ncls7615 2017-12-12 00:28:33 +09:00
771b950feb

Merge pull request #254 from glitch-soc/new-theme-ux beatrix 2017-12-11 09:36:14 -05:00
feed07227b

Apply a 25x rate limit by IP even to authenticated requests (#5948) Eugen Rochko 2017-12-11 15:32:29 +01:00
0cd5f2a61f

Merge pull request #255 from KnzkDev/remove-picture beatrix 2017-12-11 09:08:13 -05:00
e56323a4dd Remove preview_card fabricator (#5975) Akihiko Odaki 2017-12-11 22:22:08 +09:00
204688e803

Add missing set_pack def/filter in OAuth::AuthorizedApplicationsController. David Yip 2017-12-11 00:17:30 -06:00
9d5ecdbf41 remove picture ncls7615 2017-12-11 13:52:17 +09:00
1138d0c321

Add Rake task to backfill local-only flag (#253) David Yip 2017-12-10 22:49:59 -06:00
ed7231947c Added styling kibigo! 2017-12-10 20:24:11 -08:00
bdca1614d5 Screenshot support for themes kibigo! 2017-12-10 20:15:09 -08:00
dabf66e676 Moved flavour UI into own prefs tab kibigo! 2017-12-10 17:56:17 -08:00
08b0861b96

Merge pull request #250 from chriswmartin/fav-confirm-modal beatrix 2017-12-10 23:10:19 -05:00
01a3461bef

Merge pull request #252 from ncls7615/glitch-langfiles beatrix 2017-12-10 22:53:48 -05:00
288f1293ef set local_only in a before_create callback instead of status service Erin 2017-12-10 21:39:27 -06:00
0c46058a43 remove vestigial Status#local_only? definition Erin 2017-12-10 21:25:36 -06:00
c1410af368 post_status_service.rb: save the status after setting local_only Erin 2017-12-10 20:35:57 -06:00
24f36ca912 Status#not_local_only scope should match nils too Erin 2017-12-10 19:41:33 -06:00
84d5bfb35e Change the disclaimer under the sign up form (#5817) Sylvhem 2017-12-11 02:30:43 +01:00
f080a9fac7 filter local-only toots from AP outboxes Erin 2017-12-10 19:07:43 -06:00
d420e2f047 add comma ncls7615 2017-12-11 09:50:52 +09:00
279231c5dd " => ' ncls7615 2017-12-11 09:46:17 +09:00
a98b0a47ef Merge branch 'master' of https://github.com/glitch-soc/mastodon into glitch-langfiles ncls7615 2017-12-11 09:43:21 +09:00
6bd18e43ba filter local-only statuses from public pages Erin 2017-12-10 17:23:01 -06:00
5ef65aab8f replace reblog service check for an 👁️ with #local_only Erin 2017-12-10 17:12:21 -06:00
cfbb95605b set local_only flag on statuses in post_status_service Erin 2017-12-10 17:04:32 -06:00
08519cd4f4 status: stub local_only?, add scope, add marked_local_only? Erin 2017-12-10 17:04:28 -06:00
434c70fd98 add a local_only column to the statuses table Erin 2017-12-10 16:41:25 -06:00
0466aa8d08 use single quotes in locale entry cwm 2017-12-10 15:39:23 -06:00
072ab191cc pulled master, moved locale entry to new location cwm 2017-12-10 15:22:15 -06:00
eec5d350fd removed unneeded actions_modal div cwm 2017-12-10 15:14:56 -06:00
26c9b9fa27

Merge pull request #246 from glitch-soc/theme-intl8n beatrix 2017-12-10 15:41:22 -05:00
64b839b769 Removed MORE theme localizns kibigo! 2017-12-10 11:38:30 -08:00
cd107e92cb Move ja localization to new locaiton kibigo! 2017-12-10 11:09:59 -08:00
6b7085a33e Linting fixes kibigo! 2017-12-07 19:59:31 -08:00
1c728df92e Only localize js when there's a theme kibigo! 2017-12-07 19:41:57 -08:00
b28cd6769c Javascript intl8n flavour support kibigo! 2017-12-07 19:07:47 -08:00
8394430081 Removed unused theme localization key kibigo! 2017-12-07 14:57:49 -08:00
d08d0f9f33 Ruby intl8n for themes kibigo! 2017-12-07 14:42:21 -08:00
6a82939adb Fix account and tag searches with leading/trailing spaces (#5965) Andrea Scarpino 2017-12-10 19:35:46 +01:00
98aa96b8d6 Refix extraspace for emojis (#5964) Lynx Kotoura 2017-12-11 01:56:05 +09:00
3caec1ecc2 Save media outside transaction (#5959) abcang 2017-12-11 00:33:52 +09:00
066458a659 removed one last app settings addition cwm 2017-12-10 09:25:44 -06:00
2950de86c6 Update devise.fr.yml (#5963) goofy-bz 2017-12-10 16:24:29 +01:00
7a8711ccac removed app settings additions cwm 2017-12-10 09:10:47 -06:00
7d4ebeecbd l10n i18n OC: corrections (#5962) Quenty31 2017-12-10 16:07:24 +01:00
0e56797792 add and fix ncls7615 2017-12-10 17:33:22 +09:00
282f48ddd1

Merge pull request #248 from chriswmartin/glitch-theme-lists beatrix 2017-12-10 00:53:37 -05:00
ef53c972b1

Merge pull request #237 from dexamphetamine/jpn-localization beatrix 2017-12-09 23:34:13 -05:00
eb2b971a52 i18n: add ja glitch strings amphetamine 2017-12-05 13:05:39 -08:00
6e3f176b8e Add Galician language support (#5955) Yamagishi Kazutoshi 2017-12-10 12:19:07 +09:00
a4710f9af8 French translation update (#5954) Olivier Humbert 2017-12-10 01:47:59 +01:00
fcc0795a40 Remove unused function (#5950) abcang 2017-12-10 07:37:31 +09:00
0f8140d26a Create activerecord.ar.yml (#5951) ButterflyOfFire 2017-12-09 23:37:18 +01:00
8606e53384 moved locales to glitch, created add settings entry cwm 2017-12-09 15:15:11 -06:00
fbd2a0127c ran i18n-tasks normalize for simple_form.en.yml cwm 2017-12-09 13:00:07 -06:00
c5a688d70e remove trailing spaces cwm 2017-12-09 12:41:24 -06:00
7284e36fbd fixed fav setting change cwm 2017-12-09 12:17:20 -06:00
22cdbca82c fixes, functioning now cwm 2017-12-09 12:06:00 -06:00
a489e5d5cd added a few more things cwm 2017-12-09 11:21:41 -06:00
baf9ea8018 remove keyboard shortcuts from getting started because thats a different thing cwm 2017-12-09 10:32:46 -06:00
abe95b614b add initial components based off of tootsuite pr #1507 cwm 2017-12-09 10:26:22 -06:00
e7d55df38d Ignore HEAD method if does not support (#5949) Yamagishi Kazutoshi 2017-12-10 00:53:40 +09:00
a72d03f43c

Weblate translations (#5946) Eugen Rochko 2017-12-09 15:35:22 +01:00
4bce376fdc Missing require 'authorization_decorator'. (#5947) Naoki Kosaka 2017-12-09 23:12:10 +09:00
a865b62efc

Rate limit by user instead of IP when API user is authenticated (#5923) Eugen Rochko 2017-12-09 14:20:02 +01:00
84cebad49d Update Chinese (Simplified) translations (#5937) SerCom_KC 2017-12-09 21:19:45 +08:00
931e66e572 Back to Web UI from tag page when signed in (#5943) Yamagishi Kazutoshi 2017-12-09 22:19:07 +09:00
cdae7e4c8b Move push notifications settings (regression from #5879) (#5941) Yamagishi Kazutoshi 2017-12-09 22:18:45 +09:00
3a52c90de1 l10n i18n OC update (#5939) Quenty31 2017-12-09 14:17:34 +01:00
17e26f8afe Fix typo in paperclip.rb (#5936) THE BOSS ♨ 2017-12-09 13:59:59 +09:00
02d71c6a11 fix a missing semicolon and mixed tabs/spaces that travis was complaining about cwm 2017-12-08 21:09:53 -06:00
4a5401a58e merge tootsuite prs #5895 and #5889 into glitch flavour cwm 2017-12-08 20:50:39 -06:00
28423dd046 merge tootsuite pr #5904 into glitch flavour cwm 2017-12-08 20:45:18 -06:00
b165950ca7 add keyboard shortcut to getting started, add missing list style cwm 2017-12-08 20:30:45 -06:00
47157e07b2 merged tootsuite pr #5811 into glitch flavour cwm 2017-12-08 20:13:08 -06:00
2526ef10c2

Bump version to 2.1.0rc3 Eugen Rochko 2017-12-09 02:42:59 +01:00
f44c8fd130 merged tootsuite pr #5750 into glitch flavour cwm 2017-12-08 19:40:49 -06:00
99242b92bc Keep WebPush settings (#5879) abcang 2017-12-09 10:31:37 +09:00
ec3b449baa

Fix #5630 - Prevent duplicate load of favourites (#5931) Eugen Rochko 2017-12-09 02:22:13 +01:00
2f4c5f504f

Limit users to 50 lists, remove pagination from lists API (#5933) Eugen Rochko 2017-12-09 01:32:29 +01:00
f08e6e9ab5 Audio.prototype.seek is undefined (#5935) Yamagishi Kazutoshi 2017-12-09 09:25:00 +09:00
86b4d5439c

Fix #5926 - Do not downgrade to OStatus once ActivityPub is known (#5929) Eugen Rochko 2017-12-09 01:24:47 +01:00
c36b9cc5a6

Ensure link thumbnails are not stretched to super low quality (#5932) Eugen Rochko 2017-12-09 00:56:16 +01:00
70ce2a2095

Polish video player CSS, add timer on fullscreen/modal/public pages (#5928) Eugen Rochko 2017-12-09 00:55:58 +01:00
b0db4dad79 Revert fog-aws (ref #5604) (#5934) Yamagishi Kazutoshi 2017-12-09 08:47:52 +09:00
776867ea73 Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master Jenkins 2017-12-08 13:17:14 +00:00
dad0a09675 Remove unused messages (#5924) Yamagishi Kazutoshi 2017-12-08 21:55:33 +09:00
bca9e2e57a

Weblate translations (#5922) Eugen Rochko 2017-12-08 01:59:44 +01:00
369f40bb9f

Bump version to 2.1.0rc2 Eugen Rochko 2017-12-08 01:47:08 +01:00
65e0bbd958 Disable status content outline (#5921) Yamagishi Kazutoshi 2017-12-08 08:03:25 +09:00
717b7d555c Skins shouldn't apply to fallback flavours kibigo! 2017-12-07 14:49:54 -08:00
753535c3c7 Fixed webpack skin folder globbing kibigo! 2017-12-07 14:33:49 -08:00
9cdd81e9dd Glitch doesn't have a home stylesheet anymore kibigo! 2017-12-07 14:32:52 -08:00
96126a5b01 Packaged local_settings styles in common kibigo! 2017-12-07 13:35:37 -08:00
832a7f9a05 ReFix font-weight of <strong> element for CJK fonts (#5920) Lynx Kotoura 2017-12-08 05:35:19 +09:00
7fcf15adf3 Improve Chinese (Simplified) translations (#5911) SerCom_KC 2017-12-07 23:02:52 +08:00
a1fc626e57 Fix font-weight of <strong> element for CJK fonts (#5914) SerCom_KC 2017-12-07 23:01:52 +08:00
9a6fc03332 Hide moved account's follow button in search result (#5913) Yamagishi Kazutoshi 2017-12-07 23:59:31 +09:00
7445f17571 OC language update (#5905) Quenty31 2017-12-07 07:28:13 +01:00
67d625c42d

Fix hide reblogs in glitch frontend (#5909) David Yip 2017-12-06 22:35:45 -06:00
ddb61decce

Merge remote-tracking branch 'personal/merge/tootsuite/master' into gs-master David Yip 2017-12-06 22:34:42 -06:00
935c1944e2

Merge pull request #241 from glitch-soc/no-dm-option David Yip 2017-12-06 22:20:55 -06:00
744447b3c0 Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master Jenkins 2017-12-07 04:17:14 +00:00
0c4ca3e549 Remove duplicate annotate (#5910) Yamagishi Kazutoshi 2017-12-07 12:53:42 +09:00
c083816c24 Add embed_url to preview cards (#5775) Akihiko Odaki 2017-12-07 11:37:43 +09:00
432761f375 Fix hide reblogs (regression from #5887) (#5909) Yamagishi Kazutoshi 2017-12-07 11:37:31 +09:00
2f2467ce8e Add option to remove DMs from home (#126) kibigo! 2017-12-06 17:50:27 -08:00
de56209951

Merge pull request #240 from glitch-soc/copy-api-changes beatrix 2017-12-06 19:59:15 -05:00
133f5b3b53

Apply Javascript changes in tootsuite/mastodon#5887 to glitch flavour (#239) David Yip 2017-12-06 18:23:28 -06:00
c63e6c9a2c Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master Jenkins 2017-12-07 00:17:14 +00:00
061211a1e3 Fix common packs when other pack also there kibigo! 2017-12-06 15:34:19 -08:00
161d286df2

Use settings pack for InvitesController (#229) David Yip 2017-12-06 17:20:04 -06:00
81b0145759

Merge pull request #229 from glitch-soc/glitch-theme beatrix 2017-12-06 17:44:07 -05:00
017fc81caf

Prepend check_enabled_deletion to Settings::DeletesController (#229) David Yip 2017-12-06 16:19:43 -06:00
9302369aa5 fix weblate for ja (#5906) nightpool 2017-12-06 17:08:22 -05:00
f1cbea77a4

Merge remote-tracking branch 'personal/merge/tootsuite/master' into gs-master David Yip 2017-12-06 15:40:59 -06:00
21e28a5caa

Merge pull request #238 from ncls7615/config-locales-ja beatrix 2017-12-06 16:24:16 -05:00
fde91988ab

Update ja.yml NCLS 2017-12-07 06:10:15 +09:00
8ca91cef45 Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master Jenkins 2017-12-06 20:17:13 +00:00
a0047fdca0 i18n: 🇵🇱 (#5903) Marcin Mikołajczak 2017-12-06 21:04:35 +01:00
a20509b41e Fix list editor modal on narrow devices (#5904) Lynx Kotoura 2017-12-07 03:48:48 +09:00
281c577cf8 Fix extra space between status text and username (#5902) Lynx Kotoura 2017-12-07 01:53:25 +09:00
f9a0d8f2b9

Bump version to 2.1.0rc1 (#5834) Eugen Rochko 2017-12-06 16:13:32 +01:00
4de211b80a Break out nested relationship API keys (#5887) aschmitz 2017-12-06 09:10:54 -06:00
063a1c2a8b Fix emoji picker scrollbar (regression from #5046) (#5901) Yamagishi Kazutoshi 2017-12-06 20:18:27 +09:00
a9ca5ce920 Handle submit event of new list form (#5895) Yamagishi Kazutoshi 2017-12-06 20:18:10 +09:00
d7a17b5e8b Search only from followees (#5897) Yamagishi Kazutoshi 2017-12-06 19:44:23 +09:00
34e2a06de0 Update Yarn to version 1.3.2 (#5900) Yamagishi Kazutoshi 2017-12-06 19:42:51 +09:00
4c1a02fa73 Yarn install from Debian package repository (#5899) Yamagishi Kazutoshi 2017-12-06 19:42:30 +09:00
b21db9bbde Using double splat operator (#5859) Yamagishi Kazutoshi 2017-12-06 19:41:57 +09:00
42bcbd36b7 Remove rabl dependency (#5894) Eugen Rochko 2017-12-06 07:04:49 +01:00
0393a64a90 Update Japanese translations. (#5893) mayaeh 2017-12-06 11:22:11 +09:00
d68868ca14

Lists redis clean-up (#5886) Eugen Rochko 2017-12-05 23:20:27 +01:00
e20895f251

Add list of lists component to web UI (#5811) Eugen Rochko 2017-12-05 23:02:27 +01:00
12cea76634 Update Chinese (Simplified) translations for version 2.1.0rc1 (#5849) SerCom_KC 2017-12-05 23:46:04 +08:00
b4bc594c5a Add aria-autocomplete='list' in Textaria (#5889) Neetshin 2017-12-05 16:02:00 +05:30
5bed0f10ed Various fixes kibigo! 2017-12-04 21:54:36 -08:00
a807e3b71b

current_theme -> current_flavour (#229) David Yip 2017-12-04 11:35:35 -06:00
d9800a5647

Merge branch 'gs-master' into glitch-theme David Yip 2017-12-04 11:07:01 -06:00
f2f2f10320 Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master Jenkins 2017-12-04 12:17:13 +00:00
82884ac5c4 Update mutes.js (#5882) Neetshin 2017-12-04 17:22:14 +05:30
1c74ede69e Fixed a name + localizations kibigo! 2017-12-04 00:19:39 -08:00
7c75702d05 Fixed image require kibigo! 2017-12-03 23:52:13 -08:00
bc4fa6b198 Rename themes -> flavours ? ? kibigo! 2017-12-03 23:26:40 -08:00
d216547382 Fixed typos kibigo! 2017-12-03 22:30:45 -08:00
757f52ff2e Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master Jenkins 2017-12-03 21:17:13 +00:00
886829e96c Add keyboard shortcuts link to getting-started navigation (#5874) Lynx Kotoura 2017-12-04 05:29:51 +09:00
62a94ebed4 Add back button to keyboard shortcuts legend column (#5872) Lynx Kotoura 2017-12-04 05:29:41 +09:00
ac17309faf Update dependencies for Node.js (2017-12-03) (#5876) Yamagishi Kazutoshi 2017-12-04 00:55:53 +09:00
dd23ae031f Update dependencies for Ruby (2017-12-03) (#5878) Yamagishi Kazutoshi 2017-12-04 00:55:27 +09:00
933eafdcd3 Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master Jenkins 2017-12-02 14:17:11 +00:00
51f2eca887 Add Japanese translations for invite filter. (#5869) mayaeh 2017-12-02 23:09:56 +09:00
bdf6d0a684 Remove redundant import statement in SCSS (#5864) cormo 2017-12-02 08:42:20 +09:00
b15482ce71 i18n: 🇵🇱 (#5865) Marcin Mikołajczak 2017-12-01 19:19:30 +01:00
74320971e2 Add invite filter (#5862) Yamagishi Kazutoshi 2017-12-02 00:40:02 +09:00
eee3b32b77 Fix invites form path (#5861) Yamagishi Kazutoshi 2017-12-01 20:26:57 +09:00
df03042a6e Allow admin to deactivate invite created by users (#5860) Yamagishi Kazutoshi 2017-12-01 20:26:19 +09:00
541fe9b110 Skins support kibigo! 2017-11-30 19:29:47 -08:00
9927df83ad Update Japanese translations for KeyboardShortcuts. (#5858) mayaeh 2017-12-01 09:35:47 +09:00
ad46bc9772 Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master Jenkins 2017-11-30 03:17:12 +00:00
4c6b5dbe96

Add semi-support for Video/Image objects in ActivityPub (#5848) Eugen Rochko 2017-11-30 04:06:20 +01:00
85e97ecab6

Fix too many forwards (#5854) Eugen Rochko 2017-11-30 03:50:05 +01:00
dc1ebd45a3 add index on stream_entries table (#5793) takayamaki 2017-11-30 11:35:54 +09:00
d020ed1e05 Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master Jenkins 2017-11-29 22:17:13 +00:00