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
1f469edac1
Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master
2018-01-08 10:17:15 +00:00
Jenkins
f839ac694c
Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master
2018-01-08 10:17:15 +00:00
Eugen Rochko
c8f0be1d6d
Revert #5772 ( #6221 )
2018-01-08 10:57:52 +01:00
Eugen Rochko
dbda87c31f
Revert #5772 ( #6221 )
2018-01-08 10:57:52 +01:00
Jenkins
f10ce3f003
Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master
2018-01-08 04:17:11 +00:00
Jenkins
722b3f567f
Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master
2018-01-08 04:17:11 +00:00
Eugen Rochko
d4e0d2563c
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
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
b9375d92b3
Do not display elephant friend in single-column layout ( #6222 )
2018-01-08 03:50:53 +01:00
Eugen Rochko
93555182c3
Do not display elephant friend in single-column layout ( #6222 )
2018-01-08 03:50:53 +01:00
puckipedia
4ae7b4eb1e
Move Article from supported to converted types ( #6218 )
2018-01-08 00:21:14 +01:00
puckipedia
0eff42d688
Move Article from supported to converted types ( #6218 )
2018-01-08 00:21:14 +01:00
David Yip
22286ee6cd
Merge remote-tracking branch 'personal/merge/tootsuite/master' into gs-master
2018-01-07 13:30:52 -06: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
9e5b431655
Use error pack when rendering error pages. Fixes #305 .
2018-01-07 13:30:17 -06:00
David Yip
70c99a9f34
Use error pack when rendering error pages. Fixes #305 .
2018-01-07 13:30:17 -06:00
Jenkins
8704a190c0
Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master
2018-01-07 15:17:13 +00:00
Jenkins
c2e1bfd9ae
Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master
2018-01-07 15:17:13 +00:00
Yamagishi Kazutoshi
c89bb8ae40
Fix force_ssl conditional ( #6201 )
2018-01-07 15:19:23 +01:00
Yamagishi Kazutoshi
1d92b90be9
Fix force_ssl conditional ( #6201 )
2018-01-07 15:19:23 +01:00
Yamagishi Kazutoshi
63c17a66b8
Fix unintended cache ( #6214 )
2018-01-07 15:12:59 +01:00
Yamagishi Kazutoshi
da809f9eec
Fix unintended cache ( #6214 )
2018-01-07 15:12:59 +01:00
SerCom_KC
154bd8db56
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
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
a37e295901
Merge remote-tracking branch 'ykzts/fix-unintended-cache' into gs-master
2018-01-07 00:32:24 -06: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
4f24f54739
Fix unintended cache
2018-01-07 14:59:12 +09:00
Yamagishi Kazutoshi
2af307bce4
Fix unintended cache
2018-01-07 14:59:12 +09:00
Andrew
b8127caea0
Z indexes and colors
2018-01-06 18:38:19 -08:00
Andrew
56312df73b
Z indexes and colors
2018-01-06 18:38:19 -08:00
Andrew
5fc9f535b5
To 2.1.2
2018-01-06 18:25:19 -08:00
Andrew
7a93acd803
To 2.1.2
2018-01-06 18:25:19 -08:00
Jenkins
17a472d50d
Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master
2018-01-07 02:17:10 +00:00
Jenkins
bcbdd4f88d
Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master
2018-01-07 02:17:10 +00:00
Jeong Arm
f8cd218003
Translate Korean ( #6212 )
2018-01-07 11:13:42 +09:00
Jeong Arm
9e97fbf0af
Translate Korean ( #6212 )
2018-01-07 11:13:42 +09:00
kibigo!
a38bd57f8a
Fixes to search dropdown
2018-01-06 15:34:01 -08:00
kibigo!
b5874c1428
Fixes to search dropdown
2018-01-06 15:34:01 -08:00
beatrix
cd8d0d7b85
fix typo in vanilla names.yml
2018-01-06 16:49:53 -05:00
beatrix
61ef8d643e
fix typo in vanilla names.yml
2018-01-06 16:49:53 -05:00
Ondřej Hruška
07ea1aa6fe
fixed ctrl enter
2018-01-06 19:58:04 +01:00
Ondřej Hruška
9f29fd31ba
fixed ctrl enter
2018-01-06 19:58:04 +01:00
Ondřej Hruška
568c9272ff
Fix the always-threaded bug
2018-01-06 19:55:53 +01:00
Ondřej Hruška
53caab0c0b
Fix the always-threaded bug
2018-01-06 19:55:53 +01:00
beatrix-bitrot
6a5b778bb8
tighten csp
2018-01-06 18:49:03 +00:00
beatrix-bitrot
b75a1ce326
tighten csp
2018-01-06 18:49:03 +00:00
beatrix
3625fa1e9e
Merge pull request #303 from KnzkDev/ja-for-thread-mode
...
Update ja.js for #296
2018-01-06 12:06:17 -05: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
aa02511e1c
Update ja.js
2018-01-07 01:51:49 +09:00
