luna/mastodon
0
0
Fork 0
mirror of https://github.com/lunaisnotaboy/mastodon.git synced 2024-11-07 07:28:16 +00:00
Code Issues Projects Releases Wiki Activity
5507 commits 1 branch 0 tags 248 MiB
Commit graph

5507 commits

This branch
This branch
All branches
Author SHA1 Message Date
cwm b535f24fe5 Use const instead of let for constant (tootsuite pr #6106) 2018-01-09 10:35:36 -06:00
cwm 0d4dcb5fb2 change key to path in timeline settings containers 2018-01-09 09:58:40 -06:00
cwm 6d1c325167 Rename key to path in actions and reducers for settings (tootsuite pr #6105) 2018-01-09 09:48:14 -06:00
cwm 7f4374d97d Fix newlines-to-spaces functionality (tootsuite pr #6158) 2018-01-09 08:52:14 -06:00
cwm 8a0e4bb9a4 Hide moved account's follow button in search result (tootsuite pr #5913) 2018-01-09 08:50:55 -06:00
cwm 5963630c63 Prevent duplicate load of favourites (tootsuite pr #5931) 2018-01-09 08:46:35 -06:00
David Yip ce7f4aef16
Merge remote-tracking branch 'personal/merge/tootsuite/master' into gs-master 2018-01-08 23:20:39 -06:00
David Yip ec0bdd6c1a
Merge pull request #312 from glitch-soc/tag-sensitive-imgs 
Show SENSITIVE tag on sensitive images (#267)
 2018-01-08 23:19:14 -06:00
David Yip df04da098a
Merge pull request #311 from glitch-soc/dont-show-solo-skins 
Don't show skins selector when there's only one (#256)
 2018-01-08 23:18:30 -06:00
Jenkins 7c719c567c Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master 2018-01-09 05:17:13 +00:00
David Yip 488381ae2f
Merge pull request #310 from glitch-soc/fix-thread-inheritance 
Threads now inherit privacy directly (#309)
 2018-01-08 23:15:58 -06:00
kibigo! 60433d03f5 Add missing comma 2018-01-08 18:38:28 -08:00
kibigo! 5d2ef7a616 Show SENSITIVE tag on sensitive images (#267) 2018-01-08 18:25:29 -08:00
kibigo! 44792de49a Don't show skins selector when there's only one (#256) 2018-01-08 16:45:32 -08:00
kibigo! 824a790e63 Threads now inherit privacy directly (#309) 2018-01-08 16:35:01 -08:00
puckipedia 628358aeea Add the author of a status to cc if reblogged (#6226) 
This makes slightly more sense, and ensures that the author of a post is always referenced in the audience (which some servers might rely on). And the announce is POSTed to the author's inbox anyways.
 2018-01-09 00:47:43 +01:00
nightpool c235711ffe Refactor /api/web APIs to use the centralized axios instance (#6223) 
Also adds the ability to decouple the centralized axios logic from the
state dispatcher
 2018-01-08 20:01:33 +01:00
Eugen Rochko ff6ca8bdc6
Bump version to 2.1.3 2018-01-08 19:15:31 +01:00
beatrix 90e568413b
Merge pull request #308 from KnzkDev/fix/list-editor 
Fix list editor design
 2018-01-08 13:08:11 -05:00
ncls7615 ef0b7d1e76
fix list editor scss 2018-01-09 02:50:24 +09:00
David Yip 65986b6f0b
Merge remote-tracking branch 'personal/merge/tootsuite/master' into gs-master 2018-01-08 09:48:42 -06:00
David Yip 2dc4fbbd1a
When pulling out max_toot_chars, handle nulls 
flavours/glitch/util/initial_state is used in places where we want to
exhibit different behavior based on user preferences.  This means that
it's used in places where no preference is defined, i.e. on an
unauthenticated access.  All values exported from that module must
therefore expect that case; previously, the max chars value didn't.

Addresses #306.
 2018-01-08 09:45:59 -06:00
Jenkins f839ac694c Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master 2018-01-08 10:17:15 +00:00
Eugen Rochko dbda87c31f
Revert #5772 (#6221) 2018-01-08 10:57:52 +01:00
Jenkins 722b3f567f Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master 2018-01-08 04:17:11 +00:00
Eugen Rochko e4a241abef
Fix bad URL schemes being accepted (#6219) 
* Fix actors accepting invalid URI schemes or different host between URI and URL

* Fix statuses accepting invalid URI scheme or different host to actor

* Adjust tests to new requirements

* Improve readability of mismatching_origin?/invalid_origin? methods
 2018-01-08 05:00:23 +01:00
Eugen Rochko 93555182c3
Do not display elephant friend in single-column layout (#6222) 2018-01-08 03:50:53 +01:00
puckipedia 0eff42d688 Move Article from supported to converted types (#6218) 2018-01-08 00:21:14 +01:00
David Yip f7c4d4464b
Merge remote-tracking branch 'personal/merge/tootsuite/master' into gs-master 2018-01-07 13:30:52 -06:00
David Yip 70c99a9f34
Use error pack when rendering error pages. Fixes #305. 2018-01-07 13:30:17 -06:00
Jenkins c2e1bfd9ae Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master 2018-01-07 15:17:13 +00:00
Yamagishi Kazutoshi 1d92b90be9 Fix force_ssl conditional (#6201) 2018-01-07 15:19:23 +01:00
Yamagishi Kazutoshi da809f9eec Fix unintended cache (#6214) 2018-01-07 15:12:59 +01:00
SerCom_KC c4d36d024c Update Simplified Chinese translations (#6215) 
* i18n: (zh-CN) Add translations of #6125

* i18n: (zh-CN) Add translations of #6132

* i18n: (zh-CN) Add translations of #6099

* i18n: (zh-CN) Add translations of #6071

* i18n: (zh-CN) Improve translations
 2018-01-07 17:32:50 +09:00
David Yip 5083311d64
Merge remote-tracking branch 'ykzts/fix-unintended-cache' into gs-master 2018-01-07 00:32:24 -06:00
Yamagishi Kazutoshi 2af307bce4 Fix unintended cache 2018-01-07 14:59:12 +09:00
Jenkins bcbdd4f88d Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master 2018-01-07 02:17:10 +00:00
Jeong Arm 9e97fbf0af Translate Korean (#6212) 2018-01-07 11:13:42 +09:00
kibigo! b5874c1428 Fixes to search dropdown 2018-01-06 15:34:01 -08:00
beatrix 61ef8d643e
fix typo in vanilla names.yml 2018-01-06 16:49:53 -05:00
Ondřej Hruška 9f29fd31ba
fixed ctrl enter 2018-01-06 19:58:04 +01:00
Ondřej Hruška 53caab0c0b
Fix the always-threaded bug 2018-01-06 19:55:53 +01:00
beatrix-bitrot b75a1ce326 tighten csp 2018-01-06 18:49:03 +00:00
beatrix d442cfa65c
Merge pull request #303 from KnzkDev/ja-for-thread-mode 
Update ja.js for #296
 2018-01-06 12:06:17 -05:00
ncls7615 f5a4201ad8
Update ja.js 2018-01-07 01:51:49 +09:00
beatrix a251c42192
Merge pull request #296 from glitch-soc/thread-mode 
Threaded mode~
 2018-01-06 11:28:36 -05:00
beatrix 2ec9a75a1d
Merge pull request #302 from KnzkDev/fix/search-popout 
Fix search popout
 2018-01-06 11:25:59 -05:00
beatrix fa92e88fb2
appease eslint 2018-01-06 10:30:49 -05:00
ncls7615 da98c33161
Fix search popout 2018-01-06 21:50:11 +09:00
David Yip 2eed4ace11
Read max_toot_chars from root object. Fixes #297. 
max_toot_chars is present in the root of the initial state object.
(Previously, we were trying to read it from the meta child object.)
 2018-01-06 03:01:11 -06:00