91582937f3
Fix crash when switching back/from mobile layout ( #11655 )
...
Fixes #11630
2019-08-25 15:49:02 +02:00
bd4099d976
Change window resize handler to switch to/from mobile layout as soon as needed ( #11656 )
2019-08-25 15:48:50 +02:00
2e99e3cab3
Fix more visual issues with the audio player ( #11654 )
...
* Fix more visual issues with the audio player
- Add horizontal baseline in the middle of waveform
- Fix audio player colors in light theme
- Use audio element instead of web audio API
- Do not render any bars until the file is loaded
- Do not allow interactions with waveform until the file is loaded
* Fix code style issue
2019-08-25 15:09:19 +02:00
e72bac7576
Fix public page crash due to audio player, fix unpause in audio player ( #11652 )
2019-08-25 02:13:40 +02:00
aa6b5b42df
Fix slow local timeline query ( #11648 )
...
Fix #11643
2019-08-24 04:12:27 +02:00
4190e31626
Add audio player ( #11644 )
2019-08-23 22:38:02 +02:00
73ca0bb925
Add option to include reported statuses in warning e-mail ( #11639 )
2019-08-23 22:37:23 +02:00
37f612074e
Fix items in StatusContent render list not all having a key ( #11645 )
2019-08-23 21:02:59 +02:00
4ef8d8b77c
Add header to trends section and change refresh rate to 15 minutes ( #11641 )
2019-08-23 05:05:21 +02:00
282ea17078
Add soft delete for statuses for instant deletes through API ( #11623 )
...
* Add soft delete for statuses to allow them to appear instant
* Allow reporting soft-deleted statuses and show them in the admin UI
* Change index for getting an account's statuses
2019-08-22 21:55:56 +02:00
5ab1e0e738
Restore hashtag suggestions from local tag history ( #11632 )
...
* Restore hashtag suggestions from local tag history
* Append local hashtag suggestions instead of prepending them
* Do not display inaccurate usage statistics for hashtags not retrieved from API
* Fixup
2019-08-22 04:37:18 +02:00
97192d9a77
Fix remote and staff-removed statuses leaving media behind for a day ( #11638 )
...
The reason for unattaching media instead of removing it is to support
delete & redraft functionality, but remote or staff-removed statuses
will never be redrafted, so the media should be deleted immediately
2019-08-22 04:17:12 +02:00
e9c3d1ef46
Fix the whitelist mode display not being enabled in the admin dashboard ( #11634 )
2019-08-21 12:35:40 +02:00
d857d0d14d
Fix trending hashtags being fetched every 36 seconds instead of every hour ( #11631 )
2019-08-21 00:18:07 +02:00
284a1562fb
Fix typo
2019-08-20 21:44:09 +02:00
317fa43d9a
Add support for <sup> formatting element
...
This is based of 3e095cab83https://git.pleroma.social/pleroma/pleroma/issues/1191
2019-08-20 21:44:09 +02:00
da7e0d4f55
Merge pull request #1200 from ThibG/glitch-soc/merge-upstream
...
Merge upstream changes
2019-08-20 21:33:57 +02:00
f1528ea3c4
[Glitch] Fix handling of audio files in account media gallery
...
Port b48c7ee059
2019-08-20 20:38:42 +02:00
81d2d71094
Merge branch 'master' into glitch-soc/merge-upstream
2019-08-20 20:30:44 +02:00
b48c7ee059
Fix handling of audio files in account media gallery ( #11629 )
...
Fixes #11627
2019-08-20 19:46:41 +02:00
bce46f2057
Merge pull request #1199 from ThibG/glitch-soc/merge-upstream
...
Merge upstream changes
2019-08-20 12:09:11 +02:00
fae9e34484
Add button to edit media description from missing description confirmation dialog
2019-08-20 11:33:35 +02:00
dff4ccd7e9
Remove code for giving focus to first media without description
...
Since the textarea is in a modal, now…
2019-08-20 10:55:03 +02:00
df150da435
Merge branch 'master' into glitch-soc/merge-upstream
...
Conflicts:
- config/initializers/content_security_policy.rb
(took our version)
2019-08-20 10:33:24 +02:00
97af209c31
Revert "Bump react-redux-loading-bar from 4.0.8 to 4.4.0 ( #11609 )" ( #11625 )
...
This reverts commit 2e44b81166
2019-08-20 02:19:01 +02:00
1d40325e7c
Fix composer options colors in glitch-soc light theme
2019-08-19 22:18:43 +02:00
9e17f9e95a
Fix connect-src policy for Tesseract
2019-08-19 22:02:35 +02:00
f00a0f35ee
Use public pack in about controller to handle blockpage JS
2019-08-19 21:56:25 +02:00
a334cbcb20
Move character counter to the options box to match upstream styling
2019-08-19 21:56:25 +02:00
ed4317b549
[Glitch] Fix hidden statuses losing focus
...
Port 0d13a9cd13
2019-08-19 21:56:25 +02:00
ab0961fe9a
[Glitch] Improve focal point modal on mobile
...
Port 2ca6b2bb6c
2019-08-19 21:56:25 +02:00
fcd2244015
[Glitch] Allow clicking behind preview
...
Port d37126fd03
2019-08-19 21:56:25 +02:00
91d968bf72
[Glitch] Fix edit media modal on small screens, touch events
...
Port 1bea318197
2019-08-19 21:56:25 +02:00
5c35c9c409
[Glitch] Fix tesseract.js being part of the common chunk
...
Port dfe6059889
2019-08-19 21:56:25 +02:00
41c7fec796
[Glitch] Add OCR tool to media editing modal
...
Port 28636f43e4
2019-08-19 21:56:25 +02:00
066034c62e
Refactor character counter to match upstream
2019-08-19 21:56:25 +02:00
ab019800f8
[Glitch] Add media editing modal
...
Port 23f7afa562
2019-08-19 21:56:25 +02:00
f8e7c69861
[Glitch] Add explanation to featured hashtags page and profile
...
Port SCSS changes from b348c9b0db
2019-08-19 21:56:25 +02:00
5971ea7466
[Glitch] Add public blocks to /about/blocks
...
Port SCSS changes from 9b6a5ed109
2019-08-19 21:56:25 +02:00
4e9794f533
[Glitch] Fix client-side resizing of image uploads
...
Port f178a01c11
2019-08-19 21:49:39 +02:00
26b249ad2d
[Glitch] Fix short number formatting for numbers above million in web UI
...
Port 0e9668051e
2019-08-19 21:49:39 +02:00
1488be7d96
Merge branch 'master' into glitch-soc/merge-upstream
...
Conflicts:
- app/controllers/home_controller.rb
- app/controllers/shares_controller.rb
- app/javascript/packs/public.js
- app/models/status.rb
- app/serializers/initial_state_serializer.rb
- app/views/home/index.html.haml
- app/views/layouts/public.html.haml
- app/views/public_timelines/show.html.haml
- app/views/shares/show.html.haml
- app/views/tags/show.html.haml
- config/initializers/content_security_policy.rb
- config/locales/en.yml
- config/webpack/shared.js
- package.json
2019-08-19 21:49:35 +02:00
8203e24cf4
Fix CSP needlessly allowing blob URLs in script-src ( #11620 )
2019-08-19 20:36:58 +02:00
dff46b260b
Fix ignoring whole status because of one invalid hashtag ( #11621 )
...
Fix #11618
2019-08-19 20:36:44 +02:00
d22f3a7d51
New Crowdin translations ( #11596 )
...
* New translations en.yml (Czech)
[ci skip]
* New translations simple_form.en.yml (Arabic)
[ci skip]
* New translations simple_form.en.yml (Croatian)
[ci skip]
* New translations simple_form.en.yml (Corsican)
[ci skip]
* New translations simple_form.en.yml (Chinese Traditional, Hong Kong)
[ci skip]
* New translations simple_form.en.yml (Chinese Traditional)
[ci skip]
* New translations simple_form.en.yml (Chinese Simplified)
[ci skip]
* New translations simple_form.en.yml (Catalan)
[ci skip]
* New translations simple_form.en.yml (Bulgarian)
[ci skip]
* New translations simple_form.en.yml (Basque)
[ci skip]
* New translations simple_form.en.yml (Asturian)
[ci skip]
* New translations simple_form.en.yml (Albanian)
[ci skip]
* New translations en.yml (Croatian)
[ci skip]
* New translations en.yml (Corsican)
[ci skip]
* New translations en.yml (Albanian)
[ci skip]
* New translations en.yml (Arabic)
[ci skip]
* New translations en.yml (Armenian)
[ci skip]
* New translations en.yml (Asturian)
[ci skip]
* New translations en.yml (Basque)
[ci skip]
* New translations en.yml (Bulgarian)
[ci skip]
* New translations en.yml (Catalan)
[ci skip]
* New translations en.yml (Chinese Simplified)
[ci skip]
* New translations en.yml (Chinese Traditional)
[ci skip]
* New translations en.yml (Chinese Traditional, Hong Kong)
[ci skip]
* New translations en.yml (Bengali)
[ci skip]
* New translations en.yml (Indonesian)
[ci skip]
* New translations simple_form.en.yml (Indonesian)
[ci skip]
* New translations simple_form.en.yml (Korean)
[ci skip]
* New translations simple_form.en.yml (Japanese)
[ci skip]
* New translations simple_form.en.yml (Italian)
[ci skip]
* New translations simple_form.en.yml (Ido)
[ci skip]
* New translations simple_form.en.yml (Occitan)
[ci skip]
* New translations simple_form.en.yml (Hungarian)
[ci skip]
* New translations simple_form.en.yml (Hebrew)
[ci skip]
* New translations simple_form.en.yml (Greek)
[ci skip]
* New translations simple_form.en.yml (German)
[ci skip]
* New translations simple_form.en.yml (Georgian)
[ci skip]
* New translations simple_form.en.yml (Galician)
[ci skip]
* New translations simple_form.en.yml (French)
[ci skip]
* New translations simple_form.en.yml (Finnish)
[ci skip]
* New translations simple_form.en.yml (Norwegian)
[ci skip]
* New translations simple_form.en.yml (Persian)
[ci skip]
* New translations simple_form.en.yml (Dutch)
[ci skip]
* New translations simple_form.en.yml (Swedish)
[ci skip]
* New translations en.yml (Estonian)
[ci skip]
* New translations simple_form.en.yml (Welsh)
[ci skip]
* New translations simple_form.en.yml (Ukrainian)
[ci skip]
* New translations simple_form.en.yml (Turkish)
[ci skip]
* New translations simple_form.en.yml (Thai)
[ci skip]
* New translations simple_form.en.yml (Spanish)
[ci skip]
* New translations simple_form.en.yml (Polish)
[ci skip]
* New translations simple_form.en.yml (Slovenian)
[ci skip]
* New translations simple_form.en.yml (Slovak)
[ci skip]
* New translations simple_form.en.yml (Serbian (Latin))
[ci skip]
* New translations simple_form.en.yml (Serbian (Cyrillic))
[ci skip]
* New translations simple_form.en.yml (Russian)
[ci skip]
* New translations simple_form.en.yml (Romanian)
[ci skip]
* New translations simple_form.en.yml (Portuguese, Brazilian)
[ci skip]
* New translations simple_form.en.yml (Portuguese)
[ci skip]
* New translations simple_form.en.yml (Esperanto)
[ci skip]
* New translations simple_form.en.yml (Danish)
[ci skip]
* New translations en.yml (Italian)
[ci skip]
* New translations en.yml (Polish)
[ci skip]
* New translations en.yml (Slovak)
[ci skip]
* New translations en.yml (Serbian (Latin))
[ci skip]
* New translations en.yml (Serbian (Cyrillic))
[ci skip]
* New translations en.yml (Russian)
[ci skip]
* New translations en.yml (Romanian)
[ci skip]
* New translations en.yml (Portuguese, Brazilian)
[ci skip]
* New translations en.yml (Portuguese)
[ci skip]
* New translations en.yml (Persian)
[ci skip]
* New translations en.yml (Spanish)
[ci skip]
* New translations en.yml (Occitan)
[ci skip]
* New translations en.yml (Norwegian)
[ci skip]
* New translations en.yml (Malay)
[ci skip]
* New translations en.yml (Lithuanian)
[ci skip]
* New translations en.yml (Latvian)
[ci skip]
* New translations en.yml (Korean)
[ci skip]
* New translations en.yml (Kazakh)
[ci skip]
* New translations en.yml (Japanese)
[ci skip]
* New translations en.yml (Slovenian)
[ci skip]
* New translations en.yml (Swedish)
[ci skip]
* New translations en.yml (Dutch)
[ci skip]
* New translations en.yml (Greek)
[ci skip]
* New translations en.yml (Esperanto)
[ci skip]
* New translations en.yml (Finnish)
[ci skip]
* New translations en.yml (French)
[ci skip]
* New translations en.yml (Galician)
[ci skip]
* New translations en.yml (Danish)
[ci skip]
* New translations en.yml (Georgian)
[ci skip]
* New translations en.yml (German)
[ci skip]
* New translations en.yml (Hebrew)
[ci skip]
* New translations en.yml (Tamil)
[ci skip]
* New translations en.yml (Hungarian)
[ci skip]
* New translations en.yml (Ido)
[ci skip]
* New translations simple_form.en.yml (Czech)
[ci skip]
* New translations en.yml (Welsh)
[ci skip]
* New translations en.yml (Ukrainian)
[ci skip]
* New translations en.yml (Turkish)
[ci skip]
* New translations en.yml (Thai)
[ci skip]
* New translations en.yml (Telugu)
[ci skip]
* New translations simple_form.en.yml (Estonian)
[ci skip]
* New translations en.yml (Japanese)
[ci skip]
* New translations en.json (Japanese)
[ci skip]
* New translations en.json (Japanese)
[ci skip]
* New translations en.yml (Japanese)
[ci skip]
* New translations simple_form.en.yml (Japanese)
[ci skip]
* New translations en.json (Japanese)
[ci skip]
* New translations en.json (Slovak)
[ci skip]
* New translations en.json (Slovak)
[ci skip]
* New translations en.json (Chinese Traditional)
[ci skip]
* New translations en.json (Chinese Traditional)
[ci skip]
* New translations en.json (Chinese Traditional)
[ci skip]
* New translations simple_form.en.yml (Russian)
[ci skip]
* New translations en.json (Chinese Traditional)
[ci skip]
* New translations en.json (Russian)
[ci skip]
* New translations simple_form.en.yml (Russian)
[ci skip]
* New translations en.json (Russian)
[ci skip]
* New translations en.json (Russian)
[ci skip]
* New translations en.yml (Russian)
[ci skip]
* New translations en.json (Russian)
[ci skip]
* New translations en.yml (Russian)
[ci skip]
* New translations simple_form.en.yml (Russian)
[ci skip]
* New translations en.yml (Russian)
[ci skip]
* New translations simple_form.en.yml (Russian)
[ci skip]
* New translations en.yml (Thai)
[ci skip]
* New translations en.json (Czech)
[ci skip]
* New translations doorkeeper.en.yml (Albanian)
[ci skip]
* New translations doorkeeper.en.yml (Arabic)
[ci skip]
* New translations doorkeeper.en.yml (Asturian)
[ci skip]
* New translations doorkeeper.en.yml (Basque)
[ci skip]
* New translations doorkeeper.en.yml (Slovak)
[ci skip]
* New translations doorkeeper.en.yml (Norwegian)
[ci skip]
* New translations doorkeeper.en.yml (Occitan)
[ci skip]
* New translations doorkeeper.en.yml (Persian)
[ci skip]
* New translations doorkeeper.en.yml (Polish)
[ci skip]
* New translations doorkeeper.en.yml (Portuguese)
[ci skip]
* New translations doorkeeper.en.yml (Portuguese, Brazilian)
[ci skip]
* New translations doorkeeper.en.yml (Russian)
[ci skip]
* New translations doorkeeper.en.yml (Serbian (Cyrillic))
[ci skip]
* New translations doorkeeper.en.yml (Serbian (Latin))
[ci skip]
* New translations doorkeeper.en.yml (Slovenian)
[ci skip]
* New translations doorkeeper.en.yml (Spanish)
[ci skip]
* New translations doorkeeper.en.yml (Swedish)
[ci skip]
* New translations doorkeeper.en.yml (Thai)
[ci skip]
* New translations doorkeeper.en.yml (Turkish)
[ci skip]
* New translations doorkeeper.en.yml (Ukrainian)
[ci skip]
* New translations doorkeeper.en.yml (Welsh)
[ci skip]
* New translations en.json (Estonian)
[ci skip]
* New translations doorkeeper.en.yml (Finnish)
[ci skip]
* New translations doorkeeper.en.yml (Bulgarian)
[ci skip]
* New translations doorkeeper.en.yml (Catalan)
[ci skip]
* New translations doorkeeper.en.yml (Chinese Simplified)
[ci skip]
* New translations doorkeeper.en.yml (Chinese Traditional)
[ci skip]
* New translations doorkeeper.en.yml (Chinese Traditional, Hong Kong)
[ci skip]
* New translations doorkeeper.en.yml (Corsican)
[ci skip]
* New translations doorkeeper.en.yml (Croatian)
[ci skip]
* New translations doorkeeper.en.yml (Czech)
[ci skip]
* New translations doorkeeper.en.yml (Danish)
[ci skip]
* New translations doorkeeper.en.yml (Dutch)
[ci skip]
* New translations doorkeeper.en.yml (Esperanto)
[ci skip]
* New translations doorkeeper.en.yml (French)
[ci skip]
* New translations doorkeeper.en.yml (Korean)
[ci skip]
* New translations doorkeeper.en.yml (Galician)
[ci skip]
* New translations doorkeeper.en.yml (Georgian)
[ci skip]
* New translations doorkeeper.en.yml (German)
[ci skip]
* New translations doorkeeper.en.yml (Greek)
[ci skip]
* New translations doorkeeper.en.yml (Hebrew)
[ci skip]
* New translations doorkeeper.en.yml (Hungarian)
[ci skip]
* New translations doorkeeper.en.yml (Ido)
[ci skip]
* New translations doorkeeper.en.yml (Indonesian)
[ci skip]
* New translations doorkeeper.en.yml (Italian)
[ci skip]
* New translations doorkeeper.en.yml (Japanese)
[ci skip]
* New translations doorkeeper.en.yml (Kazakh)
[ci skip]
* New translations en.json (Portuguese)
[ci skip]
* New translations en.json (Kazakh)
[ci skip]
* New translations en.json (Korean)
[ci skip]
* New translations en.json (Latvian)
[ci skip]
* New translations en.json (Lithuanian)
[ci skip]
* New translations en.json (Malay)
[ci skip]
* New translations en.json (Norwegian)
[ci skip]
* New translations en.json (Occitan)
[ci skip]
* New translations en.json (Persian)
[ci skip]
* New translations en.json (Polish)
[ci skip]
* New translations en.json (Portuguese, Brazilian)
[ci skip]
* New translations en.json (Indonesian)
[ci skip]
* New translations en.json (Romanian)
[ci skip]
* New translations en.json (Serbian (Cyrillic))
[ci skip]
* New translations en.json (Serbian (Latin))
[ci skip]
* New translations en.json (Slovenian)
[ci skip]
* New translations en.json (Spanish)
[ci skip]
* New translations en.json (Swedish)
[ci skip]
* New translations en.json (Tamil)
[ci skip]
* New translations en.json (Telugu)
[ci skip]
* New translations en.json (Thai)
[ci skip]
* New translations en.json (Italian)
[ci skip]
* New translations en.json (Ido)
[ci skip]
* New translations en.json (Ukrainian)
[ci skip]
* New translations en.json (Chinese Traditional, Hong Kong)
[ci skip]
* New translations en.json (Albanian)
[ci skip]
* New translations en.json (Arabic)
[ci skip]
* New translations en.json (Armenian)
[ci skip]
* New translations en.json (Asturian)
[ci skip]
* New translations en.json (Basque)
[ci skip]
* New translations en.json (Bengali)
[ci skip]
* New translations en.json (Bulgarian)
[ci skip]
* New translations en.json (Catalan)
[ci skip]
* New translations en.json (Chinese Simplified)
[ci skip]
* New translations en.json (Corsican)
[ci skip]
* New translations en.json (Hungarian)
[ci skip]
* New translations en.json (Croatian)
[ci skip]
* New translations en.json (Danish)
[ci skip]
* New translations en.json (Dutch)
[ci skip]
* New translations en.json (Esperanto)
[ci skip]
* New translations en.json (Finnish)
[ci skip]
* New translations en.json (French)
[ci skip]
* New translations en.json (Galician)
[ci skip]
* New translations en.json (Georgian)
[ci skip]
* New translations en.json (German)
[ci skip]
* New translations en.json (Greek)
[ci skip]
* New translations en.json (Hebrew)
[ci skip]
* New translations en.json (Turkish)
[ci skip]
* New translations en.json (Welsh)
[ci skip]
* New translations doorkeeper.en.yml (Estonian)
[ci skip]
* New translations en.yml (Japanese)
[ci skip]
* New translations en.json (Corsican)
[ci skip]
* New translations en.json (Corsican)
[ci skip]
* New translations en.yml (Corsican)
[ci skip]
* New translations en.yml (Corsican)
[ci skip]
* New translations en.yml (Corsican)
[ci skip]
* New translations en.json (Slovak)
[ci skip]
* New translations en.json (Korean)
[ci skip]
* New translations en.json (Korean)
[ci skip]
* New translations en.yml (Korean)
[ci skip]
* New translations en.yml (Korean)
[ci skip]
* New translations en.json (Korean)
[ci skip]
* New translations en.yml (German)
[ci skip]
* New translations en.yml (Korean)
[ci skip]
* New translations en.json (German)
[ci skip]
* New translations en.yml (German)
[ci skip]
* New translations en.yml (Korean)
[ci skip]
* New translations en.yml (Corsican)
[ci skip]
* New translations en.json (Slovak)
[ci skip]
* New translations en.yml (Corsican)
[ci skip]
* New translations en.yml (Slovak)
[ci skip]
* i18n-tasks normalize
* yarn manage:translations
2019-08-19 19:05:13 +02:00
0d13a9cd13
Fix hidden statuses losing focus ( #11208 )
...
Fixes #10991
2019-08-19 19:00:33 +02:00
ba42dc35cc
Bump pkg-config from 1.3.7 to 1.3.8 ( #11616 )
...
Bumps [pkg-config](https://github.com/ruby-gnome2/pkg-config ) from 1.3.7 to 1.3.8.
- [Release notes](https://github.com/ruby-gnome2/pkg-config/releases )
- [Changelog](https://github.com/ruby-gnome/pkg-config/blob/master/NEWS )
- [Commits](https://github.com/ruby-gnome2/pkg-config/compare/1.3.7...1.3.8 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2019-08-20 01:49:40 +09:00
92f60ba114
Bump simple-navigation from 4.0.5 to 4.1.0 ( #11617 )
...
Bumps [simple-navigation](https://github.com/codeplant/simple-navigation ) from 4.0.5 to 4.1.0.
- [Release notes](https://github.com/codeplant/simple-navigation/releases )
- [Changelog](https://github.com/codeplant/simple-navigation/blob/master/CHANGELOG.md )
- [Commits](https://github.com/codeplant/simple-navigation/commits )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2019-08-20 01:49:17 +09:00
3dd0938369
Bump pghero from 2.2.1 to 2.3.0 ( #11615 )
...
Bumps [pghero](https://github.com/ankane/pghero ) from 2.2.1 to 2.3.0.
- [Release notes](https://github.com/ankane/pghero/releases )
- [Changelog](https://github.com/ankane/pghero/blob/master/CHANGELOG.md )
- [Commits](https://github.com/ankane/pghero/compare/v2.2.1...v2.3.0 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2019-08-19 22:37:22 +09:00
994bda37d5
Bump pundit from 2.0.1 to 2.1.0 ( #11613 )
...
Bumps [pundit](https://github.com/varvet/pundit ) from 2.0.1 to 2.1.0.
- [Release notes](https://github.com/varvet/pundit/releases )
- [Changelog](https://github.com/varvet/pundit/blob/master/CHANGELOG.md )
- [Commits](https://github.com/varvet/pundit/commits )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2019-08-19 22:36:45 +09:00
ThibG
Eugen Rochko
mayaeh
Haelwenn (lanodan) Monnier
dependabot-preview[bot]