622c8fdb75
Merge pull request #314 from chriswmartin/merge-vanilla-updates-2
...
Merge vanilla updates into glitch - round 2
2018-01-09 17:01:23 -06:00
991371af5f
Merge remote-tracking branch 'origin/master' into merge-upstream
...
Conflicts:
db/schema.rb
2018-01-09 14:16:45 -06:00
35b84985a8
Skip ActivityPub Announces of non-public objects ( #6230 )
...
* Skip ActivityPub Announces of non-public objects
* Skip OStatus reblogs of non-public statuses
2018-01-09 19:35:10 +01:00
d41f0b66cc
Fix #6204 : Use content warning for page title when present ( #6231 )
2018-01-09 19:34:58 +01:00
aef4b1af66
Refactor /api/web APIs to use the centralized axios instance (tootsuite pr #6223 )
2018-01-09 10:51:14 -06:00
f43c2f12f3
Fix overflowing audit logs (tootsuite pr #6184 )
2018-01-09 10:40:14 -06:00
9bdbe66316
Set background to the navigation of Getting Started column (tootsuite pr #6163 )
2018-01-09 10:37:27 -06:00
b535f24fe5
Use const instead of let for constant (tootsuite pr #6106 )
2018-01-09 10:35:36 -06:00
0d4dcb5fb2
change key to path in timeline settings containers
2018-01-09 09:58:40 -06:00
6d1c325167
Rename key to path in actions and reducers for settings (tootsuite pr #6105 )
2018-01-09 09:48:14 -06:00
7f4374d97d
Fix newlines-to-spaces functionality (tootsuite pr #6158 )
2018-01-09 08:52:14 -06:00
8a0e4bb9a4
Hide moved account's follow button in search result (tootsuite pr #5913 )
2018-01-09 08:50:55 -06:00
5963630c63
Prevent duplicate load of favourites (tootsuite pr #5931 )
2018-01-09 08:46:35 -06:00
e780d5951b
Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master
2018-01-09 12:17:16 +00:00
9f04b0d4b1
Weblate translations ( #6228 )
...
* Translated using Weblate (Catalan)
Currently translated at 100.0% (257 of 257 strings)
Translation: Mastodon/React
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/ca/
* Translated using Weblate (Dutch)
Currently translated at 100.0% (257 of 257 strings)
Translation: Mastodon/React
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/nl/
* Translated using Weblate (Portuguese (Brazil))
Currently translated at 100.0% (257 of 257 strings)
Translation: Mastodon/React
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/pt_BR/
* Translated using Weblate (Portuguese (Brazil))
Currently translated at 99.6% (523 of 525 strings)
Translation: Mastodon/Backend
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/pt_BR/
* Translated using Weblate (Dutch)
Currently translated at 100.0% (525 of 525 strings)
Translation: Mastodon/Backend
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/nl/
* Translated using Weblate (Arabic)
Currently translated at 80.3% (45 of 56 strings)
Translation: Mastodon/Preferences
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/simple_form/ar/
* Translated using Weblate (Arabic)
Currently translated at 83.9% (47 of 56 strings)
Translation: Mastodon/Preferences
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/simple_form/ar/
* Translated using Weblate (Persian)
Currently translated at 87.6% (460 of 525 strings)
Translation: Mastodon/Backend
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/fa/
* Translated using Weblate (Japanese)
Currently translated at 100.0% (56 of 56 strings)
Translation: Mastodon/Preferences
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/simple_form/ja/
* Translated using Weblate (Japanese)
Currently translated at 100.0% (257 of 257 strings)
Translation: Mastodon/React
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/ja/
* Translated using Weblate (Portuguese)
Currently translated at 100.0% (56 of 56 strings)
Translation: Mastodon/Preferences
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/simple_form/pt/
* Translated using Weblate (Portuguese)
Currently translated at 100.0% (56 of 56 strings)
Translation: Mastodon/Preferences
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/simple_form/pt/
* Translated using Weblate (Portuguese)
Currently translated at 100.0% (257 of 257 strings)
Translation: Mastodon/React
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/pt/
* Translated using Weblate (Catalan)
Currently translated at 99.2% (521 of 525 strings)
Translation: Mastodon/Backend
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/ca/
* Translated using Weblate (Portuguese)
Currently translated at 100.0% (75 of 75 strings)
Translation: Mastodon/Doorkeeper
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/doorkeeper/pt/
* Translated using Weblate (Portuguese)
Currently translated at 100.0% (75 of 75 strings)
Translation: Mastodon/Doorkeeper
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/doorkeeper/pt/
* Translated using Weblate (Portuguese)
Currently translated at 47.2% (248 of 525 strings)
Translation: Mastodon/Backend
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/pt/
* Translated using Weblate (Portuguese)
Currently translated at 48.0% (252 of 525 strings)
Translation: Mastodon/Backend
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/pt/
* Translated using Weblate (Persian)
Currently translated at 100.0% (56 of 56 strings)
Translation: Mastodon/Preferences
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/simple_form/fa/
* Translated using Weblate (Dutch)
Currently translated at 100.0% (525 of 525 strings)
Translation: Mastodon/Backend
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/nl/
* Translated using Weblate (Japanese)
Currently translated at 99.0% (520 of 525 strings)
Translation: Mastodon/Backend
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/ja/
* Translated using Weblate (Persian)
Currently translated at 90.4% (475 of 525 strings)
Translation: Mastodon/Backend
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/fa/
* Translated using Weblate (Polish)
Currently translated at 99.8% (524 of 525 strings)
Translation: Mastodon/Backend
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/pl/
* Translated using Weblate (Dutch)
Currently translated at 100.0% (257 of 257 strings)
Translation: Mastodon/React
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/nl/
* Translated using Weblate (Polish)
Currently translated at 100.0% (257 of 257 strings)
Translation: Mastodon/React
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/pl/
* Translated using Weblate (Persian)
Currently translated at 100.0% (257 of 257 strings)
Translation: Mastodon/React
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/fa/
* Translated using Weblate (Persian)
Currently translated at 100.0% (56 of 56 strings)
Translation: Mastodon/Preferences
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/simple_form/fa/
* Translated using Weblate (Polish)
Currently translated at 99.8% (524 of 525 strings)
Translation: Mastodon/Backend
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/pl/
* Translated using Weblate (Persian)
Currently translated at 99.8% (524 of 525 strings)
Translation: Mastodon/Backend
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/fa/
* Translated using Weblate (Portuguese)
Currently translated at 48.3% (254 of 525 strings)
Translation: Mastodon/Backend
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/pt/
* Translated using Weblate (Portuguese)
Currently translated at 100.0% (56 of 56 strings)
Translation: Mastodon/Preferences
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/simple_form/pt/
* Translated using Weblate (Portuguese)
Currently translated at 56.5% (297 of 525 strings)
Translation: Mastodon/Backend
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/pt/
* Translated using Weblate (Portuguese)
Currently translated at 59.4% (312 of 525 strings)
Translation: Mastodon/Backend
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/pt/
* Translated using Weblate (Dutch)
Currently translated at 100.0% (257 of 257 strings)
Translation: Mastodon/React
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/nl/
* Translated using Weblate (Dutch)
Currently translated at 100.0% (75 of 75 strings)
Translation: Mastodon/Doorkeeper
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/doorkeeper/nl/
* Translated using Weblate (Arabic)
Currently translated at 91.0% (51 of 56 strings)
Translation: Mastodon/Preferences
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/simple_form/ar/
* Translated using Weblate (Portuguese)
Currently translated at 59.6% (313 of 525 strings)
Translation: Mastodon/Backend
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/pt/
* Translated using Weblate (Arabic)
Currently translated at 100.0% (257 of 257 strings)
Translation: Mastodon/React
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/ar/
* Translated using Weblate (Japanese)
Currently translated at 99.6% (523 of 525 strings)
Translation: Mastodon/Backend
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/ja/
* Translated using Weblate (Portuguese)
Currently translated at 67.6% (355 of 525 strings)
Translation: Mastodon/Backend
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/pt/
* Translated using Weblate (Arabic)
Currently translated at 98.2% (55 of 56 strings)
Translation: Mastodon/Preferences
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/simple_form/ar/
* Translated using Weblate (Portuguese)
Currently translated at 100.0% (56 of 56 strings)
Translation: Mastodon/Preferences
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/simple_form/pt/
* Translated using Weblate (Arabic)
Currently translated at 100.0% (56 of 56 strings)
Translation: Mastodon/Preferences
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/simple_form/ar/
* Translated using Weblate (Arabic)
Currently translated at 100.0% (257 of 257 strings)
Translation: Mastodon/React
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/ar/
* Translated using Weblate (Galician)
Currently translated at 100.0% (257 of 257 strings)
Translation: Mastodon/React
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/gl/
* Translated using Weblate (Arabic)
Currently translated at 51.1% (22 of 43 strings)
Translation: Mastodon/Devise
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/devise/ar/
* Translated using Weblate (Galician)
Currently translated at 100.0% (75 of 75 strings)
Translation: Mastodon/Doorkeeper
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/doorkeeper/gl/
* Added translation using Weblate (Galician)
* Added translation using Weblate (Galician)
* Translated using Weblate (Galician)
Currently translated at 50.0% (1 of 2 strings)
Translation: Mastodon/Activerecord
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/activerecord/gl/
* Translated using Weblate (Galician)
Currently translated at 100.0% (43 of 43 strings)
Translation: Mastodon/Devise
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/devise/gl/
* Added translation using Weblate (Galician)
* Translated using Weblate (Galician)
Currently translated at 24.0% (126 of 525 strings)
Translation: Mastodon/Backend
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/gl/
* Added translation using Weblate (Portuguese)
* Translated using Weblate (Arabic)
Currently translated at 55.2% (290 of 525 strings)
Translation: Mastodon/Backend
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/ar/
* Translated using Weblate (Galician)
Currently translated at 42.6% (224 of 525 strings)
Translation: Mastodon/Backend
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/gl/
* Translated using Weblate (Portuguese)
Currently translated at 80.9% (425 of 525 strings)
Translation: Mastodon/Backend
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/pt/
* Translated using Weblate (Arabic)
Currently translated at 100.0% (257 of 257 strings)
Translation: Mastodon/React
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/ar/
* Translated using Weblate (Portuguese)
Currently translated at 100.0% (257 of 257 strings)
Translation: Mastodon/React
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/pt/
* Translated using Weblate (Arabic)
Currently translated at 62.7% (27 of 43 strings)
Translation: Mastodon/Devise
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/devise/ar/
* Translated using Weblate (Portuguese)
Currently translated at 100.0% (75 of 75 strings)
Translation: Mastodon/Doorkeeper
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/doorkeeper/pt/
* Translated using Weblate (Portuguese)
Currently translated at 100.0% (56 of 56 strings)
Translation: Mastodon/Preferences
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/simple_form/pt/
* Translated using Weblate (Arabic)
Currently translated at 100.0% (56 of 56 strings)
Translation: Mastodon/Preferences
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/simple_form/ar/
* Translated using Weblate (Portuguese)
Currently translated at 100.0% (2 of 2 strings)
Translation: Mastodon/Activerecord
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/activerecord/pt/
* Translated using Weblate (Portuguese)
Currently translated at 81.3% (427 of 525 strings)
Translation: Mastodon/Backend
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/pt/
* Translated using Weblate (Galician)
Currently translated at 100.0% (2 of 2 strings)
Translation: Mastodon/Activerecord
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/activerecord/gl/
* Translated using Weblate (Galician)
Currently translated at 99.8% (524 of 525 strings)
Translation: Mastodon/Backend
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/gl/
* Translated using Weblate (Portuguese)
Currently translated at 93.7% (492 of 525 strings)
Translation: Mastodon/Backend
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/pt/
* Translated using Weblate (Portuguese)
Currently translated at 95.4% (501 of 525 strings)
Translation: Mastodon/Backend
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/pt/
* Translated using Weblate (Dutch)
Currently translated at 100.0% (525 of 525 strings)
Translation: Mastodon/Backend
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/nl/
* Translated using Weblate (Galician)
Currently translated at 99.8% (524 of 525 strings)
Translation: Mastodon/Backend
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/gl/
* Translated using Weblate (Galician)
Currently translated at 100.0% (257 of 257 strings)
Translation: Mastodon/React
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/gl/
* Translated using Weblate (Dutch)
Currently translated at 100.0% (257 of 257 strings)
Translation: Mastodon/React
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/nl/
* Translated using Weblate (Dutch)
Currently translated at 100.0% (525 of 525 strings)
Translation: Mastodon/Backend
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/nl/
* Translated using Weblate (Portuguese)
Currently translated at 96.0% (504 of 525 strings)
Translation: Mastodon/Backend
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/pt/
* Translated using Weblate (Dutch)
Currently translated at 100.0% (257 of 257 strings)
Translation: Mastodon/React
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/nl/
* Translated using Weblate (Arabic)
Currently translated at 69.7% (30 of 43 strings)
Translation: Mastodon/Devise
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/devise/ar/
* Translated using Weblate (Portuguese)
Currently translated at 97.9% (514 of 525 strings)
Translation: Mastodon/Backend
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/pt/
* Translated using Weblate (Portuguese (Brazil))
Currently translated at 99.6% (523 of 525 strings)
Translation: Mastodon/Backend
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/pt_BR/
* Normalize translations
Ran i18n-tasks normalize && yarn manage:translations
* Add back simple_forms removed by weblate
Weblate for some reason removed this files, add back to their previous
versions
* Remove linebreak on doorkeeper.pt.yml
PR review
2018-01-09 20:30:28 +09:00
ce7f4aef16
Merge remote-tracking branch 'personal/merge/tootsuite/master' into gs-master
2018-01-08 23:20:39 -06:00
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
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
7c719c567c
Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master
2018-01-09 05:17:13 +00:00
60433d03f5
Add missing comma
2018-01-08 18:38:28 -08:00
5d2ef7a616
Show SENSITIVE tag on sensitive images ( #267 )
2018-01-08 18:25:29 -08:00
44792de49a
Don't show skins selector when there's only one ( #256 )
2018-01-08 16:45:32 -08:00
824a790e63
Threads now inherit privacy directly ( #309 )
2018-01-08 16:35:01 -08:00
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
fe6663ef50
Minor style fixes
2018-01-08 11:49:08 -08:00
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
ef0b7d1e76
fix list editor scss
2018-01-09 02:50:24 +09:00
65986b6f0b
Merge remote-tracking branch 'personal/merge/tootsuite/master' into gs-master
2018-01-08 09:48:42 -06:00
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
f839ac694c
Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master
2018-01-08 10:17:15 +00:00
dbda87c31f
Revert #5772 ( #6221 )
2018-01-08 10:57:52 +01:00
722b3f567f
Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master
2018-01-08 04:17:11 +00:00
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
93555182c3
Do not display elephant friend in single-column layout ( #6222 )
2018-01-08 03:50:53 +01:00
0eff42d688
Move Article from supported to converted types ( #6218 )
2018-01-08 00:21:14 +01:00
f7c4d4464b
Merge remote-tracking branch 'personal/merge/tootsuite/master' into gs-master
2018-01-07 13:30:52 -06:00
70c99a9f34
Use error pack when rendering error pages. Fixes #305 .
2018-01-07 13:30:17 -06:00
c2e1bfd9ae
Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master
2018-01-07 15:17:13 +00:00
1d92b90be9
Fix force_ssl conditional ( #6201 )
2018-01-07 15:19:23 +01:00
da809f9eec
Fix unintended cache ( #6214 )
2018-01-07 15:12:59 +01:00
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
5083311d64
Merge remote-tracking branch 'ykzts/fix-unintended-cache' into gs-master
2018-01-07 00:32:24 -06:00
2af307bce4
Fix unintended cache
2018-01-07 14:59:12 +09:00
56312df73b
Z indexes and colors
2018-01-06 18:38:19 -08:00
7a93acd803
To 2.1.2
2018-01-06 18:25:19 -08:00
bcbdd4f88d
Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master
2018-01-07 02:17:10 +00:00
9e97fbf0af
Translate Korean ( #6212 )
2018-01-07 11:13:42 +09:00
b5874c1428
Fixes to search dropdown
2018-01-06 15:34:01 -08:00
61ef8d643e
fix typo in vanilla names.yml
2018-01-06 16:49:53 -05:00
9f29fd31ba
fixed ctrl enter
2018-01-06 19:58:04 +01:00
53caab0c0b
Fix the always-threaded bug
2018-01-06 19:55:53 +01:00
f5a4201ad8
Update ja.js
2018-01-07 01:51:49 +09:00
a251c42192
Merge pull request #296 from glitch-soc/thread-mode
...
Threaded mode~
2018-01-06 11:28:36 -05:00
2ec9a75a1d
Merge pull request #302 from KnzkDev/fix/search-popout
...
Fix search popout
2018-01-06 11:25:59 -05:00
fa92e88fb2
appease eslint
2018-01-06 10:30:49 -05:00
da98c33161
Fix search popout
2018-01-06 21:50:11 +09:00
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
c71d848855
my global .gitignore excluded this file ;_;
2018-01-05 21:40:02 -08:00
e4bc013d6f
Threaded mode~
2018-01-05 21:16:43 -08:00
6932b464e6
Fixed improper dropdown func binding for #293 + toot button spacing
2018-01-05 21:02:53 -08:00
ad10a80a99
Styling and autosuggest fixes for #293
2018-01-05 20:43:16 -08:00
8bf9d9362a
Fixes composer mounting issue with #293
2018-01-05 18:30:06 -08:00
077f2e600c
Win95 to 2.1
2018-01-05 16:22:58 -08:00
39c0b6ceb3
Updates and fixes to win95 theme
2018-01-05 16:22:58 -08:00
ed574fbc09
Theme: Windows 95
2018-01-05 16:22:58 -08:00
03aeab857f
Merge remote-tracking branch 'personal/merge/tootsuite/master' into gs-master
2018-01-05 17:31:56 -06:00
f441770e50
Merge pull request #290 from chriswmartin/web-push-updates
...
Web push updates
2018-01-05 18:29:57 -05:00
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
faf20eeaa4
Merge pull request #293 from glitch-soc/compose-refactor
...
Compose refactor
2018-01-05 18:29:08 -05:00
f6adb409fd
Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master
2018-01-05 22:17:12 +00:00
10f6793fd0
Fix PuSH workers ( #6200 )
2018-01-05 23:04:35 +01:00
a594139115
When fetching an ActivityPub-enabled status, do not re-request it as text/html ( #6196 )
2018-01-05 22:42:50 +01:00
95bd85d9e8
Represent numbers by strings in instance activity API ( #6198 )
...
Fixes #6197 .
2018-01-05 22:38:33 +01:00
ac686d5a5d
Fixed overflow issue
2018-01-05 13:34:21 -08:00
ec620ae486
Styling fixes
2018-01-05 12:41:15 -08:00
f41b33eb01
Merge pull request #243 from m4sk1n/glitch-pl
...
i18n: 🇵🇱
2018-01-05 12:36:53 -05:00
9fc08e4861
add key to lists div
2018-01-05 09:00:48 -06:00
6236577734
change how list ColumnLink keys are determined
2018-01-05 08:12:34 -06:00
06636c6eca
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
d7ce339c2e
WIP <Compose> Refactor; Fin~
2018-01-04 21:17:30 -08:00
9a61b0ef22
Fix RFC 5646 Regular Expression ( #6190 )
2018-01-05 04:43:50 +01:00
42f50049ff
WIP <Compose> Refactor; 1000 tiny edits
2018-01-04 18:33:13 -08:00
b4a3792201
WIP <Compose> Refactor; <ActionsModal>; dropdowns
2018-01-04 18:31:00 -08:00
083170bec7
WIP <Compose> Refactor; SCSS ed.
2018-01-04 18:23:46 -08:00
8713659dff
WIP <Compose> Refactor; <OnboardingModal> ed.
2018-01-04 18:21:59 -08:00
3c29f57404
WIP <Compose> Refactor; <Drawer> ed.
2018-01-04 18:21:59 -08:00
924ffe81d4
WIPgit status <Compose> Refactor; <Composer> ed.
2018-01-04 18:21:59 -08:00
c69a23ae46
Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master
2018-01-04 23:17:11 +00:00
d872902997
Small translation fixes for Serbian (and sr@Latn too) ( #6188 )
2018-01-05 00:16:06 +01:00
5ec25ff3e1
Fix email confirmation link not updating email ( #6187 )
...
A change introduced in #6125 prevents
`Devise::Models::Confirmable#confirm` from being called for existing
users, which in turn leads to `email` not being set to
`unconfirmed_email`, breaking email updates. This also adds a test
that would've caught this issue.
2018-01-05 00:15:35 +01:00
49e296e1b0
Fix overflowing audit logs ( #6184 )
2018-01-04 19:38:46 +01:00
3b016342c6
Fix accessibility of column headers
...
As a screen reader user new to Mastodon, I encountered the following issues with the column headers as designed:
* Jumping between them was difficult. FOr instance, passing my home timeline to reach notification settings was difficult to impossible, especially considering infinite scrolling.
* There doesn't appear to be any means for triggering the control via the keyboard. the `titleClick` handler only responds to mouse clicks.
* I didn't even realize there was a Settings toggle until I made this change.
Thanks for using ARIA in your designs. It's a huge help. But adding a `button` role doesn't add keyboard handling and other button behavior. Also, because the role was on the heading container, it obscured the controls within the container itself. This fix resolve that. It also exposes the headings as headings rather than buttons, enabling skipping columns by using screen readers' heading navigation commands.
Since I myself am blind, if this fix requires additional visual styling, I'd like help applying that so it can be merged. I'd consider it an essential accessibility fix for my and other blind users' existence on the platform. Thanks!
2018-01-04 10:25:26 -06:00
3c18964256
Fallback default thumbnail in instance status API ( #6177 )
2018-01-04 15:36:55 +01:00
0f69a90588
i18n: Update Polish translation
...
Signed-off-by: Marcin Mikołajczak <me@m4sk.in>
2018-01-04 14:42:58 +01:00
02ba03d6db
Send one Delete of Actor in ActivityPub when account is suspended ( #6172 )
2018-01-04 14:40:49 +01:00
3bee0996c5
Make sure private toots remain private and do not end up in HTTP caches ( #6175 )
2018-01-04 14:39:38 +01:00
89daeb43a8
Improve Traditional Chinese translation ( #6166 )
...
* Improve Traditional Chinese translations
* Sort alphabetically
2018-01-04 05:00:50 +01:00
7d4f4f9aab
Fix FetchAtomService not finding alternatives if there's a Link header ( #6170 )
...
without them, such as is the case with GNU social
Fixes the ability to find GNU social accounts via URL in search and
when using remote follow function
2018-01-04 04:56:04 +01:00
256c2b1de0
Rearrange items in Getting Started navigation ( #6126 )
...
Though the subsections are representing features such as navigation and
settings, they are categorized by the ways how they are implemented
(internal navigation or external links.) They are irrelevant and some
arrangements were confusing because of that. (It is nonsense that instance
information is in settings subsection, for example.)
This fixes the issue by rearranging.
2018-01-04 10:56:54 +09:00
02e3e1ec09
Fix nil error in log_target_from_history helper ( #6173 )
2018-01-04 10:56:23 +09:00
c10f4bdb03
Cache JSON of immutable ActivityPub representations ( #6171 )
2018-01-04 01:21:38 +01:00
fc884d015a
Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master
2018-01-03 20:17:13 +00:00
d907d4352e
l10n OC language ( #6169 )
...
* new strings: hashtag+unlisted, mute, block
* Add confirmation step for email changes
* Add more instance stats APIs
2018-01-03 21:05:54 +01:00
a8b51124ba
Don't normalize URLs in toots ( #6134 )
...
* Don't normalize URLs in toots
URL normalization is ill-defined and may cause certain links to break.
* Change specs since we are not normalizing user-provided URLs
2018-01-03 20:51:33 +01:00
161c72d66d
Allow to dereference Follow object for ActivityPub ( #5772 )
...
* Allow to dereference Follow object for ActivityPub
* Accept IRI as object representation for Accept activity
2018-01-03 18:08:57 +01:00
53d99ebf4f
i18n: Update Polish translation ( #6168 )
...
Signed-off-by: Marcin Mikołajczak <me@m4sk.in>
2018-01-03 22:45:24 +09:00
1001922156
Add Japanese translations #5997 , #6003 , #6004 , #6071 , #6099 , #6125 and #6132 ( #6167 )
...
* yarn manage:translations
* Add Japanese translation for #5997
* Add Japanese translation for #6003
* Add Japanese translation for #6004
* Add Japanese translation for #6071
* Add Japanese translation for #6099
* Add Japanese translation for #6125
* Add Japanese translation for #6132
2018-01-03 21:00:39 +09:00
933840bebf
Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master
2018-01-03 04:17:11 +00:00
99f962ba73
Allow HTTP caching of json view of public statuses ( #6115 )
...
* Allow HTTP caching of json view of public statuses
HTML views are not cached as they can contain private statuses as well
* Disable session cookies for ActivityPub json rendering of public toots
2018-01-03 04:57:57 +01:00
2471796d75
Set background to the navigation of Getting Started column ( #6163 )
...
The background of the navigation matters because its scrollbar is
transparent.
2018-01-03 04:39:14 +01:00
545095b3ce
[!] Sanitize incoming classlist properly ( #6162 )
...
* Sanitize classlist properly
* Actually properly sanitize every class after the first
* Improve Formatter spec to check for multiple classes and non-space whitespace
2018-01-03 03:54:08 +01:00
d319b3dbe4
Update moved-to property when it's removed too ( #6160 )
...
* Fix #6140 - Update moved-to property when it's removed too
* Remove trailing whitespace
2018-01-03 00:38:20 +01:00
d60fd87e01
Don't leave behind husk of remotely-deleted profile ( #6159 )
...
There's no reason for an Account record to persist after Delete->Actor is received. SuspendAccountService is necessary to make sure deleted toots get sent over streaming API properly and home feeds get cleaned up. By removing Account record, we can ensure that if in the future the account is restored remotely (or username reused), it can start with a clean slate.
2018-01-03 00:38:02 +01:00
94230fe565
Fix newlines-to-spaces functionality ( #6158 )
...
yay for regexes, amirite
2018-01-02 19:35:24 +01:00
04ecf44c2f
Add confirmation step for email changes ( #6071 )
...
* Add confirmation step for email changes
This adds a confirmation step for email changes of existing users.
Like the initial account confirmation, a confirmation link is sent
to the new address.
Additionally, a notification is sent to the existing address when
the change is initiated. This message includes instruction to reset
the password immediately or to contact the instance admin if the
change was not initiated by the account owner.
Fixes #3871
* Add review fixes
2018-01-02 16:55:00 +01:00
b6af88192f
Display a warning when composing unlisted toots with something looking like a hashtag ( #6132 )
2018-01-02 14:24:52 +01:00
1419f656e2
Fix stats expiring too quickly because of variable mistake ( #6155 )
2018-01-02 14:02:53 +01:00
3ba7cde38d
Rename key to path in actions and reducers for settings ( #6105 )
2018-01-02 13:50:54 +01:00
ce854ed506
delete X-UA-Compatible ( #6068 )
...
* delete X-UA-Compatible
* undo
* restore
2018-01-02 13:38:12 +01:00
21b9da6418
Adding Serbian latin translations ( #6146 )
...
Serbian latin (sr-Latn) is generated automatically from Serbian (sr) translation. Also changed some wording in original (Serbian) translation.
2018-01-02 20:39:12 +09:00
fa768abf5c
More ../ -> ~.
2018-01-02 00:26:44 -06:00
54148b9a4a
Merge remote-tracking branch 'origin/master' into merge-upstream
...
Conflicts:
app/controllers/authorize_follows_controller.rb
app/javascript/styles/mastodon/components.scss
2018-01-02 00:11:41 -06:00
764f876953
Use const instead of let for constant ( #6106 )
2018-01-02 13:28:49 +09:00
2c1ed5f872
Show mastodon on modal ( #6129 )
2018-01-02 05:07:56 +01:00
72b99f6ee4
bug fix (tootsuite pr #6120 )
2017-12-31 08:26:50 -06:00
fa9b7ece2e
Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master
2017-12-31 09:17:15 +00:00
7d376e41be
Adding Serbian translation ( #6133 )
...
* Adding Serbian translation
* i18n-tasks normalize
2017-12-31 17:28:20 +09:00
d817c0a958
Merge pull request #291 from glitch-soc/merge-upstream
...
Merge with upstream @ f4b80e6511
2017-12-30 18:24:38 -06:00
4cca1d1e7e
Merge remote-tracking branch 'origin/master' into merge-upstream
...
Conflicts:
app/controllers/auth/confirmations_controller.rb
2017-12-30 17:20:07 -06:00
e4944d065b
Switch to tootsuite's elephant friend for the drawer
...
This version has a transparent background, which works better with the
wave.
2017-12-30 17:17:37 -06:00
513d982f29
Use ~ notation in components for image references
...
This uses (more or less) absolute references to external assets, which
allows imported stylesheets (like components.scss) to work from other
locations that may not have the expected path structure (e.g. the win95
theme).
2017-12-30 17:15:20 -06:00
4ce44ba470
remove unused 'saveSettings' from column_settings_container
2017-12-30 16:42:26 -06:00
0dce26b82b
web push updates (tootsuite PRs #5879 , #5941 , #6047 )
2017-12-30 11:45:01 -06:00
f4b80e6511
Translate Korean ( #6131 )
...
Relates to #6125 , #6099
2017-12-30 02:44:19 +01:00
a56c4742d3
keep the same filters and page when doing custom emojo stuff ( fixes #6112 ) ( #6114 )
2017-12-30 02:43:43 +01:00
38fc1b498d
Add more instance stats APIs ( #6125 )
...
* Add GET /api/v1/instance/peers API to reveal known domains
* Add GET /api/v1/instance/activity API
* Make new APIs disableable, exclude private statuses from activity stats
* Fix code style issue
* Fix week timestamps
2017-12-29 19:52:04 +01:00
511c6f9625
bug fix (WebPush does not work) ( #6120 )
2017-12-28 16:20:34 +01:00
832a93e67c
Fix GIF avatars not autoplaying ( fixes #287 , tootsuite pr #6000 )
2017-12-28 08:30:51 -06:00
868568d1c1
Make host_meta/webfinger replies cacheable ( fixes #6100 ) ( #6101 )
...
* Make host_meta/webfinger replies cacheable (fixes #6100 )
Drop common code for handling users and sessions as webfinger queries
are very basic, public APIs.
Also explicitly mark results as cacheable with “expires_in”.
* Add “Vary: Accept” header for caching since content-negociation is used
2017-12-27 18:21:12 +01:00
7174d1c955
Merge remote-tracking branch 'origin/master' into merge-upstream
...
Conflicts:
app/javascript/images/mastodon-drawer.png
app/javascript/styles/mastodon/components.scss
2017-12-26 22:24:19 -06:00
65f30f65a2
Move the mastodon on Getting Started column to drawer column ( #6109 )
...
Getting Started column obtained many links, and it became much taller.
Because of its height, Getting Started column required long scrolling on
devices with small screen, such as 4 inch phones and 10 inch laptops.
This change moves the mastodon which took large space on the column to
drawer column. The drawer column has only the compose form and has more
space.
2017-12-27 03:31:30 +01:00
e0ef7f9d79
Fix XML oEmbed support discovery ( #6104 )
2017-12-27 03:29:49 +01:00
7347bc7334
Merge pull request #286 from chriswmartin/merge-vanilla-updates-into-glitch
...
Merge various small vanilla updates into glitch
2017-12-26 17:03:29 -05:00
20ad071931
Set direction style to reply indicator (tootsuite pr #6006 )
2017-12-26 14:20:41 -06:00
14243bf80a
Reduce motion for boost animation (tootsuite pr #5871 )
2017-12-26 14:04:52 -06:00
337c2e77ee
Fix layout for RTL (tootsuite pr #6014 , #6018 )
2017-12-26 13:49:53 -06:00
46565ed746
Fix focused background color of favourited direct toot (tootsuite pr #6021 )
2017-12-26 13:30:23 -06:00
815524412b
Move dropdown transform origin (tootsuite pr #6091 )
2017-12-26 13:28:19 -06:00
083571915f
onMuteNotifications validation (tootsuite pr #6092 )
2017-12-26 13:25:43 -06:00
2bbd22e91c
Rename settingKey to settingPath (tootsuite pr #6046 & #6098 )
2017-12-26 13:21:20 -06:00
cc6a2ffd0a
use 'flavours/glitch/' prefix in new imports
2017-12-26 10:41:44 -06:00
22818d2a16
Add mute, block, conversation mute actions to detailed status dropdown menu
2017-12-26 10:13:38 -06:00
bed13f22e2
Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master
2017-12-25 20:17:10 +00:00
1e5d1fa5c8
Add mute, block, conversation mute actions to detailed status dropdown menu ( #6099 )
...
* removed references to hideOnMobile in column_link and getting_started
* add mute, block, conversationMute actions to detailed status dropdown (fixes #1226 )
* remove unused withDismiss in detailed status
2017-12-25 20:56:05 +01:00
a3b369337f
Additional prop name change. ( #6098 )
2017-12-26 00:14:06 +09:00
f77c47d01b
Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master
2017-12-24 15:17:12 +00:00
7e6214b869
Add validation for onMuteNotifications ( #6092 )
...
* Add aria-autocomplete='list' in Textaria
ref: https://www.w3.org/TR/wai-aria-1.1/#aria-autocomplete
* Make detect empty string brefore assign upload description
* Change code elements in keyboard-shortcuts component to kbd
* Add validation for onMuteNotifications
2017-12-24 17:18:45 +09:00
a8eb0bf44f
Reduce motion for boost animation ( #5871 )
...
* Reduce motion for boost animation
Fixes #5833
* Fix ternary expression
2017-12-24 04:48:31 +01:00
35fdf561be
Refactor web_push_subscription ( #6047 )
...
* Remove onSave method in mapped properties for column_settings
* Make web_push_subscription.register an action
2017-12-24 04:47:35 +01:00
081956742c
removed references to hideOnMobile in column_link and getting_started ( #6082 )
...
* removed references to hideOnMobile in column_link and getting_started
* move keyboard shortcuts back below blocked users
2017-12-24 04:47:02 +01:00
8528fd89d2
Move dropdown transform origin to top edge ( #6091 )
2017-12-24 00:53:03 +01:00
6d00ca1c71
Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master
2017-12-22 04:17:14 +00:00
fb57ec41df
Update and add some translate
2017-12-22 12:22:41 +09:00
4694dcfe16
Add more en and ja
2017-12-22 12:11:28 +09:00
02db8aa3a0
Add en and ja
2017-12-22 12:01:38 +09:00
cea98e0c12
Reduce the number of synchronous resolves when posting toots ( #6075 )
2017-12-22 02:15:08 +01:00
6eb60260b1
Display deleted users' role as “Suspended” ( #6080 )
...
Deleted users are technically suspended, but the code displaying their status
in the admin interface was broken and displayed a javascript object holding
translations of the possible user roles instead.
2017-12-22 02:14:17 +01:00
60d415bc5e
Merge pull request #266 from chriswmartin/getting-started-improvements
...
Getting started column improvements
2017-12-21 18:47:07 -05:00
191b625a27
Fix account header avatar
2017-12-22 07:12:49 +09:00
7bb99ca3cf
Add data-status-by back to DetailedStatus component. Fixes #273 .
2017-12-21 13:22:33 -06:00
d736739e8f
<kbd> instead of <code> in KeyboardShortcuts component (tootsuite pr #6049 )
2017-12-21 13:04:40 -06:00
bc0152974f
Merge pull request #276 from glitch-soc/245-click-avatar-to-open-profile-in-new-tab
...
Wrap <Avatar> in account header in a link to that account's page (fixes #245 )
2017-12-21 08:30:22 -05:00
dbd5f8b9a5
Wrap <Avatar> in account header in a link to that account's page. Fixes #245 .
2017-12-21 05:25:16 -06:00
9042f9a813
add keyboard shortcuts to getting started ( fixes #275 )
2017-12-20 09:50:29 -06:00
bf1eb0912c
Set packs on 2FA-related pages. Fixes #271 .
...
Specifically, this commit:
- changes S::TFA::{Confirmations,RecoveryCodes}Controller to derive from
S::BaseController, because this gives us the necessary actions and
packs
- prepends set_pack to Auth::SessionsController's action chain so that
it takes effect in time for render :two_factor
2017-12-20 03:15:54 -06:00
6f11aa8383
Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master
2017-12-20 08:17:15 +00:00
81d29e4126
Rename settingKey in setting_toggle to settingPath ( #6046 )
2017-12-20 16:19:59 +09:00
c11a52d888
Replace <code> to <kbd> in KeyboardShortcuts component ( #6049 )
...
* Add aria-autocomplete='list' in Textaria
ref: https://www.w3.org/TR/wai-aria-1.1/#aria-autocomplete
* Make detect empty string brefore assign upload description
* Change code elements in keyboard-shortcuts component to kbd
2017-12-20 11:46:25 +09:00
e52293482e
Update Korean translation ( #6050 )
...
* Update Korean translation
* Translate Korean for javascript
* Add missing translations on simple_form
2017-12-20 11:45:50 +09:00
d3b2677775
Add en and ja
2017-12-19 20:16:48 +09:00
14aae9c05c
missed a semicolon
2017-12-17 22:21:15 -06:00
be50e45a74
use makeMapStateToProps
2017-12-17 22:00:25 -06:00
e4ebbf4f07
use list-ul icon in list header and web/lists
2017-12-17 21:25:18 -06:00
e7fa7fce25
Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master
2017-12-17 03:17:14 +00:00
f38e6a14f2
Add Slovak translation ( #6052 )
...
* Add Slovak translation
* Slovak translation: i18n-normalize
2017-12-17 11:26:42 +09:00
e202efdf8a
Merge pull request #253 from glitch-soc/prevent-local-only-federation
...
prevent federation of local-only statuses
2017-12-16 09:26:48 -05:00
9e8fa3caee
fix admin/action_logs page
2017-12-16 20:27:26 +09:00
e677dda07c
Fixes #244 to make search results scrollable
2017-12-15 12:49:23 -08:00
82b2e224a2
Merge branch 'gs-master' into prevent-local-only-federation
...
Conflicts:
db/schema.rb
2017-12-15 12:20:56 -06:00
e9a5bde9a0
Update ja.js
2017-12-15 19:43:10 +09:00
61ed5b972c
Update ja.js
2017-12-15 19:38:13 +09:00
37254c4f5d
Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master
2017-12-15 01:17:12 +00:00
3d3b403359
Do not hide statuses from silenced accounts from other silenced accounts ( #6030 )
2017-12-15 01:54:05 +01:00
25b0d7538e
Fix oEmbed image_modal src. ( #6027 )
2017-12-14 23:31:14 +01:00
a3b2ea599d
Fix #6022 - Prevent nested migrated accounts, or migrations to self ( #6026 )
2017-12-14 21:35:30 +01:00
573414f728
Improve Chinese (Simplified) Translations ( #6024 )
...
* i18n: (zh-CN) Change `工作人员` (staff) to `管理人员`
Suggested by @Gargron at https://github.com/tootsuite/mastodon/pull/6005#discussion_r156678109
* i18n: (zh-CN) Change `协管` to `监察员`
* i18n: (zh-CN) Fix all "Are you" questions
* i18n: (zh-CN) Various improvements
* i18n: (zh-CN) Final clean-up
* i18n: (zh-CN) Change translation for 500
* i18n: (zh-CN) Remove spaces between time distances
* i18n: (zh-CN) Improve translations
2017-12-14 19:33:29 +01:00
aa273a2718
Last minute Dutch string updates ( #6025 )
...
* Last minute Dutch strinfupdate
* Last minute Dutch strings update
* Fixing Weblate output errors
* Fixing Weblate output errors
* Fixing more Weblate rubish
Weblate is also changing some " to ' - I think that is not a problem
* Fixing more weblate stuff
* Fixing
* Update nl.yml
2017-12-14 18:45:32 +01:00
e35a350119
Examples for Status#set_locality and .as_tag_timeline.
...
This commit also:
- exposes the local-only emoji so that it can be used in examples
- allows local_only to be set explicitly, i.e. for timeline filtering
specs
2017-12-14 02:27:42 -06:00
e5a9831a56
Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master
2017-12-13 23:17:15 +00:00
0d3ffa691e
Fix focused background color of notifications of direct toots ( #6021 )
2017-12-14 07:36:29 +09:00
5ad45552b3
Fix overflowing emojis on some devices ( #6016 )
...
* Fix overflowing emojis on some devices
* Quit visible and add padding
2017-12-13 22:58:31 +01:00
dc313f27bb
1 fix + 1 translation ( #6019 )
2017-12-13 22:58:20 +01:00
10f800ab46
Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master
2017-12-13 20:17:13 +00:00
3487460f00
Fix regression from #6014 ( #6018 )
2017-12-13 20:33:04 +01:00
82236a3703
Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master
2017-12-13 18:17:16 +00:00
72314d26ae
l10n OC and FR updates ( #6017 )
...
* Adjust empty list timeline message (#5997 )
* Adjust empty list timeline message (#5997 )
* Add filters to admin UI for custom emojis (#6003 ) + #6004
* Update fr.yml
2017-12-14 03:17:04 +09:00
cc75d47926
Fix layout for RTL ( #6014 )
2017-12-13 18:28:13 +01:00
8bf4cc72b6
Excahnge the order of spoiler-input and unlocked warning ( #6015 )
...
* Excahnge the order of spoiler-input and unlocked warning
* Fix trailing whitespace
2017-12-13 18:01:56 +01:00
0aeec0390b
Redesign tootbox ( #5919 )
...
* Redesign tootbox
* Move counter into compose-form__buttons-wrapper
Change font and remove shadow
Refactor sass codes of compose-form
2017-12-13 17:37:23 +01:00
fef6625496
Weblate translations ( #6011 )
...
* Translated using Weblate (Dutch)
Currently translated at 100.0% (522 of 522 strings)
Translation: Mastodon/Backend
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/nl/
* Translated using Weblate (French)
Currently translated at 99.8% (521 of 522 strings)
Translation: Mastodon/Backend
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/fr/
* Translated using Weblate (Catalan)
Currently translated at 100.0% (257 of 257 strings)
Translation: Mastodon/React
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/ca/
* Translated using Weblate (Catalan)
Currently translated at 99.4% (519 of 522 strings)
Translation: Mastodon/Backend
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/ca/
* Translated using Weblate (Japanese)
Currently translated at 99.4% (519 of 522 strings)
Translation: Mastodon/Backend
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/ja/
* Translated using Weblate (Portuguese)
Currently translated at 100.0% (257 of 257 strings)
Translation: Mastodon/React
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/pt/
* Translated using Weblate (Dutch)
Currently translated at 100.0% (257 of 257 strings)
Translation: Mastodon/React
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/nl/
* Translated using Weblate (Galician)
Currently translated at 100.0% (257 of 257 strings)
Translation: Mastodon/React
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/gl/
* Translated using Weblate (Japanese)
Currently translated at 99.6% (520 of 522 strings)
Translation: Mastodon/Backend
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/ja/
* Translated using Weblate (Japanese)
Currently translated at 100.0% (56 of 56 strings)
Translation: Mastodon/Preferences
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/simple_form/ja/
* Translated using Weblate (Arabic)
Currently translated at 40.0% (209 of 522 strings)
Translation: Mastodon/Backend
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/ar/
* Translated using Weblate (Arabic)
Currently translated at 100.0% (257 of 257 strings)
Translation: Mastodon/React
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/ar/
* Translated using Weblate (Polish)
Currently translated at 99.8% (521 of 522 strings)
Translation: Mastodon/Backend
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/pl/
* Added translation using Weblate (Galician)
* Translated using Weblate (Portuguese (Brazil))
Currently translated at 99.0% (517 of 522 strings)
Translation: Mastodon/Backend
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/pt_BR/
* Translated using Weblate (Portuguese (Brazil))
Currently translated at 100.0% (257 of 257 strings)
Translation: Mastodon/React
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/pt_BR/
* Translated using Weblate (Galician)
Currently translated at 100.0% (56 of 56 strings)
Translation: Mastodon/Preferences
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/simple_form/gl/
* Added translation using Weblate (Galician)
* Translated using Weblate (Galician)
Currently translated at 100.0% (56 of 56 strings)
Translation: Mastodon/Preferences
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/simple_form/gl/
* Translated using Weblate (Galician)
Currently translated at 22.6% (17 of 75 strings)
Translation: Mastodon/Doorkeeper
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/doorkeeper/gl/
* Translated using Weblate (Portuguese)
Currently translated at 100.0% (257 of 257 strings)
Translation: Mastodon/React
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/pt/
* Translated using Weblate (Portuguese)
Currently translated at 66.0% (37 of 56 strings)
Translation: Mastodon/Preferences
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/simple_form/pt/
* Translated using Weblate (Japanese)
Currently translated at 99.6% (520 of 522 strings)
Translation: Mastodon/Backend
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/ja/
* Translated using Weblate (Japanese)
Currently translated at 100.0% (257 of 257 strings)
Translation: Mastodon/React
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/ja/
* Translated using Weblate (Japanese)
Currently translated at 100.0% (43 of 43 strings)
Translation: Mastodon/Devise
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/devise/ja/
* Translated using Weblate (Portuguese (Brazil))
Currently translated at 99.6% (520 of 522 strings)
Translation: Mastodon/Backend
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/pt_BR/
* Translated using Weblate (Portuguese (Brazil))
Currently translated at 100.0% (257 of 257 strings)
Translation: Mastodon/React
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/pt_BR/
* Translated using Weblate (Arabic)
Currently translated at 100.0% (257 of 257 strings)
Translation: Mastodon/React
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/ar/
* Translated using Weblate (Arabic)
Currently translated at 48.8% (21 of 43 strings)
Translation: Mastodon/Devise
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/devise/ar/
* Translated using Weblate (Arabic)
Currently translated at 98.2% (55 of 56 strings)
Translation: Mastodon/Preferences
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/simple_form/ar/
* Translated using Weblate (Portuguese)
Currently translated at 73.2% (41 of 56 strings)
Translation: Mastodon/Preferences
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/simple_form/pt/
* Translated using Weblate (Portuguese)
Currently translated at 100.0% (43 of 43 strings)
Translation: Mastodon/Devise
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/devise/pt/
* i18n-tasks normalize && yarn manage:translations
* Restore wrongfully deleted files
2017-12-13 16:37:15 +01:00
775c3056b6
Update Chinese (Simplified) translations ( #6005 )
...
* i18n: (zh-CN) Remove spaces in time distances
* i18n: (zh-CN) Update translations for #5997
* i18n: (zh-CN) Add translation for #6004
also change translation of `staff` from `管理员` to `工作人员`
* i18n: (zh-CN) Add translations for #6003
* i18n: (zh-CN) Normalization
2017-12-13 15:52:40 +01:00
ad75ec8b5b
Add filters to admin UI for custom emojis ( #6003 )
2017-12-13 13:28:31 +01:00
07b4427865
Set direction style to reply indicator ( #6006 )
2017-12-13 12:17:37 +01:00
a8deb6648b
Fix redundant HTTP request in FetchLinkCardService ( #6002 )
2017-12-13 12:15:28 +01:00
20a6584d2d
Clean up admin UI for accounts ( #6004 )
...
* Add staff filter to admin UI for accounts, remove obsolete columns
* Only display OStatus section in admin UI for accounts when OStatus data
2017-12-13 12:15:10 +01:00
155e211dd0
Fix GIF avatars not autoplaying when GIF autoplay is enabled ( #6000 )
2017-12-13 12:14:03 +01:00
17e53b931c
code style fixes
2017-12-12 23:07:12 -06:00
9719983f2d
move list items into an array, don't unnecessarily concat misc nav item
2017-12-12 22:50:20 -06:00
5706fe18c2
Fix #5952 - NameError (regression from #5762 ) ( #5999 )
...
* Fix #5952 - NameError (regression from #5762 )
* Fix
2017-12-13 04:12:38 +01:00
71965cbef2
Adjust empty list timeline message ( #5997 )
2017-12-13 02:40:32 +01:00
0128b86d30
Use streaming API for standalone timelines on /about and /tag pages ( #5998 )
2017-12-13 02:12:41 +01:00
0c8b1eb577
Make detect empty string before assign image description ( #5994 )
...
* Add aria-autocomplete='list' in Textaria
ref: https://www.w3.org/TR/wai-aria-1.1/#aria-autocomplete
* Make detect empty string brefore assign upload description
2017-12-12 19:57:22 +01:00
f9f6918148
Store preview image for embedded photo in preview cards ( #5986 )
...
The preview image would be useful to embed in timeline.
2017-12-12 15:54:38 +01:00
b6ded7119e
travis fixes
2017-12-12 08:50:31 -06:00
19257d91bf
Return false if object does not respond to url ( #5988 )
...
Avoid error when the service returns a mostly valid oembed, but has no
url in it, causing a MethodError: undefined method `url'
for #<OEmbed::Response::Photo:0x000056505def9620>
2017-12-12 15:12:09 +01:00
fe180f18ff
Change conditional to avoid nil into string error in sidekiq ( #5987 )
...
* Change conditional to avoid nil into string error in sidekiq
When obtaining information about users with mastodon in a different
subdomain, sidekiq was giving out a 'no implicit conversion of nil into String'
* Use presence instead of blank? with ternary.
Following suggestion on PR
2017-12-12 15:11:13 +01:00
504c3d650f
Merge pull request #264 from KnzkDev/add-ja
...
i18n: Add ja translate
2017-12-12 08:49:19 -05:00
a057ed5cfe
Merge remote-tracking branch 'tootsuite/master' into merge-upstream
2017-12-12 02:54:13 -06:00
9b7208f4b4
readded connect for onboarding modal
2017-12-12 00:17:07 -06:00
b358483ef2
remove unneeded imports from getting_started_misc
2017-12-12 00:09:18 -06:00
37ced4c903
add components to getting started column
2017-12-12 00:01:17 -06:00
b93ad3d0e8
add ja
2017-12-12 13:13:54 +09:00
14c4a33cd9
Change account_id non-nullable in lists ( #5979 )
2017-12-12 04:11:17 +01:00
30d2ea03b0
Improve public status page title ( #5985 )
2017-12-12 03:56:30 +01:00
1356ed72cd
Fix #5953 - Add GET /api/v1/accounts/:id/lists ( #5983 )
2017-12-12 03:55:39 +01:00
481fac7c84
Exclude moved accounts from search results ( #5984 )
2017-12-12 02:14:33 +01:00
0a52e37648
change pack to 'auth'
2017-12-11 18:14:41 -06:00
44992df257
load pack
2017-12-11 17:54:40 -06:00
2efffe77dc
reblog_service.rb: Status#local_only -> local_only?
2017-12-11 17:39:11 -06:00
c5a4eda694
move outbox filtering to Status#permitted_for (as per @ekiru)
2017-12-11 15:28:04 -06:00
3ec47e732b
post_status_service: stylistic change (local_only -> local_only?)
2017-12-11 15:27:31 -06:00
771b950feb
Merge pull request #254 from glitch-soc/new-theme-ux
...
New flavour/skin UX
2017-12-11 09:36:14 -05:00
feed07227b
Apply a 25x rate limit by IP even to authenticated requests ( #5948 )
2017-12-11 15:32:29 +01:00
0cd5f2a61f
Merge pull request #255 from KnzkDev/remove-picture
...
Remove getting-started picture
2017-12-11 09:08:13 -05:00
204688e803
Add missing set_pack def/filter in OAuth::AuthorizedApplicationsController.
2017-12-11 00:17:30 -06:00
9d5ecdbf41
remove picture
2017-12-11 13:52:17 +09:00
ed7231947c
Added styling
2017-12-10 20:32:28 -08:00
bdca1614d5
Screenshot support for themes
2017-12-10 20:32:28 -08:00
dabf66e676
Moved flavour UI into own prefs tab
2017-12-10 20:32:27 -08:00
08b0861b96
Merge pull request #250 from chriswmartin/fav-confirm-modal
...
add favourite confirmation modal
2017-12-10 23:10:19 -05:00
David Yip
Eugen Rochko
cwm
Jenkins
Renato "Lond" Cerqueira
kibigo!
puckipedia
Andrew
nightpool
ncls7615
Yamagishi Kazutoshi
SerCom_KC
Jeong Arm
beatrix
Ondřej Hruška
ThibG
TheKinrar
Quenty31
Branko Kokanovic
Patrick Figel
Lynx Kotoura
Nolan Darilek
Marcin Mikołajczak
muan
Akihiko Odaki
Noiob
Otakan
MitarashiDango
Chris
Neetshin
Nolan Lawson
cpsdqs
Peter
Naoki Kosaka
SerCom_KC
Jeroen
Olivier Humbert
Erin