75cbeb775f
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
f10ce3f003
Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master
2018-01-08 04:17:11 +00:00
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
b9375d92b3
Do not display elephant friend in single-column layout ( #6222 )
2018-01-08 03:50:53 +01:00
4ae7b4eb1e
Move Article from supported to converted types ( #6218 )
2018-01-08 00:21:14 +01:00
22286ee6cd
Merge remote-tracking branch 'personal/merge/tootsuite/master' into gs-master
2018-01-07 13:30:52 -06:00
9e5b431655
Use error pack when rendering error pages. Fixes #305 .
2018-01-07 13:30:17 -06:00
8704a190c0
Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master
2018-01-07 15:17:13 +00:00
c89bb8ae40
Fix force_ssl conditional ( #6201 )
2018-01-07 15:19:23 +01:00
63c17a66b8
Fix unintended cache ( #6214 )
2018-01-07 15:12:59 +01:00
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
a37e295901
Merge remote-tracking branch 'ykzts/fix-unintended-cache' into gs-master
2018-01-07 00:32:24 -06:00
4f24f54739
Fix unintended cache
2018-01-07 14:59:12 +09:00
17a472d50d
Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master
2018-01-07 02:17:10 +00:00
f8cd218003
Translate Korean ( #6212 )
2018-01-07 11:13:42 +09:00
a38bd57f8a
Fixes to search dropdown
2018-01-06 15:34:01 -08:00
cd8d0d7b85
fix typo in vanilla names.yml
2018-01-06 16:49:53 -05:00
07ea1aa6fe
fixed ctrl enter
2018-01-06 19:58:04 +01:00
568c9272ff
Fix the always-threaded bug
2018-01-06 19:55:53 +01:00
6a5b778bb8
tighten csp
2018-01-06 18:49:03 +00:00
3625fa1e9e
Merge pull request #303 from KnzkDev/ja-for-thread-mode
...
Update ja.js for #296
2018-01-06 12:06:17 -05:00
aa02511e1c
Update ja.js
2018-01-07 01:51:49 +09:00
ed5d06c7e7
Merge pull request #296 from glitch-soc/thread-mode
...
Threaded mode~
2018-01-06 11:28:36 -05:00
45487e8862
Merge pull request #302 from KnzkDev/fix/search-popout
...
Fix search popout
2018-01-06 11:25:59 -05:00
34b7208e3f
appease eslint
2018-01-06 10:30:49 -05:00
896830cc57
Fix search popout
2018-01-06 21:50:11 +09:00
2e3bb24ed6
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
25da6ed5c1
my global .gitignore excluded this file ;_;
2018-01-05 21:40:02 -08:00
e5a10a1fd3
Threaded mode~
2018-01-05 21:16:43 -08:00
85ffb07656
Fixed improper dropdown func binding for #293 + toot button spacing
2018-01-05 21:02:53 -08:00
77cb2d04f9
Styling and autosuggest fixes for #293
2018-01-05 20:43:16 -08:00
0e418264fb
Fixes composer mounting issue with #293
2018-01-05 18:30:06 -08:00
64fee6ca73
Merge remote-tracking branch 'personal/merge/tootsuite/master' into gs-master
2018-01-05 17:31:56 -06:00
5500346b79
Merge pull request #290 from chriswmartin/web-push-updates
...
Web push updates
2018-01-05 18:29:57 -05:00
3671d07f37
Merge pull request #295 from chriswmartin/getting-started-key-fix
...
unique ColumnLink keys in getting_started
2018-01-05 18:29:40 -05:00
f6ed878ee9
Merge pull request #293 from glitch-soc/compose-refactor
...
Compose refactor
2018-01-05 18:29:08 -05:00
86007e913d
Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master
2018-01-05 22:17:12 +00:00
0a8dd8fdd3
Fix PuSH workers ( #6200 )
2018-01-05 23:04:35 +01:00
090bd4d505
When fetching an ActivityPub-enabled status, do not re-request it as text/html ( #6196 )
2018-01-05 22:42:50 +01:00
3491c5e145
Represent numbers by strings in instance activity API ( #6198 )
...
Fixes #6197 .
2018-01-05 22:38:33 +01:00
3bc13de62f
Fix enforce HTTPS in production. ( #6180 )
2018-01-05 20:04:22 +01:00
06a32b2621
Merge pull request #243 from m4sk1n/glitch-pl
...
i18n: 🇵🇱
2018-01-05 12:36:53 -05:00
17034d36cf
add key to lists div
2018-01-05 09:00:48 -06:00
56429e7ca9
change how list ColumnLink keys are determined
2018-01-05 08:12:34 -06:00
cf9323449e
l10n Occitan language: mailer update ( #6193 )
...
* Create email_changed.oc.html.erb
* Create email_changed.oc.text.erb
* Update email_changed.oc.html.erb
* Update email_changed.oc.html.erb
* Create reconfirmation_instructions.oc.html.erb
* Create reconfirmation_instructions.oc.text.erb
* Update confirmation_instructions.oc.html.erb
* Update confirmation_instructions.oc.text.erb
* Update confirmation_instructions.oc.html.erb
* Update reconfirmation_instructions.oc.html.erb
* Update reconfirmation_instructions.oc.text.erb
* Update reconfirmation_instructions.oc.html.erb
2018-01-05 18:59:43 +09:00
55ead6a4b2
WIP <Compose> Refactor; Fin~
2018-01-04 21:17:30 -08:00
76268627c2
Bump version to 2.1.2
2018-01-05 04:52:06 +01:00
0fa691d2a9
Fix RFC 5646 Regular Expression ( #6190 )
2018-01-05 04:43:50 +01:00
7a9aaf28c4
WIP <Compose> Refactor; 1000 tiny edits
2018-01-04 18:33:13 -08:00
0cb97608c7
WIP <Compose> Refactor; <ActionsModal>; dropdowns
2018-01-04 18:31:00 -08:00
David Yip