5ce4b21455
Improve style of web UI account tabs ( #6589 )
2018-03-02 04:35:49 +01:00
6b751679b5
i18n: Update Japanese translations ( #6581 )
...
* yarn manage:translations
* Update Japanese translations.
2018-03-02 07:48:17 +09:00
a6d10b05f6
i18n: Update Polish translation ( #6578 )
...
Signed-off-by: Marcin Mikołajczak <me@m4sk.in>
2018-03-01 18:26:51 +09:00
ca9d8402c3
Add "Toots/Toots with replies/Media" tab below profile header ( #6572 )
...
* Add "Toots/Toots with replies/Media" tab below profile header
* Add focal point display to account gallery timeline
* Fix visual glitch of standalone GIFV
2018-03-01 02:48:44 +01:00
d60ae00b8e
Fix margin on top action button, fix width of counters on frontpage ( #6573 )
2018-03-01 02:48:08 +01:00
0ebd2a1718
Federated reports ( #6570 )
...
* Fix #2176 : Federated reports
* UI for federated reports
* Add spec for ActivityPub Flag handler
* Add spec for ReportService
2018-02-28 06:54:55 +01:00
527210fd7b
Grid layout for tag pages ( #6545 )
...
* Use grid layout for the landing page
* Use grid layout for tag pages
* Set 2 columns width as explicit percentage for tag pages
2018-02-26 17:43:45 +01:00
8050d02e86
Better grid layout for the landing page ( #6543 )
...
* Use grid layout for the landing page
* Fix column settings
Set the ratio explicitly
* Improve information board
2018-02-26 16:19:07 +01:00
058b96ddf4
Improve public account cards ( #6559 )
...
- Add follow/unfollow/remote follow buttons
- Format the bio properly
- Always show username@domain, even for local accounts
2018-02-26 16:18:41 +01:00
88461c1abe
Fix prev/next links on public profile page ( #6497 )
...
* Fix prev/next links on public profile page
* Don't make pagination urls if no available statuses
* Fix empty check method
* Put left chevron before prev page link
* Add scope for pagination "starting at" a given id
* Status pagination try 2:
s/prev/older and s/next/newer
"older" on left, "newer" on right
Use new scope for "newer" link
Extract magic 20 page size to constant
Remove max_id from feed pagination as it's not respected
* Reinstate max_id for accounts atom stream
* normalize
2018-02-26 03:31:28 +01:00
af8aa1a5b9
Fix border-radius of owner avatar in /about/more
2018-02-25 23:27:32 +09:00
2187a87f3a
Do not use function name to track components ( #6542 )
...
UglifyJS2 is allowed to mangle function names, and function names can also
be duplicate if they are from different scopes. Therefore function names
are not reliable as identifiers.
Functions as keys for Map object is a cheaper and more reliable
alternative.
2018-02-24 19:10:57 +01:00
9d28dc6c34
Update SCSS
2018-02-24 03:22:58 +09:00
90765d1e99
Update columns.scss
2018-02-24 01:45:15 +09:00
a6138cc1e9
Update containers.scss
2018-02-24 01:26:48 +09:00
51ff35b344
Update index.scss
2018-02-24 01:25:49 +09:00
3419c8e2ac
Update about.scss
2018-02-24 00:22:05 +09:00
5d8e29ba27
Use absolute URL for focus reticle
2018-02-23 23:50:25 +09:00
c0aabbec0f
Merge branch 'master' of https://github.com/tootsuite/mastodon
...
# Conflicts:
# app/controllers/settings/exports_controller.rb
# app/models/media_attachment.rb
# app/models/status.rb
# app/views/about/show.html.haml
# docker_entrypoint.sh
# spec/views/about/show.html.haml_spec.rb
2018-02-23 23:28:31 +09:00
ad1f541bd7
Redesign landing page (again) ( #6486 )
...
* Redesign landing page (again)
* Move login form in small version to the right column
* Display closed registrations message
* Add site setting for the hero image
* Fix test
* Increase spacing, maximum width, change call to action section
2018-02-22 01:03:48 +01:00
865c7e7178
Focal points ( #6520 )
...
* Add focus param to media API, center thumbnails on focus point
* Add UI for setting a focal point
* Improve focal point icon on upload item
* Use focal point in upload preview
* Add focalPoint property to ActivityPub
* Don't show focal point button for non-image attachments
2018-02-22 00:35:46 +01:00
f6884555d7
Account archive download ( #6460 )
...
* Fix #201 : Account archive download
* Export actor and private key in the archive
* Optimize BackupService
- Add conversation to cached associations of status, because
somehow it was forgotten and is source of N+1 queries
- Explicitly call GC between batches of records being fetched
(Model class allocations are the worst offender)
- Stream media files into the tar in 1MB chunks
(Do not allocate media file (up to 8MB) as string into memory)
- Use #bytesize instead of #size to calculate file size for JSON
(Fix FileOverflow error)
- Segment media into subfolders by status ID because apparently
GIF-to-MP4 media are all named "media.mp4" for some reason
* Keep uniquely generated filename in Paperclip::GifTranscoder
* Ensure dumped files do not overwrite each other by maintaing directory partitions
* Give tar archives a good name
* Add scheduler to remove week-old backups
* Fix code style issue
2018-02-21 23:21:32 +01:00
9ff2739fb5
fix #6523 ( #6524 )
2018-02-21 19:33:23 +01:00
e768ef35b1
Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master
2018-02-19 15:17:14 +00:00
a30a207fd2
Fix media spoiler design ( #6507 )
...
- 4px rounded corners on media attachments
- Better colors/contrast for CW/media spoiler on public pages
- Fix vertical alignment of "Show more" button
- Fix layout jump when unhiding standalone media
2018-02-19 02:39:18 +01:00
edd1a3fb4e
Remove outline from body window ( Fixes #6501 ) ( #6502 )
2018-02-18 16:32:58 +01:00
750f3e64c9
Cache relationships in API ( #6482 )
...
* Cache relationships in API
* Fetch relationships for search results in UI
* Only save one account's maps in each cache item
2018-02-18 03:14:46 +01:00
596deb050b
Merge remote-tracking branch 'tootsuite/master' into merge-upstream
...
Conflicts:
Gemfile
config/locales/simple_form.pl.yml
2018-02-17 00:02:37 -06:00
9b7490cede
Save video metadata and improve video OpenGraph tags ( #6481 )
...
* Save metadata from video attachments, put correct dimensions into OG tags
* Add twitter:player for videos
* Fix code style and test
2018-02-16 07:22:20 +01:00
1cf9467613
After click to embed video, autoplay it ( #6480 )
2018-02-15 23:05:12 +01:00
0357e93a91
Fix #5173 : Click card to embed external content ( #6471 )
2018-02-15 07:04:28 +01:00
6cb5d71e5f
Fix media button type ( #6478 )
2018-02-15 04:40:42 +01:00
0ce908b3e0
i18n: Update Polish translation ( #6470 )
...
Signed-off-by: Marcin Mikołajczak <me@m4sk.in>
2018-02-14 07:55:45 +09:00
3a1f58e9eb
Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master
2018-02-11 04:10:16 +00:00
d9cc3b60fb
Merge remote-tracking branch 'origin/merge-upstream'
2018-02-10 22:08:45 -06:00
da0a577768
Revert 4a48d03b31 ( fixes #348 )
...
Since 4a48d03b31
2018-02-10 20:59:50 +01:00
7ca5a06505
Full-text search for authorized statuses ( #6423 )
...
* Add full-text search for authorized statuses
- Search API will return statuses that match the query
- Only for logged in users
- Only if you are author of the status,
- Or you were mentioned in it
- Or you favourited or reblogged it
- Configuration over `ES_ENABLED`, `ES_HOST`, `ES_PORT`, `ES_PREFIX`
- Run `rails chewy:deploy` to create & populate index
Fix #5880
Fix #4293
Fix #1152
* Add commented out docker-compose configuration for ES container
* Optimize index import, filter search results
* Add basic normalization to the index
* Add better stemming and normalization to the index
* Skip webfinger request if search query includes both @ and a space
* Fix code style
* Visually separate search result sections
* Fix code style issues
2018-02-09 23:04:47 +01:00
799b205766
Merge remote-tracking branch 'origin/master' into merge-upstream
...
Conflicts:
.travis.yml
app/lib/user_settings_decorator.rb
app/models/user.rb
app/serializers/initial_state_serializer.rb
app/views/stream_entries/_detailed_status.html.haml
app/views/stream_entries/_simple_status.html.haml
config/locales/simple_form.en.yml
2018-02-09 09:25:53 -06:00
26fe2c27c3
Change web UI "posts" to "toots" on profile for consistency ( #6447 )
2018-02-09 00:27:18 +01:00
219b28e172
Add preference to always display sensitive media ( #6448 )
2018-02-09 00:26:57 +01:00
98c57e4d92
Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master
2018-02-05 02:17:12 +00:00
752ccc52e8
match hashtag regex in js client with server ( #6431 )
...
the slight mismatch in hashtag regex between js and ruby was causing
hashtag warning to be displayed for unlisted tweets when an invalid
hashtag was entered
exact version of ruby regex not possible in js as POSIX bracket
expressions are not supported, this version approximates and doesn't
give same unicode support
2018-02-05 02:44:13 +01:00
4f8122a98c
Merge remote-tracking branch 'origin/master' into merge-upstream
...
Conflicts:
.env.production.sample
app/controllers/auth/confirmations_controller.rb
db/schema.rb
2018-02-04 16:36:19 -06:00
6528c0c101
Add option to show only local toots in timeline preview ( #6292 )
...
* Add option to show only local toots in timeline preview
Right know, toots from all the known fediverse are shown in the main
page of an instance. That however doesn't reflect the instance itself.
With this option the admin may choose to display only local toots so
that users checking the instance get a better idea of internal
conversations.
* Fix issues pointed by codeclimate and eslint
* Add default message for community timeline
* Update pl.yml
2018-02-04 06:00:10 +01:00
5322013f25
CAS + SAML authentication feature ( #6425 )
...
* Cas authentication feature
* Config
* Remove class_eval + Omniauth initializer
* Codeclimate review
* Codeclimate review 2
* Codeclimate review 3
* Remove uid/email reconciliation
* SAML authentication
* Clean up code
* Improve login form
* Fix code style issues
* Add locales
2018-02-04 05:42:13 +01:00
06d2bfd63f
Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master
2018-02-04 03:17:11 +00:00
0318146f16
Fix detailed-status
2018-02-04 10:35:09 +09:00
5ad806ecab
fix ColumnBackButtonSlim should extended from ColumnBackButton ( #6417 )
2018-02-03 18:41:51 +01:00
6d1023b2e9
Merge remote-tracking branch 'tootsuite/master' into merge-upstream
...
Conflicts:
app/javascript/styles/mastodon/components.scss
2018-02-02 08:39:52 -06:00
48af3df758
Fix column header button ( #6411 )
2018-02-02 13:31:28 +01:00
1cd049c57b
Set minimum height for mastodon on drawer ( #6142 )
2018-02-02 11:56:50 +01:00
180872ddd5
Remove wave from list drawer ( #6381 )
2018-02-02 10:32:41 +01:00
95da1b3351
Fix button hiding when header title is too long ( #6406 )
2018-02-01 17:17:17 +01:00
52d4b56065
Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master
2018-01-31 23:17:13 +00:00
950689c381
Russian language updated ( #6397 )
2018-02-01 07:33:54 +09:00
87517e2dd8
Merge remote-tracking branch 'origin/master' into merge-upstream
...
Conflicts:
app/views/layouts/mailer.html.haml
config/locales/ko.yml
2018-01-28 22:45:17 -06:00
602ec7b7d6
Fix padding bug in landing page column header ( #6374 )
2018-01-29 01:10:59 +01:00
f9708e4cb4
Weblate translations ( #6370 )
...
* Translated using Weblate (German)
Currently translated at 100.0% (264 of 264 strings)
Translation: Mastodon/React
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/de/
* Translated using Weblate (Norwegian (old code))
Currently translated at 100.0% (264 of 264 strings)
Translation: Mastodon/React
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/no/
* Translated using Weblate (Slovak)
Currently translated at 100.0% (56 of 56 strings)
Translation: Mastodon/Preferences
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/simple_form/sk/
* Translated using Weblate (Portuguese (Brazil))
Currently translated at 100.0% (264 of 264 strings)
Translation: Mastodon/React
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/pt_BR/
* Translated using Weblate (Arabic)
Currently translated at 100.0% (264 of 264 strings)
Translation: Mastodon/React
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/ar/
* Translated using Weblate (Arabic)
Currently translated at 69.6% (39 of 56 strings)
Translation: Mastodon/Preferences
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/simple_form/ar/
* Translated using Weblate (Japanese)
Currently translated at 100.0% (264 of 264 strings)
Translation: Mastodon/React
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/ja/
* Translated using Weblate (Portuguese (Brazil))
Currently translated at 100.0% (264 of 264 strings)
Translation: Mastodon/React
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/pt_BR/
* Translated using Weblate (Galician)
Currently translated at 100.0% (264 of 264 strings)
Translation: Mastodon/React
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/gl/
* Translated using Weblate (Arabic)
Currently translated at 67.7% (42 of 62 strings)
Translation: Mastodon/Devise
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/devise/ar/
* Translated using Weblate (Arabic)
Currently translated at 71.4% (40 of 56 strings)
Translation: Mastodon/Preferences
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/simple_form/ar/
* 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% (56 of 56 strings)
Translation: Mastodon/Preferences
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/simple_form/nl/
* Translated using Weblate (Dutch)
Currently translated at 100.0% (559 of 559 strings)
Translation: Mastodon/Backend
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/nl/
* Translated using Weblate (Dutch)
Currently translated at 100.0% (264 of 264 strings)
Translation: Mastodon/React
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/nl/
* Translated using Weblate (Dutch)
Currently translated at 100.0% (559 of 559 strings)
Translation: Mastodon/Backend
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/nl/
* Translated using Weblate (Japanese)
Currently translated at 100.0% (264 of 264 strings)
Translation: Mastodon/React
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/ja/
* Translated using Weblate (Spanish)
Currently translated at 70.9% (44 of 62 strings)
Translation: Mastodon/Devise
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/devise/es/
* Translated using Weblate (Spanish)
Currently translated at 92.1% (515 of 559 strings)
Translation: Mastodon/Backend
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/es/
* Translated using Weblate (Spanish)
Currently translated at 100.0% (264 of 264 strings)
Translation: Mastodon/React
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/es/
* Translated using Weblate (Spanish)
Currently translated at 100.0% (56 of 56 strings)
Translation: Mastodon/Preferences
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/simple_form/es/
* Translated using Weblate (Spanish)
Currently translated at 93.5% (58 of 62 strings)
Translation: Mastodon/Devise
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/devise/es/
* Translated using Weblate (French)
Currently translated at 100.0% (75 of 75 strings)
Translation: Mastodon/Doorkeeper
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/doorkeeper/fr/
* Translated using Weblate (French)
Currently translated at 99.8% (558 of 559 strings)
Translation: Mastodon/Backend
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/fr/
* Translated using Weblate (French)
Currently translated at 100.0% (264 of 264 strings)
Translation: Mastodon/React
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/fr/
* Translated using Weblate (German)
Currently translated at 89.0% (498 of 559 strings)
Translation: Mastodon/Backend
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/de/
* Translated using Weblate (Norwegian (old code))
Currently translated at 100.0% (75 of 75 strings)
Translation: Mastodon/Doorkeeper
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/doorkeeper/no/
* Translated using Weblate (Norwegian (old code))
Currently translated at 100.0% (62 of 62 strings)
Translation: Mastodon/Devise
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/devise/no/
* Translated using Weblate (Swedish)
Currently translated at 100.0% (56 of 56 strings)
Translation: Mastodon/Preferences
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/simple_form/sv/
* Translated using Weblate (Norwegian (old code))
Currently translated at 100.0% (56 of 56 strings)
Translation: Mastodon/Preferences
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/simple_form/no/
* Translated using Weblate (Hungarian)
Currently translated at 37.5% (21 of 56 strings)
Translation: Mastodon/Preferences
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/simple_form/hu/
* Translated using Weblate (German)
Currently translated at 100.0% (62 of 62 strings)
Translation: Mastodon/Devise
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/devise/de/
* Translated using Weblate (German)
Currently translated at 100.0% (62 of 62 strings)
Translation: Mastodon/Devise
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/devise/de/
* Translated using Weblate (Hungarian)
Currently translated at 100.0% (264 of 264 strings)
Translation: Mastodon/React
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/hu/
* Translated using Weblate (Norwegian (old code))
Currently translated at 100.0% (559 of 559 strings)
Translation: Mastodon/Backend
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/no/
* Translated using Weblate (Norwegian (old code))
Currently translated at 100.0% (559 of 559 strings)
Translation: Mastodon/Backend
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/no/
* Translated using Weblate (French)
Currently translated at 100.0% (264 of 264 strings)
Translation: Mastodon/React
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/fr/
* Translated using Weblate (Esperanto)
Currently translated at 93.3% (70 of 75 strings)
Translation: Mastodon/Doorkeeper
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/doorkeeper/eo/
* Translated using Weblate (Portuguese)
Currently translated at 100.0% (62 of 62 strings)
Translation: Mastodon/Devise
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/devise/pt/
* Translated using Weblate (German)
Currently translated at 90.3% (505 of 559 strings)
Translation: Mastodon/Backend
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/de/
* Translated using Weblate (Portuguese)
Currently translated at 91.4% (511 of 559 strings)
Translation: Mastodon/Backend
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/pt/
* Translated using Weblate (Spanish)
Currently translated at 100.0% (62 of 62 strings)
Translation: Mastodon/Devise
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/devise/es/
* Added translation using Weblate (Spanish)
* Translated using Weblate (Spanish)
Currently translated at 100.0% (2 of 2 strings)
Translation: Mastodon/Activerecord
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/activerecord/es/
* Translated using Weblate (French)
Currently translated at 100.0% (264 of 264 strings)
Translation: Mastodon/React
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/fr/
* Translated using Weblate (French)
Currently translated at 99.8% (558 of 559 strings)
Translation: Mastodon/Backend
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/fr/
* Translated using Weblate (Korean)
Currently translated at 100.0% (264 of 264 strings)
Translation: Mastodon/React
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/ko/
* Translated using Weblate (Korean)
Currently translated at 99.6% (557 of 559 strings)
Translation: Mastodon/Backend
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/ko/
* Translated using Weblate (Korean)
Currently translated at 100.0% (56 of 56 strings)
Translation: Mastodon/Preferences
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/simple_form/ko/
* Translated using Weblate (German)
Currently translated at 90.8% (508 of 559 strings)
Translation: Mastodon/Backend
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/de/
* Translated using Weblate (German)
Currently translated at 91.0% (509 of 559 strings)
Translation: Mastodon/Backend
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/de/
* Translated using Weblate (German)
Currently translated at 91.9% (514 of 559 strings)
Translation: Mastodon/Backend
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/de/
* Translated using Weblate (German)
Currently translated at 91.9% (514 of 559 strings)
Translation: Mastodon/Backend
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/de/
* Translated using Weblate (German)
Currently translated at 92.6% (518 of 559 strings)
Translation: Mastodon/Backend
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/de/
* Translated using Weblate (German)
Currently translated at 92.8% (519 of 559 strings)
Translation: Mastodon/Backend
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/de/
* Translated using Weblate (German)
Currently translated at 99.1% (554 of 559 strings)
Translation: Mastodon/Backend
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/de/
* Translated using Weblate (German)
Currently translated at 99.1% (554 of 559 strings)
Translation: Mastodon/Backend
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/de/
* Translated using Weblate (German)
Currently translated at 99.1% (554 of 559 strings)
Translation: Mastodon/Backend
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/de/
* Translated using Weblate (German)
Currently translated at 99.1% (554 of 559 strings)
Translation: Mastodon/Backend
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/de/
* Translated using Weblate (Spanish)
Currently translated at 100.0% (75 of 75 strings)
Translation: Mastodon/Doorkeeper
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/doorkeeper/es/
* Translated using Weblate (Norwegian (old code))
Currently translated at 100.0% (264 of 264 strings)
Translation: Mastodon/React
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/no/
* Translated using Weblate (Swedish)
Currently translated at 100.0% (56 of 56 strings)
Translation: Mastodon/Preferences
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/simple_form/sv/
* Translated using Weblate (Arabic)
Currently translated at 85.7% (48 of 56 strings)
Translation: Mastodon/Preferences
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/simple_form/ar/
* Translated using Weblate (Esperanto)
Currently translated at 90.3% (56 of 62 strings)
Translation: Mastodon/Devise
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/devise/eo/
* Translated using Weblate (Esperanto)
Currently translated at 97.3% (73 of 75 strings)
Translation: Mastodon/Doorkeeper
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/doorkeeper/eo/
* Translated using Weblate (Norwegian (old code))
Currently translated at 100.0% (559 of 559 strings)
Translation: Mastodon/Backend
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/no/
* Translated using Weblate (Finnish)
Currently translated at 25.9% (145 of 559 strings)
Translation: Mastodon/Backend
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/fi/
* Translated using Weblate (Portuguese)
Currently translated at 96.2% (538 of 559 strings)
Translation: Mastodon/Backend
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/pt/
* Translated using Weblate (Portuguese)
Currently translated at 100.0% (264 of 264 strings)
Translation: Mastodon/React
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/pt/
* Translated using Weblate (Portuguese)
Currently translated at 92.8% (52 of 56 strings)
Translation: Mastodon/Preferences
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/simple_form/pt/
* Translated using Weblate (Esperanto)
Currently translated at 100.0% (264 of 264 strings)
Translation: Mastodon/React
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/eo/
* Translated using Weblate (Spanish)
Currently translated at 100.0% (264 of 264 strings)
Translation: Mastodon/React
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/es/
* Translated using Weblate (Spanish)
Currently translated at 100.0% (62 of 62 strings)
Translation: Mastodon/Devise
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/devise/es/
* Translated using Weblate (Spanish)
Currently translated at 100.0% (56 of 56 strings)
Translation: Mastodon/Preferences
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/simple_form/es/
* Translated using Weblate (Spanish)
Currently translated at 99.4% (556 of 559 strings)
Translation: Mastodon/Backend
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/es/
* Translated using Weblate (Portuguese (Brazil))
Currently translated at 100.0% (62 of 62 strings)
Translation: Mastodon/Devise
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/devise/pt_BR/
* Translated using Weblate (Esperanto)
Currently translated at 87.5% (49 of 56 strings)
Translation: Mastodon/Preferences
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/simple_form/eo/
* Translated using Weblate (Portuguese (Brazil))
Currently translated at 99.8% (558 of 559 strings)
Translation: Mastodon/Backend
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/pt_BR/
* Translated using Weblate (Slovak)
Currently translated at 59.7% (334 of 559 strings)
Translation: Mastodon/Backend
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/sk/
* Translated using Weblate (Portuguese (Brazil))
Currently translated at 100.0% (264 of 264 strings)
Translation: Mastodon/React
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/pt_BR/
* Translated using Weblate (Slovak)
Currently translated at 100.0% (264 of 264 strings)
Translation: Mastodon/React
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/sk/
* Translated using Weblate (French)
Currently translated at 100.0% (56 of 56 strings)
Translation: Mastodon/Preferences
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/simple_form/fr/
* Translated using Weblate (Korean)
Currently translated at 100.0% (264 of 264 strings)
Translation: Mastodon/React
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/ko/
* Translated using Weblate (Korean)
Currently translated at 99.8% (558 of 559 strings)
Translation: Mastodon/Backend
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/ko/
* Translated using Weblate (Korean)
Currently translated at 100.0% (56 of 56 strings)
Translation: Mastodon/Preferences
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/simple_form/ko/
* Translated using Weblate (German)
Currently translated at 99.1% (554 of 559 strings)
Translation: Mastodon/Backend
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/de/
* Translated using Weblate (German)
Currently translated at 99.1% (554 of 559 strings)
Translation: Mastodon/Backend
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/de/
* Translated using Weblate (German)
Currently translated at 99.1% (554 of 559 strings)
Translation: Mastodon/Backend
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/de/
* Translated using Weblate (German)
Currently translated at 99.2% (555 of 559 strings)
Translation: Mastodon/Backend
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/de/
* Translated using Weblate (Hungarian)
Currently translated at 67.9% (380 of 559 strings)
Translation: Mastodon/Backend
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/hu/
* Translated using Weblate (Hungarian)
Currently translated at 72.2% (404 of 559 strings)
Translation: Mastodon/Backend
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/hu/
Sajnos nem találtam magyar megfelelőt
* Translated using Weblate (Hungarian)
Currently translated at 96.0% (537 of 559 strings)
Translation: Mastodon/Backend
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/hu/
* Translated using Weblate (Hungarian)
Currently translated at 66.0% (37 of 56 strings)
Translation: Mastodon/Preferences
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/simple_form/hu/
* Translated using Weblate (Catalan)
Currently translated at 99.8% (558 of 559 strings)
Translation: Mastodon/Backend
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/ca/
* Translated using Weblate (Finnish)
Currently translated at 83.9% (47 of 56 strings)
Translation: Mastodon/Preferences
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/simple_form/fi/
* Translated using Weblate (Catalan)
Currently translated at 100.0% (264 of 264 strings)
Translation: Mastodon/React
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/ca/
* Translated using Weblate (Catalan)
Currently translated at 100.0% (56 of 56 strings)
Translation: Mastodon/Preferences
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/simple_form/ca/
* Translated using Weblate (Hungarian)
Currently translated at 100.0% (264 of 264 strings)
Translation: Mastodon/React
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/hu/
* Translated using Weblate (Swedish)
Currently translated at 100.0% (264 of 264 strings)
Translation: Mastodon/React
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/sv/
* Translated using Weblate (Swedish)
Currently translated at 100.0% (75 of 75 strings)
Translation: Mastodon/Doorkeeper
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/doorkeeper/sv/
* Translated using Weblate (Swedish)
Currently translated at 100.0% (559 of 559 strings)
Translation: Mastodon/Backend
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/sv/
* Translated using Weblate (Hungarian)
Currently translated at 100.0% (264 of 264 strings)
Translation: Mastodon/React
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/hu/
* Translated using Weblate (Hungarian)
Currently translated at 100.0% (264 of 264 strings)
Translation: Mastodon/React
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/hu/
* Translated using Weblate (Hungarian)
Currently translated at 100.0% (264 of 264 strings)
Translation: Mastodon/React
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/hu/
* Translated using Weblate (Hungarian)
Currently translated at 100.0% (264 of 264 strings)
Translation: Mastodon/React
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/hu/
* Translated using Weblate (Hungarian)
Currently translated at 100.0% (264 of 264 strings)
Translation: Mastodon/React
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/hu/
* Translated using Weblate (Hungarian)
Currently translated at 100.0% (264 of 264 strings)
Translation: Mastodon/React
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/hu/
* Translated using Weblate (Hungarian)
Currently translated at 96.9% (542 of 559 strings)
Translation: Mastodon/Backend
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/hu/
* Translated using Weblate (Hungarian)
Currently translated at 100.0% (264 of 264 strings)
Translation: Mastodon/React
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/hu/
* Translated using Weblate (Japanese)
Currently translated at 100.0% (264 of 264 strings)
Translation: Mastodon/React
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/ja/
* Translated using Weblate (Esperanto)
Currently translated at 60.2% (337 of 559 strings)
Translation: Mastodon/Backend
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/eo/
* Translated using Weblate (Esperanto)
Currently translated at 100.0% (264 of 264 strings)
Translation: Mastodon/React
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/eo/
[eo] Tiu parto de la frazo jam estas tradukita aliloke ☺
* Translated using Weblate (Slovak)
Currently translated at 60.8% (340 of 559 strings)
Translation: Mastodon/Backend
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/sk/
* Translated using Weblate (Slovak)
Currently translated at 100.0% (264 of 264 strings)
Translation: Mastodon/React
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/sk/
* Translated using Weblate (Slovak)
Currently translated at 70.9% (44 of 62 strings)
Translation: Mastodon/Devise
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/devise/sk/
* Translated using Weblate (Slovak)
Currently translated at 100.0% (75 of 75 strings)
Translation: Mastodon/Doorkeeper
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/doorkeeper/sk/
* Translated using Weblate (Slovak)
Currently translated at 100.0% (56 of 56 strings)
Translation: Mastodon/Preferences
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/simple_form/sk/
* Normalize translations
Ran i18n-tasks normalize && yarn manage:translations
* Add back translations weblate removed
2018-01-28 22:48:09 +09:00
1eaa2ead85
l10n Occitan update ( #6367 )
...
* Final point missing
+ s'acabar => expirar
* Update oc.yml
* Update oc.json
2018-01-27 08:51:03 +09:00
3cd4a0804b
Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master
2018-01-24 19:17:11 +00:00
073f4309a5
Fix initial_state me in push_notification_register ( #6349 )
2018-01-24 14:37:46 +01:00
83a68aa224
Fix hide and show media button on admin page ( #6347 )
2018-01-24 13:29:46 +01:00
cd18b23226
l10n Occitan language update ( #6346 )
...
* Small changes
* update for email templates
* Digest changed
* Update oc.yml
waiting to finish
* Update oc.yml
* Update oc.yml
* Update oc.yml
* Update oc.json
2018-01-24 13:29:03 +01:00
6661ae14b0
Fix style of legacy column headers ( #6342 )
...
* Fix regression from #6199 : Style of legacy column headers
* Fix tests
* Clean up variables
2018-01-24 04:03:51 +01:00
876c20ad92
Fix e-mail icon for reblog being stretched ( #6336 )
2018-01-23 14:30:28 +01:00
810312213a
Remove some leftover code, I guess
2018-01-23 09:20:18 +01:00
4cf5144099
Fix regression from #6199 : Make entire column header clickable ( #6334 )
2018-01-23 05:06:29 +01:00
11f970da4d
Weblate translations ( #6323 )
...
* 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 (Dutch)
Currently translated at 100.0% (543 of 543 strings)
Translation: Mastodon/Backend
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/nl/
* Translated using Weblate (Galician)
Currently translated at 100.0% (62 of 62 strings)
Translation: Mastodon/Devise
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/devise/gl/
* Translated using Weblate (Galician)
Currently translated at 100.0% (543 of 543 strings)
Translation: Mastodon/Backend
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/gl/
* Translated using Weblate (Galician)
Currently translated at 100.0% (260 of 260 strings)
Translation: Mastodon/React
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/gl/
* Translated using Weblate (Galician)
Currently translated at 100.0% (260 of 260 strings)
Translation: Mastodon/React
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/gl/
* Translated using Weblate (Portuguese (Brazil))
Currently translated at 100.0% (62 of 62 strings)
Translation: Mastodon/Devise
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/devise/pt_BR/
* Translated using Weblate (Catalan)
Currently translated at 95.2% (517 of 543 strings)
Translation: Mastodon/Backend
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/ca/
* Translated using Weblate (Catalan)
Currently translated at 99.6% (259 of 260 strings)
Translation: Mastodon/React
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/ca/
* Translated using Weblate (Dutch)
Currently translated at 97.1% (543 of 559 strings)
Translation: Mastodon/Backend
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/nl/
* Translated using Weblate (Galician)
Currently translated at 100.0% (559 of 559 strings)
Translation: Mastodon/Backend
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/gl/
* Translated using Weblate (Japanese)
Currently translated at 99.1% (554 of 559 strings)
Translation: Mastodon/Backend
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/ja/
* Translated using Weblate (French)
Currently translated at 100.0% (260 of 260 strings)
Translation: Mastodon/React
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/fr/
* Translated using Weblate (French)
Currently translated at 100.0% (260 of 260 strings)
Translation: Mastodon/React
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/fr/
* Translated using Weblate (French)
Currently translated at 100.0% (260 of 260 strings)
Translation: Mastodon/React
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/fr/
* Translated using Weblate (Portuguese (Brazil))
Currently translated at 99.8% (558 of 559 strings)
Translation: Mastodon/Backend
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/pt_BR/
* Translated using Weblate (Polish)
Currently translated at 99.8% (558 of 559 strings)
Translation: Mastodon/Backend
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/pl/
* Translated using Weblate (Catalan)
Currently translated at 94.6% (529 of 559 strings)
Translation: Mastodon/Backend
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/ca/
* Translated using Weblate (Catalan)
Currently translated at 95.3% (533 of 559 strings)
Translation: Mastodon/Backend
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/ca/
* Translated using Weblate (Dutch)
Currently translated at 98.2% (55 of 56 strings)
Translation: Mastodon/Preferences
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/simple_form/nl/
* Translated using Weblate (Dutch)
Currently translated at 100.0% (260 of 260 strings)
Translation: Mastodon/React
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/nl/
* Translated using Weblate (Dutch)
Currently translated at 98.3% (550 of 559 strings)
Translation: Mastodon/Backend
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/nl/
* Translated using Weblate (Catalan)
Currently translated at 95.3% (533 of 559 strings)
Translation: Mastodon/Backend
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/ca/
* Translated using Weblate (Japanese)
Currently translated at 0.0% (0 of 56 strings)
Translation: Mastodon/Preferences
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/simple_form/ja/
* Translated using Weblate (Japanese)
Currently translated at 1.7% (1 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% (260 of 260 strings)
Translation: Mastodon/React
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/ja/
* Translated using Weblate (Japanese)
Currently translated at 1.7% (52 of 56 strings)
Translation: Mastodon/Preferences
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/simple_form/ja/
* Translated using Weblate (Japanese)
Currently translated at 99.8% (558 of 559 strings)
Translation: Mastodon/Backend
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/ja/
* Translated using Weblate (Japanese)
Currently translated at 99.8% (558 of 559 strings)
Translation: Mastodon/Backend
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/ja/
* Translated using Weblate (Galician)
Currently translated at 100.0% (261 of 261 strings)
Translation: Mastodon/React
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/gl/
* Translated using Weblate (Galician)
Currently translated at 100.0% (261 of 261 strings)
Translation: Mastodon/React
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/gl/
* Translated using Weblate (Polish)
Currently translated at 100.0% (261 of 261 strings)
Translation: Mastodon/React
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/pl/
* Translated using Weblate (Catalan)
Currently translated at 99.6% (260 of 261 strings)
Translation: Mastodon/React
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/ca/
* Translated using Weblate (Japanese)
Currently translated at 99.6% (260 of 261 strings)
Translation: Mastodon/React
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/ja/
* Translated using Weblate (Japanese)
Currently translated at 99.8% (558 of 559 strings)
Translation: Mastodon/Backend
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/ja/
* Translated using Weblate (Japanese)
Currently translated at 99.6% (260 of 261 strings)
Translation: Mastodon/React
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/ja/
* Translated using Weblate (French)
Currently translated at 100.0% (62 of 62 strings)
Translation: Mastodon/Devise
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/devise/fr/
* Translated using Weblate (French)
Currently translated at 100.0% (62 of 62 strings)
Translation: Mastodon/Devise
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/devise/fr/
* Translated using Weblate (French)
Currently translated at 100.0% (261 of 261 strings)
Translation: Mastodon/React
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/fr/
* Translated using Weblate (French)
Currently translated at 100.0% (261 of 261 strings)
Translation: Mastodon/React
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/fr/
* Translated using Weblate (French)
Currently translated at 99.2% (555 of 559 strings)
Translation: Mastodon/Backend
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/fr/
* Translated using Weblate (French)
Currently translated at 99.8% (558 of 559 strings)
Translation: Mastodon/Backend
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/fr/
* Translated using Weblate (French)
Currently translated at 100.0% (62 of 62 strings)
Translation: Mastodon/Devise
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/devise/fr/
* Translated using Weblate (French)
Currently translated at 100.0% (261 of 261 strings)
Translation: Mastodon/React
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/fr/
* Normalize translations
Ran i18n-tasks normalize && yarn manage:translations
* Add back values removed by weblate
2018-01-22 14:20:58 +01:00
db052e79ad
Merge remote-tracking branch 'origin/master' into merge-upstream-20180121
2018-01-21 16:26:50 -06:00
62e47f7041
armenian translations initial commit ( #6320 )
...
* adding armenian translations
* updating config files for armenian translations
* armenian translation fix
* fixing spaces
2018-01-22 05:02:23 +09:00
a95ca95b7b
Merge remote-tracking branch 'origin/master' into merge-upstream
...
Conflicts:
app/controllers/settings/two_factor_authentication/confirmations_controller.rb
2018-01-21 13:36:10 -06:00
4d15390eb6
fix filter search index being too strict when looking for line breaks ( #6318 )
2018-01-21 13:23:17 +01:00
4ee27e1630
Display number of follow requests in getting started menu, and ( #6313 )
...
if notifications column is not mounted, also display number of
unread notifications there.
2018-01-21 13:20:20 +01:00
8354cca2fa
Merge pull request #336 from ThibG/glitch-soc/features/tag-warning
...
Display a warning when composing unlisted toots with something looking like a hashtag
2018-01-20 16:37:52 -06:00
6b4f90e5fb
Merge pull request #342 from glitch-soc/merge-upstream
...
Merge upstream
2018-01-20 16:37:35 -06:00
75dac5d056
Merge new onboarding styles; delete refs to PNGs.
2018-01-20 11:23:06 -06:00
0f703fe455
Eliminate stray conflict markers.
2018-01-20 10:46:43 -06:00
03f157f6da
Merge remote-tracking branch 'origin/master' into merge-upstream
...
Conflicts:
app/javascript/styles/mastodon/components.scss
2018-01-20 10:45:43 -06:00
d26ae4a147
Update Simplified Chinese translations ( #6306 )
...
* i18n: (zh-CN) Add translations of #6251
* i18n: (zh-CN) Improve translations for #6291
* Fix en.json
* i18n: (zh-CN) Update translations for #6303
* i18n: (zh-CN) Add translations of #6273
with minor adjustment
* Minor fix
* Minor fix
2018-01-21 00:11:21 +09:00
adb0b4a59a
Restore onboarding modal ( #6303 )
...
* Restore onboarding modal
Revert 5ba8b3a396895ecec083c5258aaf9084d584a7c4
* Change greeting elephant graphic, fix up some design issues
* Fix wrong link color in onboarding modal
2018-01-20 01:32:37 +01:00
896cadceed
Improve HTML e-mails based on Litmus tests ( #6301 )
...
* Use PNG images in HTML e-mails
* Make webpack use URLs with host so fonts load inside HTML e-mails
Convert this back to a relative URL in the premailer CSS loader
since local requests are quicker
* Improve responsive design
* Add missing PNG icon
2018-01-20 01:32:21 +01:00
d45ebe26dc
Merge remote-tracking branch 'origin/master' into merge-upstream
...
Conflicts:
app/javascript/styles/mastodon/components.scss
app/javascript/styles/mastodon/modal.scss
2018-01-19 15:22:10 -06:00
12edfead8e
Do not discard statuses obtained via websocket when API request finishes
...
This backports 0b888acfd4
2018-01-19 21:59:12 +01:00
1e6d392ff5
Do not throw away statuses obtained via websocket when API request finishes ( #6302 )
2018-01-19 21:48:00 +01:00
5daf5f2c57
Replace drawer elephant graphic with a vector image ( #6286 )
...
* Replace drawer elephant graphic with a vector image
* Replace wave graphic with SVG
* Remove unused elephant graphic
2018-01-19 15:25:27 +01:00
41c1e5533e
Display a warning when composing unlisted toots with something looking like a hashtag
...
This is a backport of b42cdedfc3
2018-01-19 12:59:33 +01:00
477fbec714
Merge pull request #332 from glitch-soc/merge-upstream
...
Merge in home feed regeneration changes from upstream
2018-01-18 22:00:11 -06:00
b0f2bff481
Replace tutorial modal with welcome e-mail ( #6273 )
...
* Remove onboarding modal
* Welcome e-mail
* Send welcome e-mail after confirmation
* Remove obsolete translations
2018-01-18 19:17:25 +01:00
011d6011f9
Strip trailing whitespace on win95.scss
2018-01-18 10:54:50 -06:00
fc20361bbe
Merge remote-tracking branch 'cybrespace/theme_win95' into win95-update
...
Conflicts:
app/javascript/styles/win95.scss
config/themes.yml
2018-01-18 10:54:12 -06:00
14fffe6e88
Use absolute paths for new working/not-found SVGs
...
This allows these component styles to be used in i.e. the win95 skin.
2018-01-18 10:25:54 -06:00
2a201c2ec6
Port 9cfbbbce1f to glitch frontend
2018-01-18 10:25:37 -06:00
d0e525c463
Merge branch 'gs-master' into merge-upstream
2018-01-18 09:14:28 -06:00
dfcee78446
Style fixes to make eslint happier, hopefully
2018-01-18 09:13:07 -06:00
b1155460ba
Merge remote-tracking branch 'origin/master' into merge-upstream
...
Conflicts:
app/javascript/styles/mastodon/components.scss
2018-01-17 18:37:09 -06:00
9cfbbbce1f
Fix home regeneration ( #6251 )
...
* Fix regeneration marker not being removed after completion
* Return HTTP 206 from /api/v1/timelines/home if regeneration in progress
Prioritize RegenerationWorker by putting it into default queue
* Display loading indicator and poll home timeline while it regenerates
* Add graphic to regeneration message
* Make "not found" indicator consistent with home regeneration
2018-01-17 23:56:03 +01:00
4f86722a65
Weblate translations ( #6284 )
...
* Translated using Weblate (French)
Currently translated at 100.0% (56 of 56 strings)
Translation: Mastodon/Preferences
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/simple_form/fr/
* Translated using Weblate (Catalan)
Currently translated at 100.0% (56 of 56 strings)
Translation: Mastodon/Preferences
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/simple_form/ca/
* Translated using Weblate (Portuguese (Brazil))
Currently translated at 100.0% (260 of 260 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% (45 of 45 strings)
Translation: Mastodon/Devise
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/devise/pt_BR/
* Translated using Weblate (Dutch)
Currently translated at 100.0% (529 of 529 strings)
Translation: Mastodon/Backend
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/nl/
* Translated using Weblate (Dutch)
Currently translated at 100.0% (45 of 45 strings)
Translation: Mastodon/Devise
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/devise/nl/
* Translated using Weblate (Galician)
Currently translated at 100.0% (529 of 529 strings)
Translation: Mastodon/Backend
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/gl/
* Translated using Weblate (Galician)
Currently translated at 100.0% (45 of 45 strings)
Translation: Mastodon/Devise
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/devise/gl/
* Translated using Weblate (Portuguese (Brazil))
Currently translated at 99.6% (527 of 529 strings)
Translation: Mastodon/Backend
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/pt_BR/
* Translated using Weblate (Portuguese (Brazil))
Currently translated at 99.8% (528 of 529 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% (45 of 45 strings)
Translation: Mastodon/Devise
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/devise/pt_BR/
* Translated using Weblate (Portuguese (Brazil))
Currently translated at 100.0% (260 of 260 strings)
Translation: Mastodon/React
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/pt_BR/
* Translated using Weblate (Slovak)
Currently translated at 100.0% (56 of 56 strings)
Translation: Mastodon/Preferences
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/simple_form/sk/
* Translated using Weblate (Slovak)
Currently translated at 37.2% (197 of 529 strings)
Translation: Mastodon/Backend
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/sk/
* Translated using Weblate (Slovak)
Currently translated at 100.0% (260 of 260 strings)
Translation: Mastodon/React
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/sk/
* Translated using Weblate (Russian)
Currently translated at 99.0% (526 of 531 strings)
Translation: Mastodon/Backend
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/ru/
* Translated using Weblate (Catalan)
Currently translated at 100.0% (45 of 45 strings)
Translation: Mastodon/Devise
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/devise/ca/
* Translated using Weblate (Catalan)
Currently translated at 99.8% (530 of 531 strings)
Translation: Mastodon/Backend
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/ca/
* Translated using Weblate (Japanese)
Currently translated at 92.8% (52 of 56 strings)
Translation: Mastodon/Preferences
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/simple_form/ja/
* Translated using Weblate (Japanese)
Currently translated at 75.8% (47 of 62 strings)
Translation: Mastodon/Devise
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/devise/ja/
* Translated using Weblate (Polish)
Currently translated at 77.4% (48 of 62 strings)
Translation: Mastodon/Devise
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/devise/pl/
* Translated using Weblate (Slovak)
Currently translated at 38.3% (204 of 532 strings)
Translation: Mastodon/Backend
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/sk/
* Translated using Weblate (Japanese)
Currently translated at 100.0% (62 of 62 strings)
Translation: Mastodon/Devise
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/devise/ja/
* Translated using Weblate (Catalan)
Currently translated at 100.0% (62 of 62 strings)
Translation: Mastodon/Devise
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/devise/ca/
* Translated using Weblate (Polish)
Currently translated at 100.0% (62 of 62 strings)
Translation: Mastodon/Devise
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/devise/pl/
* Translated using Weblate (Polish)
Currently translated at 100.0% (75 of 75 strings)
Translation: Mastodon/Doorkeeper
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/doorkeeper/pl/
* Translated using Weblate (Polish)
Currently translated at 100.0% (62 of 62 strings)
Translation: Mastodon/Devise
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/devise/pl/
* Translated using Weblate (Polish)
Currently translated at 100.0% (56 of 56 strings)
Translation: Mastodon/Preferences
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/simple_form/pl/
* Translated using Weblate (Russian)
Currently translated at 96.8% (525 of 542 strings)
Translation: Mastodon/Backend
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/ru/
* Translated using Weblate (Japanese)
Currently translated at 99.0% (537 of 542 strings)
Translation: Mastodon/Backend
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/ja/
* Translated using Weblate (Polish)
Currently translated at 99.8% (541 of 542 strings)
Translation: Mastodon/Backend
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/pl/
* Translated using Weblate (Japanese)
Currently translated at 99.0% (538 of 543 strings)
Translation: Mastodon/Backend
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/ja/
* Translated using Weblate (Dutch)
Currently translated at 97.4% (529 of 543 strings)
Translation: Mastodon/Backend
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/nl/
* Normalize translations
Ran i18n-tasks normalize && yarn manage:translations
2018-01-18 07:00:23 +09:00
8c41fb4acc
Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master
2018-01-17 16:17:10 +00:00
ea55e437f7
Upgrade ESLint to version 4.x ( #6276 )
2018-01-17 16:57:15 +01:00
350f65a6ef
Update Simplified Chinese translations ( #6280 )
...
* i18n: (zh-CN) Update translation for #6252
* e-mail -> email
* i18n: (zh-CN) Update translations for #6256
* i18n: (zh-CN) Minor Improvements
* i18n: (zh-CN) Update translations for #6263
* i18n: (zh-CN) Update translations for #6279
2018-01-17 16:47:25 +01:00
Eugen Rochko