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
Jenkins
7c719c567c
Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master
2018-01-09 05:17:13 +00: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!
824a790e63
Threads now inherit privacy directly ( #309 )
2018-01-08 16:35:01 -08: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
ncls7615
ef0b7d1e76
fix list editor scss
2018-01-09 02:50:24 +09: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
722b3f567f
Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master
2018-01-08 04:17:11 +00:00
Eugen Rochko
93555182c3
Do not display elephant friend in single-column layout ( #6222 )
2018-01-08 03:50:53 +01:00
Jenkins
c2e1bfd9ae
Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master
2018-01-07 15:17:13 +00: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
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
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
kibigo!
c71d848855
my global .gitignore excluded this file ;_;
2018-01-05 21:40:02 -08:00
kibigo!
e4bc013d6f
Threaded mode~
2018-01-05 21:16:43 -08:00
kibigo!
6932b464e6
Fixed improper dropdown func binding for #293 + toot button spacing
2018-01-05 21:02:53 -08:00
kibigo!
ad10a80a99
Styling and autosuggest fixes for #293
2018-01-05 20:43:16 -08:00
kibigo!
8bf9d9362a
Fixes composer mounting issue with #293
2018-01-05 18:30:06 -08:00
David Yip
03aeab857f
Merge remote-tracking branch 'personal/merge/tootsuite/master' into gs-master
2018-01-05 17:31:56 -06:00
beatrix
f441770e50
Merge pull request #290 from chriswmartin/web-push-updates
...
Web push updates
2018-01-05 18:29:57 -05:00
beatrix
b4e667f86b
Merge pull request #295 from chriswmartin/getting-started-key-fix
...
unique ColumnLink keys in getting_started
2018-01-05 18:29:40 -05:00
beatrix
faf20eeaa4
Merge pull request #293 from glitch-soc/compose-refactor
...
Compose refactor
2018-01-05 18:29:08 -05:00
Jenkins
f6adb409fd
Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master
2018-01-05 22:17:12 +00:00
beatrix
f41b33eb01
Merge pull request #243 from m4sk1n/glitch-pl
...
i18n: 🇵🇱
2018-01-05 12:36:53 -05:00
cwm
9fc08e4861
add key to lists div
2018-01-05 09:00:48 -06:00
cwm
6236577734
change how list ColumnLink keys are determined
2018-01-05 08:12:34 -06:00
kibigo!
d7ce339c2e
WIP <Compose> Refactor; Fin~
2018-01-04 21:17:30 -08:00
Yamagishi Kazutoshi
9a61b0ef22
Fix RFC 5646 Regular Expression ( #6190 )
2018-01-05 04:43:50 +01:00
kibigo!
42f50049ff
WIP <Compose> Refactor; 1000 tiny edits
2018-01-04 18:33:13 -08:00
kibigo!
b4a3792201
WIP <Compose> Refactor; <ActionsModal>; dropdowns
2018-01-04 18:31:00 -08:00
kibigo!
083170bec7
WIP <Compose> Refactor; SCSS ed.
2018-01-04 18:23:46 -08:00
kibigo!
8713659dff
WIP <Compose> Refactor; <OnboardingModal> ed.
2018-01-04 18:21:59 -08:00
kibigo!
3c29f57404
WIP <Compose> Refactor; <Drawer> ed.
2018-01-04 18:21:59 -08:00
kibigo!
924ffe81d4
WIPgit status <Compose> Refactor; <Composer> ed.
2018-01-04 18:21:59 -08:00
Jenkins
c69a23ae46
Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master
2018-01-04 23:17:11 +00:00
Branko Kokanovic
d872902997
Small translation fixes for Serbian (and sr@Latn too) ( #6188 )
2018-01-05 00:16:06 +01:00
Lynx Kotoura
49e296e1b0
Fix overflowing audit logs ( #6184 )
2018-01-04 19:38:46 +01:00
Marcin Mikołajczak
0f69a90588
i18n: Update Polish translation
...
Signed-off-by: Marcin Mikołajczak <me@m4sk.in>
2018-01-04 14:42:58 +01:00