Yamagishi Kazutoshi
c0fc4e9935
Remove unnecessary underline on accounts table ( #7728 )
2018-06-04 13:09:36 +02:00
David Yip
97d2df77aa
Add apply-to-mentions option to keyword mute UI. #454 .
2018-06-04 02:51:28 -05:00
David Yip
26573ad7e6
Thread scopes through #matches?. #454 .
...
Also add an apply_to_mentions attribute on Glitch::KeywordMute, which is
used to calculate scope. Next up: additions to the test suite to
demonstrate how scoping works.
2018-06-03 23:00:50 -05:00
Eugen Rochko
1bbe81030c
Display numbers in account header using shortNumberFormat for consistency ( #7723 )
2018-06-04 05:15:50 +02:00
Akihiko Odaki
5bf5003384
Do not mark remote status sensitive even if spoiler text is present ( #7395 )
...
Old statuses and statuses from Pawoo, which runs a modified version of
Mastodon, may not have been marked sensitive even if spoiler text is
present.
Such statuses are still not marked sensitve if they are local or
arrived before version upgrade. Marking recently fetched remote status
sensitive contradicts the behavior.
Considering what people expected when they authored such statuses, this
change removes the sensitivity enforcement.
2018-06-04 04:46:14 +02:00
Lynx Kotoura
73923ea6c4
Fix activity-stream-tabs colors and set text variables for text colors ( #7722 )
2018-06-04 04:39:42 +02:00
Eugen Rochko
e18390cfe6
Fix bug in order of conversations in web UI ( #7721 )
2018-06-04 04:19:16 +02:00
David Yip
c55263027a
Merge remote-tracking branch 'origin/master' into gs-master
2018-06-03 19:44:05 -05:00
Eugen Rochko
0deb9fa6b9
Remove trending hashtags ( #7711 )
...
* Delete trends_controller.rb
* Update routes.rb
* Update trending_tags.rb
* Update index.js
* Update index.js
* Update search_results.js
* Update async-components.js
* Update index.js
* Delete trends.js
* Delete trends.js
* Delete trends_container.js
* Delete trends.js
* Update search_results.js
* Update search_results_container.js
2018-06-04 02:18:18 +02:00
David Yip
37d495eeeb
keyword mute: Store keywords as a list
...
This has a couple of advantages over the regex approach:
- Keywords are individually addressable, which makes it easier to gather
statistics (#363 )
- Keywords can be individually applied to different feeds, e.g. skipping
mentions (#454 )
It *does* end up creating many more Regexp objects. I'm not yet sure if
the difference is significant.
2018-06-03 18:12:55 -05:00
David Yip
5dd2a78034
Merge pull request #528 from glitch-soc/merge-upstream
...
Merge with tootsuite/master
2018-06-03 03:01:09 -05:00
David Yip
8343f56b2c
Whoops, forgot to clean up a conflict.
2018-06-03 02:35:54 -05:00
David Yip
cfdbb36bdf
Merge pull request #519 from ThibG/glitch-soc/fixes/status-node-null
...
Prevent a rare crash when a status' root node is undefined
2018-06-02 16:19:06 -05:00
David Yip
3550470c18
Merge remote-tracking branch 'origin/master' into gs-master
...
Conflicts:
app/javascript/mastodon/locales/en.json
app/javascript/mastodon/locales/ja.json
app/javascript/mastodon/locales/pl.json
The above conflicts appear to be a text conflict introduced by
glitch-soc's additional level of columns (i.e. moving a bunch of columns
under the Misc option). They were resolved via accept-ours.
2018-06-02 16:15:36 -05:00
David Yip
a641d1b5b8
Merge remote-tracking branch 'personal/merge/tootsuite/master' into gs-master
2018-06-02 16:08:31 -05:00
Yamagishi Kazutoshi
89c86ee521
Weblate translations (2018-06-02) ( #7705 )
...
* Translated using Weblate (Korean)
Currently translated at 100.0% (303 of 303 strings)
Translation: Mastodon/React
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/ko/
* Translated using Weblate (Chinese (Hong Kong))
Currently translated at 99.6% (302 of 303 strings)
Translation: Mastodon/React
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/zh_Hant_HK/
* Translated using Weblate (Chinese (Hong Kong))
Currently translated at 99.1% (616 of 621 strings)
Translation: Mastodon/Backend
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/zh_Hant_HK/
* Translated using Weblate (Chinese (Hong Kong))
Currently translated at 100.0% (62 of 62 strings)
Translation: Mastodon/Devise
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/devise/zh_Hant_HK/
* Translated using Weblate (Slovenian)
Currently translated at 14.4% (90 of 621 strings)
Translation: Mastodon/Backend
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/sl/
* Translated using Weblate (Slovak)
Currently translated at 100.0% (303 of 303 strings)
Translation: Mastodon/React
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/sk/
* Translated using Weblate (Japanese)
Currently translated at 100.0% (303 of 303 strings)
Translation: Mastodon/React
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/ja/
* Translated using Weblate (Esperanto)
Currently translated at 100.0% (303 of 303 strings)
Translation: Mastodon/React
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/eo/
* Translated using Weblate (Dutch)
Currently translated at 100.0% (62 of 62 strings)
Translation: Mastodon/Devise
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/devise/nl/
* Translated using Weblate (Dutch)
Currently translated at 100.0% (621 of 621 strings)
Translation: Mastodon/Backend
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/nl/
* Translated using Weblate (Persian)
Currently translated at 100.0% (303 of 303 strings)
Translation: Mastodon/React
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/fa/
* Translated using Weblate (Occitan)
Currently translated at 100.0% (303 of 303 strings)
Translation: Mastodon/React
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/oc/
* Translated using Weblate (Occitan)
Currently translated at 100.0% (303 of 303 strings)
Translation: Mastodon/React
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/oc/
to check if with O or U
* Translated using Weblate (Occitan)
Currently translated at 98.0% (609 of 621 strings)
Translation: Mastodon/Backend
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/oc/
* Translated using Weblate (Dutch)
Currently translated at 100.0% (303 of 303 strings)
Translation: Mastodon/React
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/nl/
* Translated using Weblate (Basque)
Currently translated at 100.0% (621 of 621 strings)
Translation: Mastodon/Backend
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/eu/
* Translated using Weblate (Basque)
Currently translated at 100.0% (62 of 62 strings)
Translation: Mastodon/Devise
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/devise/eu/
* Translated using Weblate (Korean)
Currently translated at 100.0% (66 of 66 strings)
Translation: Mastodon/Preferences
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/simple_form/ko/
* Translated using Weblate (Korean)
Currently translated at 99.6% (619 of 621 strings)
Translation: Mastodon/Backend
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/ko/
* Translated using Weblate (Basque)
Currently translated at 100.0% (66 of 66 strings)
Translation: Mastodon/Preferences
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/simple_form/eu/
* Translated using Weblate (Basque)
Currently translated at 100.0% (303 of 303 strings)
Translation: Mastodon/React
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/eu/
* Translated using Weblate (Basque)
Currently translated at 100.0% (621 of 621 strings)
Translation: Mastodon/Backend
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/eu/
* Translated using Weblate (Portuguese (Brazil))
Currently translated at 99.6% (302 of 303 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% (619 of 621 strings)
Translation: Mastodon/Backend
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/pt_BR/
* Translated using Weblate (Basque)
Currently translated at 100.0% (76 of 76 strings)
Translation: Mastodon/Doorkeeper
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/doorkeeper/eu/
* i18n-tasks normalize && yarn manage:translations
2018-06-02 03:03:08 +02:00
Eugen Rochko
6e6c0e9613
Use different algorithm for trending tags ( #7697 )
2018-06-01 19:19:44 +02:00
Eugen Rochko
8d6e4e0485
Fix margin between compose warning, reply indicator and textarea ( #7701 )
2018-06-01 19:19:30 +02:00
Eugen Rochko
73c0c36e7b
Improve trends layout ( #7700 )
...
* Allow collapsing trends, responsively hide trends
* Add trends column
2018-06-01 19:18:37 +02:00
Yamagishi Kazutoshi
69b45350fe
Add loading indicator for trending tags ( #7693 )
2018-06-01 14:22:42 +02:00
Yamagishi Kazutoshi
bfa12239e8
Update ESLint for Code Climate ( #7696 )
...
* Update babel-eslint to version 8.2.3
* Update eslint to version 4.19.1
* Update eslint-plugin-promise to version 3.8.0
* Update eslint-plugin-react to version 7.8.2
* Upgrade eslint-plugin-jsx-a11y to version 6.0.3
* yarn test:lint --fix
2018-06-01 14:03:19 +02:00
Yamagishi Kazutoshi
15ce60f610
Fix duplicate key attributes ( #7694 )
2018-06-01 14:02:49 +02:00
David Yip
9ad5de8a3a
Merge pull request #501 from ThibG/glitch-soc/features/red-bookmarks
...
Make active bookmarks red (fixes #493 )
2018-06-01 00:36:48 -05:00
Spencer Alves
e5f25a73f2
Adjust spacing between status icons
2018-05-31 21:55:44 -07:00
Spencer Alves
7d2e6429c2
Merge branch 'glitch' into thread-icon
2018-05-31 21:33:16 -07:00
Eugen Rochko
1e938b966e
Exclude unlisted, private and direct toots from affecting trends ( #7686 )
2018-05-31 16:47:28 +02:00
Eugen Rochko
0ce5339a7b
Make the refresh trends button refresh trends ( #7685 )
2018-05-31 16:46:02 +02:00
Mélanie Chauvel (ariasuni)
691107263c
Put the CW field between the toot we are replying to and the toot field ( #7508 )
...
* Remove Collapsable and use CSS instead
* Put the CW field between the toot we are replying to and the toot field
* Use same spacing between all fields in the composing column
2018-05-31 15:16:31 +02:00
Thibaut Girka
b9fdeceb3c
Make active bookmarks red ( fixes #493 )
2018-05-31 14:39:48 +02:00
Thibaut Girka
cc396f085d
Use history.state to decide whether we should goBack() or go to / ( fixes #247 )
...
So far, glitch-soc used history.length to decide whether to call `goBack()` or
go to / in order to not leave the webUI. This made clicking the “Back” button
go to the “Getting started” column instead of going back in the browser's
history when such an action would leave the web UI, but also when:
- The WebUI is refreshed (F5)
- A tab is restored
- The history length reaches its maximum (e.g., 50 in Firefox)
This commit fixes these shortcomings by checking `window.history.state`.
Indeed, we only want to go back in the browser's history when the current
location has been reached from within the WebUI, which only happens via
`pushState` as far as I know. Since browser store the serialized state in
the browser history, this also survives page reload and session restoration.
2018-05-31 14:39:02 +02:00
Thibaut Girka
f86d280fd6
Use props.router instead of context.router, as we are using withRouter
2018-05-31 14:39:02 +02:00
Thibaut Girka
e8a9627f66
Hardcode default skin/theme in error layout ( fixes #373 )
...
This is a bit hackish. The best way would simply to somehow
use Mastodon's ApplicationController with `use_pack 'error'` from
the Rake task, but I'm not sure how to do that.
2018-05-31 14:38:48 +02:00
Thibaut Girka
893f2aff20
Prevent a rare crash when a status' root node is undefined
2018-05-31 14:38:29 +02:00
Thibaut Girka
e396fbfe3b
Fix direct timeline
2018-05-31 14:37:13 +02:00
Yamagishi Kazutoshi
648a22637c
Weblate translations (2018-05-31) ( #7681 )
...
* Translated using Weblate (Basque)
Currently translated at 100.0% (2 of 2 strings)
Translation: Mastodon/Activerecord
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/activerecord/eu/
* Translated using Weblate (Corsican)
Currently translated at 100.0% (76 of 76 strings)
Translation: Mastodon/Doorkeeper
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/doorkeeper/co/
* Translated using Weblate (Italian)
Currently translated at 100.0% (66 of 66 strings)
Translation: Mastodon/Preferences
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/simple_form/it/
* Translated using Weblate (Galician)
Currently translated at 100.0% (621 of 621 strings)
Translation: Mastodon/Backend
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/gl/
* Translated using Weblate (Basque)
Currently translated at 99.3% (297 of 299 strings)
Translation: Mastodon/React
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/eu/
* Translated using Weblate (Basque)
Currently translated at 55.2% (42 of 76 strings)
Translation: Mastodon/Doorkeeper
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/doorkeeper/eu/
* Translated using Weblate (Basque)
Currently translated at 8.5% (53 of 621 strings)
Translation: Mastodon/Backend
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/eu/
* Translated using Weblate (Basque)
Currently translated at 9.0% (56 of 621 strings)
Translation: Mastodon/Backend
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/eu/
* Translated using Weblate (Finnish)
Currently translated at 98.9% (296 of 299 strings)
Translation: Mastodon/React
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/fi/
* Translated using Weblate (Finnish)
Currently translated at 98.9% (296 of 299 strings)
Translation: Mastodon/React
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/fi/
* Translated using Weblate (Finnish)
Currently translated at 98.9% (296 of 299 strings)
Translation: Mastodon/React
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/fi/
* Translated using Weblate (Corsican)
Currently translated at 100.0% (66 of 66 strings)
Translation: Mastodon/Preferences
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/simple_form/co/
* Translated using Weblate (Corsican)
Currently translated at 99.6% (619 of 621 strings)
Translation: Mastodon/Backend
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/co/
* Translated using Weblate (Corsican)
Currently translated at 100.0% (299 of 299 strings)
Translation: Mastodon/React
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/co/
* Translated using Weblate (Corsican)
Currently translated at 100.0% (299 of 299 strings)
Translation: Mastodon/React
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/co/
* Translated using Weblate (Basque)
Currently translated at 41.3% (257 of 621 strings)
Translation: Mastodon/Backend
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/eu/
* Translated using Weblate (Basque)
Currently translated at 100.0% (299 of 299 strings)
Translation: Mastodon/React
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/eu/
* Translated using Weblate (Basque)
Currently translated at 100.0% (66 of 66 strings)
Translation: Mastodon/Preferences
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/simple_form/eu/
* Translated using Weblate (Basque)
Currently translated at 100.0% (62 of 62 strings)
Translation: Mastodon/Devise
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/devise/eu/
* Translated using Weblate (Basque)
Currently translated at 56.5% (43 of 76 strings)
Translation: Mastodon/Doorkeeper
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/doorkeeper/eu/
* Translated using Weblate (Arabic)
Currently translated at 90.8% (564 of 621 strings)
Translation: Mastodon/Backend
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/ar/
* Translated using Weblate (German)
Currently translated at 96.9% (64 of 66 strings)
Translation: Mastodon/Preferences
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/simple_form/de/
* Translated using Weblate (German)
Currently translated at 98.4% (65 of 66 strings)
Translation: Mastodon/Preferences
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/simple_form/de/
* Translated using Weblate (Basque)
Currently translated at 42.9% (267 of 621 strings)
Translation: Mastodon/Backend
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/eu/
* Translated using Weblate (Italian)
Currently translated at 100.0% (66 of 66 strings)
Translation: Mastodon/Preferences
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/simple_form/it/
* Translated using Weblate (Italian)
Currently translated at 100.0% (299 of 299 strings)
Translation: Mastodon/React
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/it/
* Translated using Weblate (Basque)
Currently translated at 71.0% (54 of 76 strings)
Translation: Mastodon/Doorkeeper
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/doorkeeper/eu/
* Translated using Weblate (Slovak)
Currently translated at 95.3% (592 of 621 strings)
Translation: Mastodon/Backend
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/sk/
* Translated using Weblate (Basque)
Currently translated at 43.8% (272 of 621 strings)
Translation: Mastodon/Backend
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/eu/
* Translated using Weblate (Japanese)
Currently translated at 100.0% (299 of 299 strings)
Translation: Mastodon/React
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/ja/
* Translated using Weblate (Basque)
Currently translated at 100.0% (76 of 76 strings)
Translation: Mastodon/Doorkeeper
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/doorkeeper/eu/
* Translated using Weblate (Basque)
Currently translated at 100.0% (76 of 76 strings)
Translation: Mastodon/Doorkeeper
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/doorkeeper/eu/
* Translated using Weblate (Basque)
Currently translated at 100.0% (66 of 66 strings)
Translation: Mastodon/Preferences
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/simple_form/eu/
* Translated using Weblate (Basque)
Currently translated at 100.0% (62 of 62 strings)
Translation: Mastodon/Devise
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/devise/eu/
* Translated using Weblate (Basque)
Currently translated at 100.0% (299 of 299 strings)
Translation: Mastodon/React
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/eu/
* Translated using Weblate (Basque)
Currently translated at 100.0% (621 of 621 strings)
Translation: Mastodon/Backend
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/eu/
* Translated using Weblate (Basque)
Currently translated at 100.0% (621 of 621 strings)
Translation: Mastodon/Backend
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/eu/
* Translated using Weblate (Basque)
Currently translated at 100.0% (621 of 621 strings)
Translation: Mastodon/Backend
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/eu/
* Translated using Weblate (Slovak)
Currently translated at 100.0% (66 of 66 strings)
Translation: Mastodon/Preferences
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/simple_form/sk/
* Translated using Weblate (Slovak)
Currently translated at 95.3% (592 of 621 strings)
Translation: Mastodon/Backend
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/sk/
* Translated using Weblate (Portuguese (Brazil))
Currently translated at 99.5% (618 of 621 strings)
Translation: Mastodon/Backend
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/pt_BR/
* Translated using Weblate (Portuguese)
Currently translated at 83.7% (520 of 621 strings)
Translation: Mastodon/Backend
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/pt/
* Translated using Weblate (Japanese)
Currently translated at 100.0% (299 of 299 strings)
Translation: Mastodon/React
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/ja/
* Translated using Weblate (Slovak)
Currently translated at 100.0% (299 of 299 strings)
Translation: Mastodon/React
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/sk/
* Translated using Weblate (Arabic)
Currently translated at 91.9% (571 of 621 strings)
Translation: Mastodon/Backend
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/ar/
* yarn manage:translations && i18n-tasks noramlize && i18n-tasks remove-unused
* remove body_html: ''
* Translated using Weblate (Galician)
Currently translated at 100.0% (299 of 299 strings)
Translation: Mastodon/React
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/gl/
* Translated using Weblate (Basque)
Currently translated at 100.0% (299 of 299 strings)
Translation: Mastodon/React
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/eu/
* yarn manage:translations
2018-05-31 13:00:40 +02:00
Marcin Mikołajczak
063d4d4ccc
🌍 : 🇵🇱 ⬆️ ( #7679 )
...
* 🌍 : 🇵🇱 ⬆️
Signed-off-by: Marcin Mikołajczak <me@m4sk.in>
* yarn manage:translations
2018-05-31 11:15:38 +09:00
Jenkins
165b5dc7f5
Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master
2018-05-31 01:17:25 +00:00
Eugen Rochko
ad40bf5e0c
Speed up some rake tasks by moving execution to Sidekiq ( #7678 )
...
* Speed up some rake tasks by moving execution to Sidekiq
mastodon:media:remove_silenced
mastodon:media:remove_remote
mastodon:media:redownload_avatars
mastodon:feeds:build
* Fix code style issue
2018-05-30 21:09:30 +02:00
Eugen Rochko
3623aea6c9
Redirect / to home on mobile layout, to getting started on desktop ( #7677 )
2018-05-30 18:42:06 +02:00
Eugen Rochko
1a7a74ff76
Improve getting started column ( #7676 )
...
* Adjust footer of getting started column
- Improved style
- Moved hotkeys, about this instance and logout to footer
- Removed FAQ, User Guide, Apps links
- Use hamburger icon for the column
* Add edit profile action button to profile and more to dropdown
* Add "Trending now" to getting started column
* Add preferences/security links on mobile layout
2018-05-30 18:41:47 +02:00
Eugen Rochko
a7d726c383
Improve counter caches on Status and Account ( #7644 )
...
Do not touch statuses_count on accounts table when mass-destroying
statuses to reduce load when removing accounts, same for
reblogs_count and favourites_count
Do not count statuses with direct visibility in statuses_count
Fix #828
2018-05-30 02:50:23 +02:00
Eugen Rochko
461542784b
Reduce wasted work in RemoveStatusService due to inactive followers ( #7672 )
2018-05-29 22:55:33 +02:00
Thibaut Girka
e7b3a4263e
[Glitch] Fix low-contrasted cancel button of reply indicator
...
Port 86efccce2a
2018-05-29 21:25:47 +02:00
Thibaut Girka
08dbe29e29
[Glitch] Improve load gap styling in web UI
...
Port 45c9f16f71
2018-05-29 21:25:28 +02:00
Thibaut Girka
cc589d6ec0
[Glitch] Use randomized setTimeout when fallback-polling and re-add since_id
...
Port dafd7afc5e
2018-05-29 21:25:28 +02:00
Thibaut Girka
fbc25bdd2d
[Glitch] Do not crash in getStatusIds when there is a gap in the timeline
...
Port b1938d7853
2018-05-29 21:25:28 +02:00
Thibaut Girka
5cc4d34250
[Glitch] Fix gap insertion for timeline disconnection
...
Port 66359ec522
2018-05-29 21:25:28 +02:00
Thibaut Girka
15bef77add
[Glitch] Fix ID duplication in timelines
...
Port 306267dbd2
2018-05-29 21:25:28 +02:00
Thibaut Girka
4b38ac3bed
[Glitch] Fix comparing id
...
Port 0ba49eca8b
2018-05-29 21:25:28 +02:00
Thibaut Girka
6020a21130
[Glitch] Fix LoadMore on account media gallery
...
Port 3523aa440b
2018-05-29 21:25:28 +02:00
Thibaut Girka
5d16fd3f28
[Glitch] Add missing null handling in notification reducer
...
Port 2f3ac14a43
2018-05-29 21:25:28 +02:00
Thibaut Girka
4eba8c50c3
[Glitch] Allow clients to fetch notifications made while they were offline
...
Port cbf97c03bb
2018-05-29 21:25:28 +02:00
Thibaut Girka
0ad3eedd4c
[Glitch] Allow clients to fetch statuses made while they were offline
...
Port 9a1a55ce52
2018-05-29 21:25:28 +02:00
unarist
7706ed038f
Fix context building in the reducer ( #7671 )
...
This fixes below bugs:
* addReply() had used native compare operator for string ids
=> descendants may appears at wrong position
* CONTEXT_FETCH_SUCCESS had added the focused status as the reply of the *first* status in ancestors, not last status.
=> descendants may also appears wrong position as well as correct position
* TIMELINE_UPDATE had added the status to replies of *itself* instead of replied status
=> browser will hangs if you open the status due to a circular reference
2018-05-29 17:42:29 +02:00
Thibaut Girka
532fb8e215
Fix error when unmuting a domain without listing muted domains first
2018-05-29 16:26:39 +02:00
ThibG
0345cd5a0f
Fix error when unmuting a domain without listing muted domains first ( #7670 )
2018-05-29 16:25:05 +02:00
Thibaut Girka
c087738270
Merge branch 'master' into glitch-soc/merge-upstream
2018-05-29 13:52:26 +02:00
abcang
90908fc24b
Fix N+1 on AtomSerializer ( #7669 )
2018-05-29 13:34:02 +02:00
Eugen Rochko
8bb74e50be
Add GET /api/v2/search which returns rich tag objects, adjust web UI ( #7661 )
2018-05-29 02:01:24 +02:00
Eugen Rochko
90b64c0069
Always display tab navigation on local/federated timeline even when empty ( #7663 )
...
Fix #7659
2018-05-29 02:01:04 +02:00
Eugen Rochko
e599d7caf2
Rescue Mastodon::DimensionsValidationError in Remoteable ( #7662 )
...
Fix #7660
2018-05-29 08:39:02 +09:00
Akihiko Odaki
d95642f6d9
Cache attachments on external host with service worker ( #7493 )
2018-05-29 00:43:47 +02:00
takayamaki
03f4c214b4
fix: Don't validate MX record in development ( #7654 )
2018-05-28 19:14:24 +02:00
Lynx Kotoura
c0355878ba
Fix embed, error and onboarding modals in light theme ( #7656 )
2018-05-28 19:13:20 +02:00
Eugen Rochko
04a2cf8bcc
Fix incomplete flex style on trends items ( #7655 )
2018-05-28 19:12:53 +02:00
tateisu
b87a1229c7
optimize direct timeline ( #7614 )
...
* optimize direct timeline
* fix typo in class name
* change filter condition for direct timeline
* fix codestyle issue
* revoke index_accounts_not_silenced because direct timeline does not use it.
* revoke index_accounts_not_silenced because direct timeline does not use it.
* fix rspec test condition.
* fix rspec test condition.
* fix rspec test condition.
* revoke adding column and partial index
* (direct timeline) move merging logic to model
* fix pagination parameter
* add method arguments that switches return array of status or cache_ids
* fix order by
* returns ActiveRecord.Relation in default behavor
* fix codestyle issue
2018-05-28 11:04:06 +02:00
Eugen Rochko
ab36e0ef72
Record trending tags from ActivityPub, too ( #7647 )
2018-05-28 12:21:04 +09:00
Eugen Rochko
dfbadd6837
Replace recursion in status mapStateToProps ( #7645 )
2018-05-28 02:42:06 +02:00
Eugen Rochko
9bd23dc4e5
Track trending tags ( #7638 )
...
* Track trending tags
- Half-life of 1 day
- Historical usage in daily buckets (last 7 days stored)
- GET /api/v1/trends
Fix #271
* Add trends to web UI
* Don't render compose form on search route, adjust search results header
* Disqualify tag from trends if it's in disallowed hashtags setting
* Count distinct accounts using tag, ignore silenced accounts
2018-05-27 21:45:30 +02:00
Thibaut Girka
8b98afa781
[Glitch] Replace onScrollToBottom with onLoadMore
...
Port b0664a5e6c
2018-05-27 20:40:58 +02:00
Thibaut Girka
a81ed7b205
Do not needlessly refresh pinned toots
...
Port missing part of 6ae70a92c9
2018-05-27 20:40:58 +02:00
Thibaut Girka
60addb14ce
[Glitch] Change icon for domain blocks
...
Port fa04945365
2018-05-27 20:40:58 +02:00
Thibaut Girka
b7508940b7
[Glitch] Add option to show only local toots in timeline preview
...
Port missing changes from 4e4f1b0dcb
2018-05-27 20:39:25 +02:00
Thibaut Girka
1fa3586db5
[Glitch] Use streaming API for standalone timelines on /about and /tag pages
...
Port 0128b86d30
2018-05-27 20:39:25 +02:00
Thibaut Girka
d959d04133
Change direct message warning to match upstream
2018-05-27 15:46:00 +02:00
Thibaut Girka
659b8a12ec
Merge branch 'master' into glitch-soc/merge-upstream
...
Conflicts:
config/locales/ca.yml
config/locales/nl.yml
config/locales/oc.yml
config/locales/pt-BR.yml
Resolved conflicts by removing upstream-specific changes
2018-05-27 13:20:15 +02:00
Thibaut Girka
c2e528916c
Implement client-size image resizing from upstream
2018-05-27 11:02:54 +02:00
Thibaut Girka
d253449ff0
Port upstream's result section headers ( fixes #366 )
2018-05-27 11:02:44 +02:00
Eugen Rochko
63c7b91572
Validate that e-mail resolves with MX and it's not blacklisted ( #7631 )
...
Original patch by @j-a4
2018-05-27 11:58:08 +09:00
Eugen Rochko
182bdbc5f4
Don't use Object.assign with Notification, only display actions for mentions ( #7632 )
...
Fix #7627
2018-05-27 11:55:19 +09:00
bsky
422f92f3f8
Fix lock icon position in account card ( #7630 )
2018-05-26 15:29:32 +02:00
Thibaut Girka
18d9a7fd71
Fix caret position after inserting suggestions ( fixes #281 )
2018-05-26 12:17:03 +02:00
Thibaut Girka
d8793e1bee
Remove unneeded code now that attachment URL isn't appended to toots
2018-05-26 12:17:03 +02:00
Lynx Kotoura
07054ee6f7
Add right margin of notification message ( #7628 )
2018-05-26 10:53:53 +02:00
Lynx Kotoura
a0b4754231
Fix color mistakes in mastodon-light theme ( #7626 )
...
* Fix colors of mastodon-light theme
Fix colors of modals and focused toots in light theme
Fix colors of compose-form items and more
Fix colors of status__content__spoiler-link:hover and $valid-value-color
Change success green color in light theme
* Fix some sass codes
* Add !default for explicit color valiables in default theme
for overwriting colors easier in the other themes
2018-05-26 10:53:44 +02:00
Yamagishi Kazutoshi
62cb3b199f
Weblate translations (2018-05-26) ( #7624 )
...
* Translated using Weblate (Esperanto)
Currently translated at 100.0% (76 of 76 strings)
Translation: Mastodon/Doorkeeper
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/doorkeeper/eo/
* Translated using Weblate (Occitan)
Currently translated at 100.0% (299 of 299 strings)
Translation: Mastodon/React
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/oc/
* Translated using Weblate (Galician)
Currently translated at 100.0% (621 of 621 strings)
Translation: Mastodon/Backend
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/gl/
* Translated using Weblate (Dutch)
Currently translated at 100.0% (621 of 621 strings)
Translation: Mastodon/Backend
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/nl/
* Translated using Weblate (Occitan)
Currently translated at 98.0% (609 of 621 strings)
Translation: Mastodon/Backend
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/oc/
* Translated using Weblate (Catalan)
Currently translated at 100.0% (621 of 621 strings)
Translation: Mastodon/Backend
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/ca/
* Translated using Weblate (Occitan)
Currently translated at 100.0% (299 of 299 strings)
Translation: Mastodon/React
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/oc/
* Translated using Weblate (Italian)
Currently translated at 100.0% (299 of 299 strings)
Translation: Mastodon/React
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/it/
* Translated using Weblate (Esperanto)
Currently translated at 100.0% (299 of 299 strings)
Translation: Mastodon/React
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/eo/
* Translated using Weblate (Esperanto)
Currently translated at 100.0% (299 of 299 strings)
Translation: Mastodon/React
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/eo/
* Translated using Weblate (Esperanto)
Currently translated at 100.0% (66 of 66 strings)
Translation: Mastodon/Preferences
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/simple_form/eo/
* Translated using Weblate (Italian)
Currently translated at 100.0% (299 of 299 strings)
Translation: Mastodon/React
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/it/
* Translated using Weblate (Italian)
Currently translated at 98.4% (65 of 66 strings)
Translation: Mastodon/Preferences
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/simple_form/it/
* Translated using Weblate (Italian)
Currently translated at 84.0% (522 of 621 strings)
Translation: Mastodon/Backend
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/it/
* Translated using Weblate (Esperanto)
Currently translated at 99.8% (620 of 621 strings)
Translation: Mastodon/Backend
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/eo/
* Translated using Weblate (Japanese)
Currently translated at 99.6% (619 of 621 strings)
Translation: Mastodon/Backend
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/ja/
* Translated using Weblate (Japanese)
Currently translated at 100.0% (299 of 299 strings)
Translation: Mastodon/React
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/ja/
* Translated using Weblate (Catalan)
Currently translated at 100.0% (621 of 621 strings)
Translation: Mastodon/Backend
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/ca/
* Translated using Weblate (Occitan)
Currently translated at 98.0% (609 of 621 strings)
Translation: Mastodon/Backend
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/oc/
* Translated using Weblate (French)
Currently translated at 99.6% (619 of 621 strings)
Translation: Mastodon/Backend
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/fr/
* Translated using Weblate (Italian)
Currently translated at 84.0% (522 of 621 strings)
Translation: Mastodon/Backend
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/it/
* Translated using Weblate (Catalan)
Currently translated at 100.0% (621 of 621 strings)
Translation: Mastodon/Backend
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/ca/
* Translated using Weblate (Persian)
Currently translated at 99.6% (298 of 299 strings)
Translation: Mastodon/React
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/fa/
* Translated using Weblate (Persian)
Currently translated at 99.5% (618 of 621 strings)
Translation: Mastodon/Backend
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/fa/
* Translated using Weblate (Persian)
Currently translated at 100.0% (66 of 66 strings)
Translation: Mastodon/Preferences
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/simple_form/fa/
* Translated using Weblate (Persian)
Currently translated at 99.6% (619 of 621 strings)
Translation: Mastodon/Backend
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/fa/
* Translated using Weblate (Persian)
Currently translated at 100.0% (66 of 66 strings)
Translation: Mastodon/Preferences
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/simple_form/fa/
* Translated using Weblate (Persian)
Currently translated at 100.0% (299 of 299 strings)
Translation: Mastodon/React
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/fa/
* Translated using Weblate (Persian)
Currently translated at 100.0% (299 of 299 strings)
Translation: Mastodon/React
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/fa/
* Translated using Weblate (Occitan)
Currently translated at 98.0% (609 of 621 strings)
Translation: Mastodon/Backend
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/oc/
* Translated using Weblate (Dutch)
Currently translated at 99.8% (620 of 621 strings)
Translation: Mastodon/Backend
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/nl/
* Translated using Weblate (Dutch)
Currently translated at 100.0% (621 of 621 strings)
Translation: Mastodon/Backend
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/nl/
* Translated using Weblate (Persian)
Currently translated at 100.0% (299 of 299 strings)
Translation: Mastodon/React
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/fa/
* Translated using Weblate (Slovak)
Currently translated at 95.0% (590 of 621 strings)
Translation: Mastodon/Backend
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/sk/
* Translated using Weblate (Slovak)
Currently translated at 98.4% (65 of 66 strings)
Translation: Mastodon/Preferences
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/simple_form/sk/
* Translated using Weblate (Slovak)
Currently translated at 100.0% (66 of 66 strings)
Translation: Mastodon/Preferences
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/simple_form/sk/
* Translated using Weblate (Galician)
Currently translated at 100.0% (66 of 66 strings)
Translation: Mastodon/Preferences
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/simple_form/gl/
* Translated using Weblate (Galician)
Currently translated at 100.0% (621 of 621 strings)
Translation: Mastodon/Backend
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/gl/
* Translated using Weblate (French)
Currently translated at 100.0% (299 of 299 strings)
Translation: Mastodon/React
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/fr/
* Translated using Weblate (French)
Currently translated at 99.6% (619 of 621 strings)
Translation: Mastodon/Backend
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/fr/
* Translated using Weblate (Japanese)
Currently translated at 99.3% (617 of 621 strings)
Translation: Mastodon/Backend
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/ja/
* Translated using Weblate (Japanese)
Currently translated at 100.0% (299 of 299 strings)
Translation: Mastodon/React
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/ja/
* Translated using Weblate (Japanese)
Currently translated at 93.9% (62 of 66 strings)
Translation: Mastodon/Preferences
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/simple_form/ja/
* Translated using Weblate (Greek)
Currently translated at 100.0% (299 of 299 strings)
Translation: Mastodon/React
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/el/
* Translated using Weblate (Greek)
Currently translated at 100.0% (299 of 299 strings)
Translation: Mastodon/React
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/el/
* Translated using Weblate (Greek)
Currently translated at 100.0% (299 of 299 strings)
Translation: Mastodon/React
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/el/
Ορθογραφικό λάθος
* Translated using Weblate (Greek)
Currently translated at 44.4% (276 of 621 strings)
Translation: Mastodon/Backend
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/el/
* Translated using Weblate (Greek)
Currently translated at 100.0% (299 of 299 strings)
Translation: Mastodon/React
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/el/
* Translated using Weblate (Greek)
Currently translated at 100.0% (299 of 299 strings)
Translation: Mastodon/React
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/el/
* Translated using Weblate (Chinese (Hong Kong))
Currently translated at 100.0% (66 of 66 strings)
Translation: Mastodon/Preferences
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/simple_form/zh_Hant_HK/
* Translated using Weblate (Chinese (Hong Kong))
Currently translated at 100.0% (66 of 66 strings)
Translation: Mastodon/Preferences
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/simple_form/zh_Hant_HK/
* Translated using Weblate (Chinese (Hong Kong))
Currently translated at 99.1% (616 of 621 strings)
Translation: Mastodon/Backend
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/zh_Hant_HK/
* Translated using Weblate (Swedish)
Currently translated at 100.0% (299 of 299 strings)
Translation: Mastodon/React
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/sv/
* Translated using Weblate (Swedish)
Currently translated at 100.0% (299 of 299 strings)
Translation: Mastodon/React
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/sv/
* Translated using Weblate (Swedish)
Currently translated at 99.3% (617 of 621 strings)
Translation: Mastodon/Backend
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/sv/
* Translated using Weblate (Arabic)
Currently translated at 90.8% (564 of 621 strings)
Translation: Mastodon/Backend
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/ar/
* Translated using Weblate (Slovak)
Currently translated at 100.0% (66 of 66 strings)
Translation: Mastodon/Preferences
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/simple_form/sk/
* Translated using Weblate (Slovak)
Currently translated at 95.0% (590 of 621 strings)
Translation: Mastodon/Backend
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/sk/
* Translated using Weblate (German)
Currently translated at 99.0% (615 of 621 strings)
Translation: Mastodon/Backend
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/de/
* Translated using Weblate (Dutch)
Currently translated at 100.0% (299 of 299 strings)
Translation: Mastodon/React
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/nl/
* Translated using Weblate (Swedish)
Currently translated at 100.0% (66 of 66 strings)
Translation: Mastodon/Preferences
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/simple_form/sv/
* Translated using Weblate (Swedish)
Currently translated at 100.0% (66 of 66 strings)
Translation: Mastodon/Preferences
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/simple_form/sv/
* Translated using Weblate (Portuguese (Brazil))
Currently translated at 99.6% (619 of 621 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% (299 of 299 strings)
Translation: Mastodon/React
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/pt_BR/
* Translated using Weblate (Arabic)
Currently translated at 93.9% (62 of 66 strings)
Translation: Mastodon/Preferences
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/simple_form/ar/
* Translated using Weblate (Arabic)
Currently translated at 98.6% (75 of 76 strings)
Translation: Mastodon/Doorkeeper
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/doorkeeper/ar/
* Translated using Weblate (Arabic)
Currently translated at 90.8% (564 of 621 strings)
Translation: Mastodon/Backend
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/ar/
* Translated using Weblate (Greek)
Currently translated at 100.0% (299 of 299 strings)
Translation: Mastodon/React
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/el/
* Translated using Weblate (Greek)
Currently translated at 100.0% (299 of 299 strings)
Translation: Mastodon/React
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/el/
* Translated using Weblate (Greek)
Currently translated at 100.0% (299 of 299 strings)
Translation: Mastodon/React
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/el/
* Translated using Weblate (Greek)
Currently translated at 100.0% (299 of 299 strings)
Translation: Mastodon/React
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/el/
* Translated using Weblate (Greek)
Currently translated at 100.0% (299 of 299 strings)
Translation: Mastodon/React
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/el/
* Translated using Weblate (Greek)
Currently translated at 100.0% (299 of 299 strings)
Translation: Mastodon/React
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/el/
* Translated using Weblate (Greek)
Currently translated at 100.0% (299 of 299 strings)
Translation: Mastodon/React
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/el/
* Translated using Weblate (Greek)
Currently translated at 100.0% (299 of 299 strings)
Translation: Mastodon/React
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/el/
* Translated using Weblate (Greek)
Currently translated at 100.0% (299 of 299 strings)
Translation: Mastodon/React
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/el/
* Translated using Weblate (Greek)
Currently translated at 100.0% (299 of 299 strings)
Translation: Mastodon/React
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/el/
* Translated using Weblate (Greek)
Currently translated at 44.6% (277 of 621 strings)
Translation: Mastodon/Backend
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/el/
* Translated using Weblate (Slovak)
Currently translated at 95.1% (591 of 621 strings)
Translation: Mastodon/Backend
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/sk/
* Translated using Weblate (Dutch)
Currently translated at 100.0% (621 of 621 strings)
Translation: Mastodon/Backend
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/nl/
* Translated using Weblate (Slovak)
Currently translated at 100.0% (66 of 66 strings)
Translation: Mastodon/Preferences
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/simple_form/sk/
* Translated using Weblate (Slovak)
Currently translated at 95.1% (591 of 621 strings)
Translation: Mastodon/Backend
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/sk/
* Translated using Weblate (Japanese)
Currently translated at 99.5% (618 of 621 strings)
Translation: Mastodon/Backend
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/ja/
* Translated using Weblate (Basque)
Currently translated at 89.6% (268 of 299 strings)
Translation: Mastodon/React
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/eu/
* Translated using Weblate (Basque)
Currently translated at 40.9% (27 of 66 strings)
Translation: Mastodon/Preferences
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/simple_form/eu/
* Translated using Weblate (Basque)
Currently translated at 1.2% (8 of 621 strings)
Translation: Mastodon/Backend
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/eu/
* i18n-tasks normalize && yarn manage:translations
2018-05-26 04:45:58 +02:00
Eugen Rochko
ebf2fef029
Catch ActionController::UnknownFormat and return HTTP 406 ( #7621 )
...
An error like that should not appear in production error log.
2018-05-26 01:09:30 +02:00
ThibG
a5c25242af
Merge pull request #514 from ThibG/glitch-soc/fixes/fix-hardcoded-fav
...
[Glitch] Use .star-icon instead of hardcoding color in detailed statuses
2018-05-25 22:03:31 +02:00
Thibaut Girka
11cc2e099a
Merge branch 'master' into glitch-soc/merge-master
...
Conflicts:
app/javascript/styles/mastodon-light.scss
config/themes.yml
Removed config/themes.yml, took upstream's mastodon-light.scss
2018-05-25 18:59:02 +02:00
Akihiko Odaki
023fe5181b
Introduce flat layout to contexts reducer ( #7150 )
...
This allows to filter out replies in threads even if contexts of those
replies are not fetched.
2018-05-25 18:46:28 +02:00
Yamagishi Kazutoshi
8182b61518
Enable media timeline ( #7598 )
2018-05-25 18:36:46 +02:00
Lynx Kotoura
7ea91dcbb3
More polished light theme ( #7620 )
...
* Revert "Remove pointer to light theme until it is more polished (#7594 )"
This reverts commit f8cf85db3b
2018-05-25 18:36:26 +02:00
Lynx Kotoura
6042403621
Fix color of /about/more link anchors ( #7618 )
2018-05-25 16:48:17 +02:00
ThibG
cdbdf7f98b
Ignore multiple occurrences of a hashtag within a status ( fixes #7585 ) ( #7606 )
2018-05-25 14:26:45 +02:00
Thibaut Girka
c1d0f96bb4
Add missing comma in InitalStateSerializer ( fixes #516 )
2018-05-25 14:06:48 +02:00
Thibaut Girka
4c91215e1f
[Glitch] Use .star-icon instead of hardcoding color in detailed statuses
...
Port 2587fcdd27
2018-05-25 11:16:11 +02:00
ThibG
2587fcdd27
Use .star-icon instead of hardcoding color in detailed statuses ( fixes #7610 ) ( #7613 )
2018-05-25 10:03:22 +09:00
ThibG
88ec5193cb
Merge pull request #510 from ThibG/glitch-soc/merge-upstream
...
Merge upstream changes
2018-05-23 19:19:28 +02:00
ThibG
7719fe0df2
Merge pull request #505 from ThibG/glitch-soc/features/fetch-relationships-on-search
...
[Glitch] Fetch relationships for search results in UI
2018-05-23 18:54:51 +02:00
Thibaut Girka
0553496b76
Change notification cleaning checkbox color ( fixes #511 )
2018-05-23 18:29:15 +02:00
Thibaut Girka
e0ef89c73f
Merge branch 'master' into glitch-soc/merge-upstream
2018-05-23 16:05:19 +02:00
ThibG
d8864b9e9d
Fix caret position after selected suggestion and media upload ( #7595 )
...
* Fix media upload reseting caret position to last inserted emoji
* Fix caret position after inserting suggestions (fixes #6089 )
2018-05-23 15:20:15 +02:00
Eugen Rochko
4d81809f36
Yeah, it was supposed to be #create?
2018-05-22 20:05:24 +02:00
ThibG
39d70f375f
Remove unneeded code now that attachment URL isn't appended to toots ( #7593 )
2018-05-22 19:32:02 +02:00
Eugen Rochko
1a564df586
Do not encode HTML entities in initial Web Push payload body ( #7592 )
2018-05-22 18:12:45 +02:00
SerCom_KC
4c9d5a500d
[WIP] i18n: Update Simplified Chinese translations ( #7576 )
...
* i18n: (zh-CN) #7027
* Rewording
This placeholder is also seen on single user page at Moderation > Accounts, where "this report" doesn't make sense.
* i18n: (zh-CN) #6425
* i18n: (zh-CN) #6497
* i18n: (zh-CN) #6246
* i18n: (zh-CN) Improvements
2018-05-22 15:26:42 +02:00
Eugen Rochko
36e47a31e3
Enforce order on authorized applications page ( #7587 )
...
Fix #7586
2018-05-22 14:44:53 +02:00
Yamagishi Kazutoshi
4eeda67727
Hide section headline for timelines in production ( #7590 )
...
* Hide section headline for timelines in production
* comment out
2018-05-22 14:44:32 +02:00
Yamagishi Kazutoshi
06252ec71e
Change column params on pinned timeline ( #7581 )
2018-05-22 13:26:06 +02:00
bsky
92b09d90c8
Remove outline ( #7582 )
2018-05-22 13:24:54 +02:00
Thibaut Girka
247f55f673
[Glitch] Fetch relationships for search results in UI
...
Port webui changes from cba2897108
2018-05-22 13:05:40 +02:00
David Yip
6dd676e006
Merge remote-tracking branch 'origin/master' into merge-upstream
...
Conflicts:
config/locales/pl.yml
The conflict in config/locales/pl.yml concerns the themes key, which is
not used in glitchsoc. Resolution: remove the themes key-related
changes, i.e. accept-ours.
2018-05-21 16:30:24 -05:00
Marcin Mikołajczak
810f92e697
🌍 : 🇵🇱 ⬆️ ( #7580 )
...
Signed-off-by: Marcin Mikołajczak <me@m4sk.in>
2018-05-21 23:12:35 +02:00
Jenkins
f93806ea55
Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master
2018-05-21 18:17:23 +00:00
Thibaut Girka
d0b2f71501
Fix width only being set for standalone media
2018-05-21 18:25:41 +02:00
Thibaut Girka
3ad3cee44c
[Glitch] Use real container width in MediaGallery srcSet
...
Port 22e067bf5c
2018-05-21 17:55:07 +02:00
Thibaut Girka
463078dcc4
[Glitch] Do not override the default push notification settings
...
Port 1951ff41b3
2018-05-21 17:52:26 +02:00
Eugen Rochko
5ea643b279
Save onlyMedia prop when pinning column ( #7575 )
2018-05-21 17:49:10 +02:00
Eugen Rochko
40ef46dbef
Display only domain of report account if remote under comment ( #7574 )
2018-05-21 17:33:20 +02:00
Thibaut Girka
a4c9bda771
Merge branch 'master' into glitch-soc/merge-upstream
...
Conflicts:
app/javascript/styles/mastodon-light.scss
config/locales/en.yml
config/locales/fr.yml
config/locales/simple_form.pl.yml
config/themes.yml
Conflicts resolved by deleting config/themes.yml,
marking app/javascript/styles/mastodon-light.scss as added,
and taking all new translation strings, not removing anything from
them.
2018-05-21 16:40:02 +02:00
Yamagishi Kazutoshi
46061dc041
Add exact attribute to WrappedRoute for community timeline ( #7572 )
...
* Add extra attribute to WrappedRoute for community timeline
* fix
2018-05-21 16:26:00 +02:00
Eugen Rochko
22e067bf5c
Use real container width in MediaGallery srcSet ( #7571 )
...
Fix #7568
2018-05-21 16:04:01 +02:00
Eugen Rochko
32d4372381
Use #any? instead of #exists? when checking media attachments ( #7570 )
...
If media_attachments are not loaded, SQL query is the same, but
the #exists? method performs SQL query even if preloaded
2018-05-21 16:01:16 +02:00
Eugen Rochko
e583f110c3
Unescape HTML entities in rich web push notifications in web UI ( #7569 )
2018-05-21 16:00:56 +02:00
Thibaut Girka
c53aacdfa0
Recover glitch-soc specific styles that were removed by accident
2018-05-21 15:56:47 +02:00
SerCom_KC
41b2cfe5b8
i18n: Update Simplified Chinese translations ( #7565 )
...
* i18n: (zh-CN) #7532
* i18n: (zh-CN) #6984
* i18n: (zh-CN) #7391 , #7507
* i18n: (zh-CN) #6998
* i18n: (zh-CN) #7074
* i18n: (zh-CN) #7000 , #7032 , #7131 (#7032 , #7040 )
* i18n: (zh-CN) #7130 , #7188
* i18n: (zh-CN) #6486
* i18n: (zh-CN) #6292
* i18n: (zh-CN) #7347
* i18n: (zh-CN) #6661
* i18n: (zh-CN) #6425
* i18n: (zh-CN) #6597
* i18n: (zh-CN) #6695
* i18n: (zh-CN) #6325
* i18n: (zh-CN) #6460 , #7375
* i18n: (zh-CN) #6872
* i18n: (zh-CN) #6818
* i18n: (zh-CN) #7452
* i18n: (zh-CN) #7176
* i18n: (zh-CN) #6460
* i18n: (zh-CN) #7213
* i18n: (zh-CN) #7376
* i18n: (zh-CN) #6556
* i18n: (zh-CN) #6645
* i18n: (zh-CN) #6448
* i18n: (zh-CN) #5303
* i18n: (zh-CN) #7445
* i18n: (zh-CN) Normalization and improvements
* i18n: (zh-CN) #7391
* i18n: (zh-CN) #6627
* i18n: (zh-CN) #6956 , #7546
* i18n: (zh-CN) #6636
* i18n: (zh-CN) #6610 , #6875
* i18n: (zh-CN) #6887
* i18n: (zh-CN) #4514
* i18n: (zh-CN) #6628
* i18n: (zh-CN) #6771
* i18n: (zh-CN) #6772
* i18n: (zh-CN) #7178
* i18n: (zh-CN) #7521
* i18n: (zh-CN) #6570
* i18n: (zh-CN) #6593
* i18n: (zh-CN) #6423
* i18n: (zh-CN) #6157
* i18n: (zh-CN) #7089
* i18n: (zh-CN) #6733
* i18n: (zh-CN) #7072
* i18n: (zh-CN) #6520
* i18n: (zh-CN) Improvment
* i18n: (zh-CN) #6631
2018-05-21 13:40:48 +02:00
Sylvhem
ea969000a5
Add a light theme ( #7027 )
...
* Add a light theme to Mastodon
This add a second default theme to Mastodon. This new theme is supposed to be a light version of the dark original one.
* Update locales
Update the English and French locales.
* Change capitalization of hexadecimal triplets
Change capitalization of hexadecimal color codes to match Code Climate's recomandation.
* Add variable
Add a new variable to use instead of hardcoding a color. Change made to match Code Climate's recomandation.
* Use Mastodon branding palette
Replace the colors previously used by the ones found in Mastodon branding palette.
The resulting theme is lighter than the previous version.
* Make the overlay background white
Make the overly background used on on sensitive medias white instead of black
* Change the color used on the envelop icon
Change the color used on the envelop icon for a darker one. The same color is now used on both the envelop icon and the padlock icon.
* Add contrast
Add contrast to various places inside the main interface and the profile pages.
* Change the text color used in the compose form
Change the text color used in the compose form for a darker one.
* Make the code easier to read
Add some blank lines to make the code easier to parse for a human eye.
* Change columns' background default colors
Change columns' background default colors, making the composition column the darker one.
* Change the color of the log in button
Change the log in button's text color to make it more readable.
* Fix the color of the boost buttons on the landing page
The disabled boost buttons on the landing page are now of the same color that the other disabled buttons.
* Change the colors used in the dropdown menu
Make the dropdown menu light instead of dark.
2018-05-21 13:40:31 +02:00
Yamagishi Kazutoshi
7403e5d306
Add media timeline ( #6631 )
2018-05-21 12:43:38 +02:00
Eugen Rochko
05f8c375a2
Remove small pagination limit from context API ( #7564 )
...
Fix #7557
2018-05-21 12:43:05 +02:00
Eugen Rochko
9ada532809
Convert rich push notifications to plaintext in webapp ( #7563 )
...
* Convert rich push notifications to plaintext in webapp
* Fix code style issues
2018-05-21 03:35:37 +02:00
Quentí
6eb2bc4348
[i18n] Update for Occitan ( #7558 )
...
* Update oc.json
* Update oc.yml
* Update simple_form.oc.yml
2018-05-20 20:26:32 +02:00
Eugen Rochko
779eb07d75
Improve default background of public profile header ( #7556 )
...
Looks better when no header image is set
2018-05-20 13:09:28 +02:00
Thibaut Girka
d250e072a2
In footer, replace text "Mastodon" with logo
...
Port SCSS changes from 93c66f0c03
2018-05-20 11:29:06 +02:00
Thibaut Girka
9ed8051961
Add preference to hide following/followers lists
...
Port SCSS from 1e02dc8715
2018-05-20 11:28:58 +02:00
Thibaut Girka
50540446f5
[Glitch] Improvements to toots display in admin view
...
Port SCSS changes from 0f2fbf7d05
2018-05-20 11:28:58 +02:00
David Yip
2f9bd86f6e
Merge pull request #470 from ThibG/glitch-soc/fixes/status-click-detailed
...
Widen clickable area of toots
2018-05-20 03:03:39 -05:00
Marcin Mikołajczak
07672e0609
🌍 : 🇵🇱 ⬆️ ( #7554 )
...
Signed-off-by: Marcin Mikołajczak <me@m4sk.in>
2018-05-20 00:55:56 +02:00
Thibaut Girka
b481e4fac1
Merge branch 'master' into glitch-soc/merge-upstream
...
Conflicts:
config/locales/simple_form.ja.yml
2018-05-19 22:41:10 +02:00
Yamagishi Kazutoshi
6aa5ea1b5d
Weblate translations (2018-05-20) ( #7552 )
...
* Translated using Weblate (French)
Currently translated at 100.0% (76 of 76 strings)
Translation: Mastodon/Doorkeeper
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/doorkeeper/fr/
* Translated using Weblate (Italian)
Currently translated at 100.0% (76 of 76 strings)
Translation: Mastodon/Doorkeeper
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/doorkeeper/it/
* Translated using Weblate (Portuguese (Brazil))
Currently translated at 100.0% (295 of 295 strings)
Translation: Mastodon/React
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/pt_BR/
* Translated using Weblate (Dutch)
Currently translated at 100.0% (64 of 64 strings)
Translation: Mastodon/Preferences
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/simple_form/nl/
* Translated using Weblate (Catalan)
Currently translated at 100.0% (64 of 64 strings)
Translation: Mastodon/Preferences
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/simple_form/ca/
* Translated using Weblate (French)
Currently translated at 100.0% (64 of 64 strings)
Translation: Mastodon/Preferences
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/simple_form/fr/
* Translated using Weblate (Dutch)
Currently translated at 100.0% (295 of 295 strings)
Translation: Mastodon/React
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/nl/
* Translated using Weblate (Catalan)
Currently translated at 100.0% (295 of 295 strings)
Translation: Mastodon/React
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/ca/
* Translated using Weblate (Catalan)
Currently translated at 100.0% (628 of 628 strings)
Translation: Mastodon/Backend
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/ca/
* Translated using Weblate (Galician)
Currently translated at 100.0% (295 of 295 strings)
Translation: Mastodon/React
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/gl/
* Translated using Weblate (Portuguese (Brazil))
Currently translated at 100.0% (76 of 76 strings)
Translation: Mastodon/Doorkeeper
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/doorkeeper/pt_BR/
* Translated using Weblate (Portuguese (Brazil))
Currently translated at 100.0% (295 of 295 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% (625 of 627 strings)
Translation: Mastodon/Backend
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/pt_BR/
* Translated using Weblate (Italian)
Currently translated at 100.0% (295 of 295 strings)
Translation: Mastodon/React
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/it/
* Translated using Weblate (Italian)
Currently translated at 83.7% (525 of 627 strings)
Translation: Mastodon/Backend
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/it/
* Translated using Weblate (Japanese)
Currently translated at 100.0% (76 of 76 strings)
Translation: Mastodon/Doorkeeper
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/doorkeeper/ja/
* Translated using Weblate (Galician)
Currently translated at 100.0% (64 of 64 strings)
Translation: Mastodon/Preferences
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/simple_form/gl/
* Translated using Weblate (Galician)
Currently translated at 100.0% (64 of 64 strings)
Translation: Mastodon/Preferences
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/simple_form/gl/
* Translated using Weblate (Galician)
Currently translated at 100.0% (627 of 627 strings)
Translation: Mastodon/Backend
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/gl/
* Translated using Weblate (Galician)
Currently translated at 100.0% (628 of 628 strings)
Translation: Mastodon/Backend
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/gl/
* Translated using Weblate (Dutch)
Currently translated at 100.0% (295 of 295 strings)
Translation: Mastodon/React
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/nl/
* Translated using Weblate (Japanese)
Currently translated at 93.7% (60 of 64 strings)
Translation: Mastodon/Preferences
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/simple_form/ja/
* Translated using Weblate (Galician)
Currently translated at 100.0% (295 of 295 strings)
Translation: Mastodon/React
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/gl/
* Translated using Weblate (Japanese)
Currently translated at 100.0% (295 of 295 strings)
Translation: Mastodon/React
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/ja/
* Translated using Weblate (French)
Currently translated at 99.5% (624 of 627 strings)
Translation: Mastodon/Backend
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/fr/
* Translated using Weblate (French)
Currently translated at 100.0% (295 of 295 strings)
Translation: Mastodon/React
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/fr/
* Translated using Weblate (Portuguese (Brazil))
Currently translated at 100.0% (295 of 295 strings)
Translation: Mastodon/React
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/pt_BR/
* Translated using Weblate (Portuguese (Brazil))
Currently translated at 100.0% (64 of 64 strings)
Translation: Mastodon/Preferences
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/simple_form/pt_BR/
* Translated using Weblate (French)
Currently translated at 99.6% (625 of 627 strings)
Translation: Mastodon/Backend
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/fr/
* Translated using Weblate (Catalan)
Currently translated at 100.0% (66 of 66 strings)
Translation: Mastodon/Preferences
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/simple_form/ca/
* Translated using Weblate (Galician)
Currently translated at 100.0% (66 of 66 strings)
Translation: Mastodon/Preferences
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/simple_form/gl/
* Translated using Weblate (Japanese)
Currently translated at 93.9% (62 of 66 strings)
Translation: Mastodon/Preferences
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/simple_form/ja/
* Translated using Weblate (Japanese)
Currently translated at 99.8% (627 of 628 strings)
Translation: Mastodon/Backend
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/ja/
* Translated using Weblate (Portuguese (Brazil))
Currently translated at 100.0% (66 of 66 strings)
Translation: Mastodon/Preferences
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/simple_form/pt_BR/
* Translated using Weblate (Portuguese (Brazil))
Currently translated at 99.6% (626 of 628 strings)
Translation: Mastodon/Backend
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/pt_BR/
* Translated using Weblate (French)
Currently translated at 100.0% (66 of 66 strings)
Translation: Mastodon/Preferences
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/simple_form/fr/
* Translated using Weblate (Dutch)
Currently translated at 100.0% (66 of 66 strings)
Translation: Mastodon/Preferences
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/simple_form/nl/
* Translated using Weblate (Dutch)
Currently translated at 100.0% (628 of 628 strings)
Translation: Mastodon/Backend
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/nl/
* Translated using Weblate (Slovak)
Currently translated at 100.0% (295 of 295 strings)
Translation: Mastodon/React
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/sk/
* Translated using Weblate (French)
Currently translated at 99.6% (626 of 628 strings)
Translation: Mastodon/Backend
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/fr/
* Translated using Weblate (Swedish)
Currently translated at 99.5% (625 of 628 strings)
Translation: Mastodon/Backend
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/sv/
* Translated using Weblate (Slovak)
Currently translated at 98.4% (65 of 66 strings)
Translation: Mastodon/Preferences
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/simple_form/sk/
* Translated using Weblate (Swedish)
Currently translated at 95.4% (63 of 66 strings)
Translation: Mastodon/Preferences
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/simple_form/sv/
* Translated using Weblate (Japanese)
Currently translated at 99.8% (627 of 628 strings)
Translation: Mastodon/Backend
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/ja/
* Translated using Weblate (Persian)
Currently translated at 100.0% (66 of 66 strings)
Translation: Mastodon/Preferences
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/simple_form/fa/
* Translated using Weblate (Persian)
Currently translated at 100.0% (62 of 62 strings)
Translation: Mastodon/Devise
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/devise/fa/
* Translated using Weblate (Persian)
Currently translated at 100.0% (76 of 76 strings)
Translation: Mastodon/Doorkeeper
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/doorkeeper/fa/
* Translated using Weblate (Persian)
Currently translated at 100.0% (62 of 62 strings)
Translation: Mastodon/Devise
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/devise/fa/
* i18n-tasks normalize && i18n-tasks remove-unused && yarn manage:translations
2018-05-19 21:42:21 +02:00
Eugen Rochko
8378b72eba
Ensure push subscription is immediately removed when application is revoked ( #7548 )
...
* Ensure push subscription is immediately removed when application is revoked
* When token is revoked from app, unsubscribe too
2018-05-19 21:05:08 +02:00
Ash Furrow
50db106252
Disables autocorrect/autocapitalize on remote username field. ( #7549 )
2018-05-19 19:36:23 +02:00
Akihiko Odaki
4e1400cecb
Cache media only when storage can be freed ( #7547 )
2018-05-19 19:22:11 +02:00
Eugen Rochko
1bbe12254d
Improve direct message warning again ( #7546 )
2018-05-19 18:37:33 +02:00
Eugen Rochko
93c66f0c03
In footer, replace text "Mastodon" with logo ( #7545 )
2018-05-19 16:10:55 +02:00
takayamaki
587da93152
checking http status code with range ( #7544 )
2018-05-19 14:47:44 +02:00
Eugen Rochko
4b94e9c65e
Improve payload format of Web Push API now that it's open ( #7521 )
...
> Good lord what is happening in there
Previously the contents of the Web Push API payloads closely resembled the structure of JavaScript's [Notification](https://developer.mozilla.org/en-US/docs/Web/API/Notification ). But now that the API is open to non-browser apps, and given that there is no required coupling between contents of the payload and a Notification object, here is how I changed the payload:
```json
{
"access_token": "...",
"preferred_locale": "en",
"notification_id": "12345",
"notification_type": "follow",
"title": "So and so followed you",
"body": "This is my bio",
"icon": "https://example.com/avatar.png "
}
```
The title, body and icon attributes are included as a fallback so you can construct a minimal notification if you cannot perform a network request to the API to get more data.
2018-05-19 14:46:47 +02:00
Akihiko Odaki
1951ff41b3
Do not override the default push notification settings ( #6037 )
2018-05-19 14:45:58 +02:00
bsky
138512d204
Remove outline ( #7543 )
2018-05-19 12:16:52 +02:00
Eugen Rochko
7871d29aff
Skip pagination logic for pinned account timelines in reducer ( #7540 )
...
Fix #7516
2018-05-19 02:51:29 +02:00
Eugen Rochko
97f02f2c08
Do not raise delivery failure on 4xx errors, increase stoplight threshold ( #7541 )
...
* Do not raise delivery failure on 4xx errors, increase stoplight threshold
Stoplight failure threshold from 3 to 10
Status code 429 will raise a failure/get retried
* Oops
2018-05-19 00:23:19 +02:00
Thibaut Girka
9d6788b30b
Prevent click on video from opening detailed toot
2018-05-18 17:49:51 +02:00
Thibaut Girka
2154bd1b5a
Widen clickable area of toots
2018-05-18 17:33:58 +02:00
ThibG
625c4f36ef
Merge pull request #490 from glitch-soc/merge-upstream
...
Merge with tootsuite @ 57b503d4ef
2018-05-18 17:20:32 +02:00
Eugen Rochko
9422b3e0d8
Fix double-encoding of display name in title and e-mails ( #7534 )
2018-05-18 15:56:57 +02:00
David Yip
e0eebba461
Merge remote-tracking branch 'origin/master' into merge-upstream
...
Conflicts:
app/controllers/follower_accounts_controller.rb
app/controllers/following_accounts_controller.rb
app/controllers/settings/preferences_controller.rb
app/lib/user_settings_decorator.rb
app/models/user.rb
config/locales/simple_form.en.yml
2018-05-18 08:47:10 -05:00
David Yip
023dfa119e
Merge pull request #487 from ThibG/glitch-soc/cleanup
...
Remove service worker code that has never been used
2018-05-18 08:37:31 -05:00
Akihiko Odaki
2beeea1e7d
Change Japanese translation for privacy.private.short ( #7535 )
...
The old translation means "hidden," but it is vague in terms that it does
not specify the scope status is hidden. The new translation is a literal
translation of "Followers-only," without such ambiguity.
2018-05-18 22:30:45 +09:00
David Yip
81e3ec4d61
Merge pull request #488 from ThibG/glitch-soc/features/accounts-custom-emoji
...
[Glitch] Enable custom emojis in profiles
2018-05-18 07:55:00 -05:00
David Yip
5d823ee00a
Merge pull request #489 from ThibG/glitch-soc/features/port-public-ui-changes
...
Port public UI changes from upstream
2018-05-18 07:53:53 -05:00
Eugen Rochko
57b503d4ef
Resolve unknown status from Add activity, skip Remove if unknown ( #7526 )
...
Fix #7518
2018-05-18 11:33:56 +02:00
Eugen Rochko
dafd7afc5e
Use randomized setTimeout when fallback-polling and re-add since_id ( #7522 )
2018-05-18 02:32:35 +02:00
Eugen Rochko
1e02dc8715
Add preference to hide following/followers lists ( #7532 )
...
* Add preference to hide following/followers lists
- Public pages
- ActivityPub collections (does not return pages but does give total)
- REST API (unless it's your own) (does not federate)
Fix #6901
* Add preference
* Add delegation
* Fix issue
* Fix issue
2018-05-18 02:26:51 +02:00
Jenkins
4c0770d6c8
Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master
2018-05-18 00:17:23 +00:00
MIYAGI Hikaru
919eef3098
User agent for WebFinger ( #7531 )
...
* User agent for WebFinger
* local_domain → web_domain
* 'http' is away accidentally...
2018-05-18 01:47:22 +02:00
Thibaut Girka
07baa1ddb5
[Glitch] Open video modal on public UI
...
Port d9b2f84c92
2018-05-17 18:37:00 +02:00
Thibaut Girka
94db024e4c
[Glitch] Combine similar components into one on public UI
...
Port f9afd06221
2018-05-17 18:37:00 +02:00
Thibaut Girka
dd1d98f9cf
[Glitch] Show card modal on public pages
...
Port 16fee0335f
2018-05-17 18:37:00 +02:00
Thibaut Girka
52b2f18b15
[Glitch] Enable custom emojis in profiles
...
Port 61a9018607
2018-05-17 15:57:16 +02:00
Thibaut Girka
ca49ad86c6
Remove service worker code that has never been used
2018-05-17 15:39:37 +02:00
Jenkins
2636a23092
Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master
2018-05-17 11:17:21 +00:00
Eugen Rochko
7293b9fc61
Ensure unfilled fields are shown when errors are shown ( #7523 )
...
Fix #7486
2018-05-17 13:00:56 +02:00
Eugen Rochko
dfb6907e08
HTTP signatures spec no longer requires algorithms field ( #7525 )
...
Fix #7520
2018-05-17 04:03:28 +02:00
Thibaut Girka
78ac246b87
Merge branch 'master' into glitch-soc/merge-upstream
...
Conflicts:
Gemfile
Solved conflicts by using upstream's line for posix-spawn
2018-05-16 21:52:38 +02:00
ThibG
80aad16e10
Merge pull request #405 from ThibG/glitch-soc/features/dm-from-menu
...
[Glitch] Feature: Direct message from menu
2018-05-16 20:17:08 +02:00
ThibG
9712d59dda
Merge pull request #485 from ThibG/glitch-soc/fixes/light-theme-textarea-color
...
Fix mastodon-light background color of the composer textarea when posting
2018-05-16 20:16:59 +02:00
Thibaut Girka
784712791d
[Glitch] Reword the direct message warning
...
Port 53c2164e9c
2018-05-16 19:45:30 +02:00
Thibaut Girka
97c69de416
[Glitch] Feature: Direct message from Statuses
...
Port 904a2479dd
2018-05-16 19:45:30 +02:00
Thibaut Girka
fb6de5310d
[Glitch] Fix issues with sending direct messages from user profile
...
Port 4fd71accd4
2018-05-16 19:45:30 +02:00
Thibaut Girka
a5fac975f3
[Glitch] Feature: Direct message from menu
...
Port d1f34151ae
2018-05-16 19:45:30 +02:00
Thibaut Girka
eb9c9855ce
Fix mastodon-light background color of the composer textarea when posting
2018-05-16 19:37:44 +02:00
Evgeny Petrov
5e87c79d25
Russian language for 2.4.0 ( #7512 )
...
* Russian language for 2.4.0
* Russian language for 2.4.0
* bundle exec i18n-tasks normalize
* RU: Updated some strings after new commits appeared
2018-05-16 16:25:11 +02:00
Eugen Rochko
2b97451168
Fix images resized in browser getting cropped ( #7514 )
...
Fix #7487
2018-05-16 16:24:16 +02:00
Technowix
4ea376121a
French translation tweaks ( #7513 )
...
- Use more neutral terminology for readability.
- Maintains the use of "Personne" instead of "Utilisateur⋅ice" to emphasis on the "You're not the product".
- Some fixes for accounts.
2018-05-16 23:21:48 +09:00
Quentí
f60c1d3989
[l10n] Occitan update ( #7505 )
...
* Update oc.json
* Update doorkeeper.oc.yml
* Update oc.yml
* Update simple_form.oc.yml
* Update oc.json
Accept is the opp. of reject, I think it's better like this.
* bundle exec i18n-tasks normalize
2018-05-16 23:18:32 +09:00
Sylvhem
53c2164e9c
Reword the direct message warning ( #7420 )
...
* Change direct message warning
Reword the direct message warning to set proper privacy expectations.
* Update the French translation
Update the French translation to reflect the changes made to the direct message warning.
* Wording update
Update the message's wording according to the feedback.
2018-05-16 14:47:11 +02:00
Akihiko Odaki
77cd6b5096
Do not use permitted_for scope when querying pinned statuses ( #7510 )
...
permitted_for scope is slow when combined with pinned status scope.
Fortunately permitted_for scope can safely be removed because a pinned
status is always public.
2018-05-16 12:30:14 +02:00
Akihiko Odaki
55fd55714a
Raise Mastodon::RaceConditionError if Redis lock failed ( #7511 )
...
An explicit error allows user agents to know the error and Sidekiq to
retry.
2018-05-16 12:29:45 +02:00
Akihiko Odaki
65d6b253fb
Let navigator follow redirect instead that handling redirect in fetch ( #7500 )
...
* Let navigator follow redirect instead that handling redirect in fetch
* Do not use cache when fetched resource is to redirect
2018-05-16 04:59:44 +02:00
Akihiko Odaki
17c1a62ec8
Consider only-if-cached in FetchEvent valid on non-Mozilla-Firefox browser ( #7506 )
2018-05-15 21:42:31 +02:00
Akihiko Odaki
4511a10e66
Test if navigator.storage.estimate exists before using it ( #7504 )
2018-05-15 20:15:08 +02:00
Akihiko Odaki
918cfd3be6
Ignore only-if-cached cache mode on Mozilla Firefox prior to version 60 ( #7503 )
2018-05-15 20:14:30 +02:00
Marcin Mikołajczak
ff84c18e3d
🌍 : 🇵🇱 ⬆️ ( #7494 )
...
Signed-off-by: Marcin Mikołajczak <me@m4sk.in>
2018-05-16 01:20:40 +09:00
unarist
d47091eb97
Fix custom emoji handling in UpdateRemoteProfileService (OStatus) ( #7501 )
...
This patch fixes NoMethodError and others in RemoteProfileUpdateWorker.
2018-05-15 16:03:34 +02:00
Renato "Lond" Cerqueira
1f74c1dbcb
Weblate translations 20180515 ( #7496 )
...
* Translated using Weblate (Catalan)
Currently translated at 100.0% (76 of 76 strings)
Translation: Mastodon/Doorkeeper
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/doorkeeper/ca/
* Translated using Weblate (Dutch)
Currently translated at 100.0% (76 of 76 strings)
Translation: Mastodon/Doorkeeper
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/doorkeeper/nl/
* Translated using Weblate (Catalan)
Currently translated at 100.0% (295 of 295 strings)
Translation: Mastodon/React
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/ca/
* Translated using Weblate (Italian)
Currently translated at 100.0% (295 of 295 strings)
Translation: Mastodon/React
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/it/
* Translated using Weblate (Slovak)
Currently translated at 100.0% (76 of 76 strings)
Translation: Mastodon/Doorkeeper
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/doorkeeper/sk/
* Translated using Weblate (Arabic)
Currently translated at 100.0% (295 of 295 strings)
Translation: Mastodon/React
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/ar/
* Translated using Weblate (Korean)
Currently translated at 100.0% (295 of 295 strings)
Translation: Mastodon/React
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/ko/
* Translated using Weblate (Dutch)
Currently translated at 100.0% (295 of 295 strings)
Translation: Mastodon/React
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/nl/
* Translated using Weblate (Dutch)
Currently translated at 100.0% (627 of 627 strings)
Translation: Mastodon/Backend
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/nl/
* Translated using Weblate (Catalan)
Currently translated at 100.0% (627 of 627 strings)
Translation: Mastodon/Backend
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/ca/
* Translated using Weblate (French)
Currently translated at 100.0% (295 of 295 strings)
Translation: Mastodon/React
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/fr/
* Translated using Weblate (Slovak)
Currently translated at 100.0% (295 of 295 strings)
Translation: Mastodon/React
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/sk/
* Translated using Weblate (Slovenian)
Currently translated at 100.0% (295 of 295 strings)
Translation: Mastodon/React
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/sl/
* Translated using Weblate (Slovenian)
Currently translated at 100.0% (295 of 295 strings)
Translation: Mastodon/React
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/sl/
* Translated using Weblate (Slovak)
Currently translated at 95.3% (597 of 626 strings)
Translation: Mastodon/Backend
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/sk/
* Translated using Weblate (Japanese)
Currently translated at 100.0% (295 of 295 strings)
Translation: Mastodon/React
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/ja/
* Translated using Weblate (Japanese)
Currently translated at 93.7% (60 of 64 strings)
Translation: Mastodon/Preferences
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/simple_form/ja/
* Translated using Weblate (Korean)
Currently translated at 100.0% (64 of 64 strings)
Translation: Mastodon/Preferences
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/simple_form/ko/
* Translated using Weblate (Korean)
Currently translated at 99.8% (625 of 626 strings)
Translation: Mastodon/Backend
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/ko/
* Translated using Weblate (Slovak)
Currently translated at 100.0% (64 of 64 strings)
Translation: Mastodon/Preferences
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/simple_form/sk/
* Translated using Weblate (Slovenian)
Currently translated at 100.0% (295 of 295 strings)
Translation: Mastodon/React
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/sl/
* Added translation using Weblate (Slovenian)
* Added translation using Weblate (Slovenian)
* Added translation using Weblate (Slovenian)
* Added translation using Weblate (Slovenian)
* Translated using Weblate (Esperanto)
Currently translated at 100.0% (295 of 295 strings)
Translation: Mastodon/React
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/eo/
* Translated using Weblate (Esperanto)
Currently translated at 100.0% (295 of 295 strings)
Translation: Mastodon/React
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/eo/
* Translated using Weblate (Chinese (Hong Kong))
Currently translated at 100.0% (76 of 76 strings)
Translation: Mastodon/Doorkeeper
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/doorkeeper/zh_Hant_HK/
* Translated using Weblate (Chinese (Hong Kong))
Currently translated at 100.0% (295 of 295 strings)
Translation: Mastodon/React
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/zh_Hant_HK/
* Translated using Weblate (Chinese (Hong Kong))
Currently translated at 99.3% (623 of 627 strings)
Translation: Mastodon/Backend
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/zh_Hant_HK/
* Translated using Weblate (Chinese (Hong Kong))
Currently translated at 98.4% (63 of 64 strings)
Translation: Mastodon/Preferences
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/simple_form/zh_Hant_HK/
* Translated using Weblate (Arabic)
Currently translated at 93.7% (60 of 64 strings)
Translation: Mastodon/Preferences
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/simple_form/ar/
* Translated using Weblate (Arabic)
Currently translated at 99.6% (294 of 295 strings)
Translation: Mastodon/React
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/ar/
* Translated using Weblate (Slovenian)
Currently translated at 100.0% (295 of 295 strings)
Translation: Mastodon/React
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/sl/
* Translated using Weblate (Italian)
Currently translated at 100.0% (64 of 64 strings)
Translation: Mastodon/Preferences
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/simple_form/it/
* Translated using Weblate (Italian)
Currently translated at 100.0% (295 of 295 strings)
Translation: Mastodon/React
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/it/
* Translated using Weblate (Galician)
Currently translated at 100.0% (76 of 76 strings)
Translation: Mastodon/Doorkeeper
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/doorkeeper/gl/
* Translated using Weblate (Galician)
Currently translated at 100.0% (295 of 295 strings)
Translation: Mastodon/React
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/gl/
* Translated using Weblate (Galician)
Currently translated at 100.0% (627 of 627 strings)
Translation: Mastodon/Backend
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/gl/
* Translated using Weblate (Slovenian)
Currently translated at 100.0% (295 of 295 strings)
Translation: Mastodon/React
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/sl/
* Translated using Weblate (Slovenian)
Currently translated at 7.8% (5 of 64 strings)
Translation: Mastodon/Preferences
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/simple_form/sl/
* Translated using Weblate (Slovenian)
Currently translated at 100.0% (295 of 295 strings)
Translation: Mastodon/React
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/sl/
* Translated using Weblate (Slovenian)
Currently translated at 12.5% (8 of 64 strings)
Translation: Mastodon/Preferences
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/simple_form/sl/
* Translated using Weblate (Italian)
Currently translated at 100.0% (295 of 295 strings)
Translation: Mastodon/React
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/it/
* Translated using Weblate (Slovenian)
Currently translated at 11.9% (75 of 627 strings)
Translation: Mastodon/Backend
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/sl/
* Translated using Weblate (Slovenian)
Currently translated at 14.1% (89 of 627 strings)
Translation: Mastodon/Backend
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/sl/
* Translated using Weblate (Japanese)
Currently translated at 99.5% (624 of 627 strings)
Translation: Mastodon/Backend
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/ja/
* Translated using Weblate (Japanese)
Currently translated at 93.7% (60 of 64 strings)
Translation: Mastodon/Preferences
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/simple_form/ja/
* Translated using Weblate (Japanese)
Currently translated at 93.7% (60 of 64 strings)
Translation: Mastodon/Preferences
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/simple_form/ja/
* Translated using Weblate (Japanese)
Currently translated at 93.7% (60 of 64 strings)
Translation: Mastodon/Preferences
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/simple_form/ja/
* Translated using Weblate (Japanese)
Currently translated at 93.7% (60 of 64 strings)
Translation: Mastodon/Preferences
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/simple_form/ja/
* Translated using Weblate (Japanese)
Currently translated at 99.6% (625 of 627 strings)
Translation: Mastodon/Backend
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/ja/
* Normalize translations
ran yarn build:development && i18n-tasks normalize && yarn
manage:translations && i18n-tasks remove-unused
* Remove translations causing issues in arabic
Related to #6673
2018-05-15 14:25:07 +02:00
Akihiko Odaki
3705cd8322
Clone response before using when caching web page ( #7498 )
2018-05-15 14:24:50 +02:00
Thibaut Girka
dfa60cb0a8
Fix modals testing for props.noEsc ( fixes #482 )
2018-05-15 10:39:12 +02:00
Wiktor
7fe2993b87
Fix account URI when updating ActivityPub account ( #7488 )
...
Updates account `uri` field on each call to `update_account` instead of
only once during `create_account` to mirror the same behavior in OStatus
`ResolveAccountService` class [0].
ActivityPub accounts are identified using `@username` and `@domain` pair
instead of URI since #6842 .
This fixes #7479 : a bug when the account identified by `@username` and
`@domain` changes its URI.
[0]:
03b69ebc45/app/services/resolve_account_service.rb (L121)
2018-05-14 22:56:45 +02:00
David Yip
939ea456d2
Merge pull request #476 from ThibG/fixes/update-scss
...
Change local settings SCSS to be more consistent with modals
2018-05-14 15:04:28 -05:00
Thibaut Girka
971218d1dc
Change local settings SCSS to be more consistent with modals
2018-05-14 21:39:04 +02:00
Thibaut Girka
ba7ee67498
Merge branch 'master' into glitch-soc/merge
2018-05-14 20:51:50 +02:00
