ab646fac5f
Fix composer dropdown toggle buttons (threaded mode and local-only) not working
2019-09-18 00:11:03 +02:00
591185344e
Fix boost confirmation modal for description-less media not working
2019-09-17 21:46:36 +02:00
221bb05cf8
Merge pull request #1219 from ThibG/glitch-soc/merge-upstream
...
Merge upstream changes
2019-09-15 14:45:24 +02:00
b83e2df6b5
Fix tests being broken because of different default setting
2019-09-13 20:28:22 +02:00
3665d554c5
[Glitch] Add timeline read markers API
...
Port e445a8af64
2019-09-13 20:28:22 +02:00
5477726f50
Fix upstream changes breaking because of glitch-soc's theming engine
2019-09-13 20:28:22 +02:00
344e52ffbe
[Glitch] Change max length of media descriptions from 420 to 1500 characters
...
Port b6381bdc7d
2019-09-13 18:38:37 +02:00
eaf49439d1
[Glitch] Fix display of long poll options
...
Port cf2b708e6b
2019-09-13 18:36:22 +02:00
ef8c311a66
[Glitch] Fix unused CSS
...
Port 45f44ef4d3
2019-09-13 18:36:00 +02:00
c2843c5f62
[Glitch] Add batch actions and categories to admin UI for custom emojis
...
Port SCSS changes from 1110ea1a91
2019-09-13 18:35:20 +02:00
ffe8decb73
[Glitch] Add account bio to account admin view
...
Port SCSS changes from ec2a439a22
2019-09-13 18:34:55 +02:00
6809e37f8e
[Glitch] Add batch approve/reject for pending hashtags in admin UI
...
Port SCSS changes from 261e52268c
2019-09-13 18:34:26 +02:00
74c5b2bd08
Merge branch 'master' into glitch-soc/merge-upstream
...
Conflicts:
- Gemfile
- app/controllers/api/v1/search_controller.rb
Conflict because we changed the number of default results to be
configurable
- app/lib/settings/scoped_settings.rb
Addition of a new “noindex” site-wide setting,
conflict due to our change of the two other site-wide settings
(default flavour and skin instead of theme)
- spec/controllers/application_controller_spec.rb
Addition of a new “noindex” site-wide setting,
conflict due to our change of the two other site-wide settings
(default flavour and skin instead of theme)
2019-09-13 18:13:43 +02:00
18331fefa2
Remove deprecated `GET /api/v1/search` API ( #11823 )
...
Use `GET /api/v2/search` instead
2019-09-13 16:11:13 +02:00
cf2b708e6b
Fix display of long poll options ( #11717 )
2019-09-13 16:04:09 +02:00
225edac118
Change /api/v1/timelines/public to require auth when public preview is off ( #11802 )
...
Fixes #11289
2019-09-13 16:03:46 +02:00
4e1b742cb2
Change rate limit for media proxy ( #11814 )
2019-09-13 16:02:52 +02:00
50edf84898
Fix search API not resolving URL when type is given ( #11822 )
...
Fix #11771
2019-09-13 16:01:39 +02:00
0762258aec
Fix hashtags being split by ZWNJ character ( #11821 )
...
Fix #11761
2019-09-13 16:01:26 +02:00
59da5ccb8e
Change unlisted custom emoji to not appear in autosuggestions ( #11818 )
...
Fix #11669
2019-09-13 16:01:09 +02:00
45f44ef4d3
Fix unused CSS ( #11824 )
...
Fix #11689
2019-09-13 16:00:47 +02:00
b6381bdc7d
Change max length of media descriptions from 420 to 1500 characters ( #11819 )
...
Fix #11658
2019-09-13 16:00:34 +02:00
bc869501f5
Fix name of Portuguese language not including Portugal ( #11820 )
...
Fix #11602
2019-09-13 16:00:19 +02:00
50755a47b4
Fix scroll position resetting when opening media modals in web UI ( #11815 )
2019-09-12 20:14:59 +02:00
9361981388
Add missing locale file for ga and add rake task to check for it ( #11813 )
...
* Add missing locale file for ga and add rake task to check for it
* Update lib/tasks/repo.rake
Co-Authored-By: Yamagishi Kazutoshi <ykzts@desire.sh>
* Fix check-i18n build
2019-09-12 04:58:33 +02:00
16cdaa1110
Fix uncaught errors in media proxy controller ( #11811 )
2019-09-12 01:51:12 +02:00
3a3b40e0c3
Fix nil error in warning e-mail template ( #11812 )
2019-09-12 01:51:01 +02:00
c5d37f18cb
Change deletes to preserve soft-deleted statuses in unresolved reports ( #11805 )
...
Change all account actions except "none" to resolve all unresolved reports
Refactor `SuspendAccountService` to be more readable
2019-09-11 16:32:44 +02:00
4fe127664b
add admin setting for default search engine indexing ( fix #11750 ) ( #11804 )
2019-09-11 08:44:58 +02:00
c7f71b974f
Fix flavour screenshot styling in vanilla flavour
2019-09-10 22:38:07 +02:00
4faaa5b25e
Add updated relationship to follow request API responses ( #11800 )
...
Fixes #11747
2019-09-10 20:56:42 +02:00
17389c63c8
Change /admin/custom_emoji to honor the auto_play_gif setting ( #11801 )
...
Fixes #9535
2019-09-10 20:56:07 +02:00
2b2b03a7da
Fix duplicate HTML ids in /about ( #11803 )
...
Fixes #11329
2019-09-10 20:55:23 +02:00
031ca25014
Add retry for failed media downloads and `tootctl media refresh` ( #11775 )
2019-09-10 15:29:12 +02:00
0e1291c888
Fix wrong icons from last refactoring
...
Fix regressions from f154d9d6e9
2019-09-10 14:56:08 +02:00
8674814825
Change tootctl to use inline parallelization instead of Sidekiq ( #11776 )
...
- Remove --background option
- Add --concurrency(=5) option
- Add progress bars
2019-09-10 13:48:48 +02:00
9045f5e3f8
Bump webpush from 0.3.8 to 1.0.0 ( #11614 )
...
Bumps [webpush](https://github.com/zaru/webpush ) from 0.3.8 to 1.0.0.
- [Release notes](https://github.com/zaru/webpush/releases )
- [Changelog](https://github.com/zaru/webpush/blob/master/CHANGELOG.md )
- [Commits](https://github.com/zaru/webpush/compare/v0.3.8...v1.0.0 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2019-09-10 12:44:47 +02:00
0005635f96
New Crowdin translations ( #11626 )
...
* New translations en.yml (Chinese Simplified)
[ci skip]
* New translations en.yml (Greek)
[ci skip]
* New translations en.yml (Greek)
[ci skip]
* New translations en.yml (Greek)
[ci skip]
* New translations en.yml (Greek)
[ci skip]
* New translations en.yml (Greek)
[ci skip]
* New translations en.json (Greek)
[ci skip]
* New translations simple_form.en.yml (Greek)
[ci skip]
* New translations en.json (Greek)
[ci skip]
* New translations en.json (Esperanto)
[ci skip]
* New translations en.yml (Esperanto)
[ci skip]
* New translations simple_form.en.yml (Esperanto)
[ci skip]
* New translations en.yml (Esperanto)
[ci skip]
* New translations simple_form.en.yml (Esperanto)
[ci skip]
* New translations en.json (Thai)
[ci skip]
* New translations en.json (Thai)
[ci skip]
* New translations simple_form.en.yml (Thai)
[ci skip]
* New translations en.yml (Slovak)
[ci skip]
* New translations en.json (Persian)
[ci skip]
* New translations en.json (Persian)
[ci skip]
* New translations en.yml (Persian)
[ci skip]
* New translations en.json (Persian)
[ci skip]
* New translations en.yml (Persian)
[ci skip]
* New translations en.yml (Persian)
[ci skip]
* New translations en.yml (Persian)
[ci skip]
* New translations en.json (Turkish)
[ci skip]
* New translations en.json (Turkish)
[ci skip]
* New translations en.json (Turkish)
[ci skip]
* New translations en.json (Turkish)
[ci skip]
* New translations en.json (Turkish)
[ci skip]
* New translations en.yml (Turkish)
[ci skip]
* New translations doorkeeper.en.yml (Turkish)
[ci skip]
* New translations activerecord.en.yml (Turkish)
[ci skip]
* New translations doorkeeper.en.yml (Turkish)
[ci skip]
* New translations devise.en.yml (Turkish)
[ci skip]
* New translations simple_form.en.yml (Turkish)
[ci skip]
* New translations devise.en.yml (Turkish)
[ci skip]
* New translations simple_form.en.yml (Turkish)
[ci skip]
* New translations simple_form.en.yml (Turkish)
[ci skip]
* New translations simple_form.en.yml (Turkish)
[ci skip]
* New translations en.yml (Turkish)
[ci skip]
* New translations en.yml (Turkish)
[ci skip]
* New translations en.yml (Turkish)
[ci skip]
* New translations en.yml (Turkish)
[ci skip]
* New translations en.yml (Turkish)
[ci skip]
* New translations en.yml (Turkish)
[ci skip]
* New translations en.yml (Turkish)
[ci skip]
* New translations doorkeeper.en.yml (Turkish)
[ci skip]
* New translations devise.en.yml (Turkish)
[ci skip]
* New translations en.yml (Turkish)
[ci skip]
* New translations en.json (Czech)
[ci skip]
* New translations en.json (Estonian)
[ci skip]
* New translations en.json (Dutch)
[ci skip]
* New translations en.json (Italian)
[ci skip]
* New translations en.json (Indonesian)
[ci skip]
* New translations en.json (Ido)
[ci skip]
* New translations en.json (Hungarian)
[ci skip]
* New translations en.json (Hebrew)
[ci skip]
* New translations en.json (Greek)
[ci skip]
* New translations en.json (German)
[ci skip]
* New translations en.json (Georgian)
[ci skip]
* New translations en.json (Galician)
[ci skip]
* New translations en.json (French)
[ci skip]
* New translations en.json (Finnish)
[ci skip]
* New translations en.json (Esperanto)
[ci skip]
* New translations en.json (Danish)
[ci skip]
* New translations en.json (Croatian)
[ci skip]
* New translations en.json (Corsican)
[ci skip]
* New translations en.json (Chinese Traditional, Hong Kong)
[ci skip]
* New translations en.json (Chinese Traditional)
[ci skip]
* New translations en.json (Chinese Simplified)
[ci skip]
* New translations en.json (Catalan)
[ci skip]
* New translations en.json (Bulgarian)
[ci skip]
* New translations en.json (Bengali)
[ci skip]
* New translations en.json (Basque)
[ci skip]
* New translations en.json (Asturian)
[ci skip]
* New translations en.json (Armenian)
[ci skip]
* New translations en.json (Arabic)
[ci skip]
* New translations en.json (Albanian)
[ci skip]
* New translations en.json (Kazakh)
[ci skip]
* New translations en.json (Japanese)
[ci skip]
* New translations en.json (Spanish)
[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)
[ci skip]
* New translations en.json (Portuguese, Brazilian)
[ci skip]
* New translations en.json (Romanian)
[ci skip]
* New translations en.json (Russian)
[ci skip]
* New translations en.json (Serbian (Cyrillic))
[ci skip]
* New translations en.json (Serbian (Latin))
[ci skip]
* New translations en.json (Slovak)
[ci skip]
* New translations en.json (Slovenian)
[ci skip]
* New translations en.json (Swedish)
[ci skip]
* New translations en.json (Malay)
[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 (Turkish)
[ci skip]
* New translations en.json (Ukrainian)
[ci skip]
* New translations en.json (Welsh)
[ci skip]
* New translations en.json (Norwegian)
[ci skip]
* New translations en.json (Lithuanian)
[ci skip]
* New translations en.json (Latvian)
[ci skip]
* New translations en.json (Korean)
[ci skip]
* New translations en.json (Czech)
[ci skip]
* New translations en.yml (Czech)
[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.yml (Slovak)
[ci skip]
* New translations activerecord.en.yml (Bulgarian)
[ci skip]
* New translations en.json (Korean)
[ci skip]
* New translations en.json (Esperanto)
[ci skip]
* New translations en.json (Korean)
[ci skip]
* New translations en.yml (Esperanto)
[ci skip]
* New translations en.yml (Korean)
[ci skip]
* New translations simple_form.en.yml (Esperanto)
[ci skip]
* New translations simple_form.en.yml (Korean)
[ci skip]
* New translations en.json (Danish)
[ci skip]
* New translations en.json (Danish)
[ci skip]
* New translations en.json (Slovak)
[ci skip]
* New translations en.yml (Danish)
[ci skip]
* New translations en.yml (Danish)
[ci skip]
* New translations en.json (Danish)
[ci skip]
* New translations en.yml (Danish)
[ci skip]
* New translations en.json (Greek)
[ci skip]
* New translations en.json (Greek)
[ci skip]
* New translations en.yml (Greek)
[ci skip]
* New translations en.json (Basque)
[ci skip]
* New translations en.yml (Basque)
[ci skip]
* New translations en.yml (Estonian)
[ci skip]
* New translations en.yml (Czech)
[ci skip]
* New translations en.yml (Russian)
[ci skip]
* New translations en.yml (Korean)
[ci skip]
* New translations en.yml (Lithuanian)
[ci skip]
* New translations en.yml (Norwegian)
[ci skip]
* New translations en.yml (Occitan)
[ci skip]
* New translations en.yml (Persian)
[ci skip]
* New translations en.yml (Polish)
[ci skip]
* New translations en.yml (Portuguese)
[ci skip]
* New translations en.yml (Portuguese, Brazilian)
[ci skip]
* New translations en.yml (Romanian)
[ci skip]
* New translations en.yml (Serbian (Cyrillic))
[ci skip]
* New translations en.yml (Japanese)
[ci skip]
* New translations en.yml (Serbian (Latin))
[ci skip]
* New translations en.yml (Slovak)
[ci skip]
* New translations en.yml (Slovenian)
[ci skip]
* New translations en.yml (Spanish)
[ci skip]
* New translations en.yml (Swedish)
[ci skip]
* New translations en.yml (Ukrainian)
[ci skip]
* New translations en.yml (Welsh)
[ci skip]
* New translations en.yml (Kazakh)
[ci skip]
* New translations en.yml (Italian)
[ci skip]
* New translations en.yml (Albanian)
[ci skip]
* New translations en.yml (Arabic)
[ci skip]
* New translations en.yml (Basque)
[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 (Corsican)
[ci skip]
* New translations en.yml (Danish)
[ci skip]
* New translations en.yml (Dutch)
[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 (Georgian)
[ci skip]
* New translations en.yml (German)
[ci skip]
* New translations en.yml (Greek)
[ci skip]
* New translations en.yml (Hungarian)
[ci skip]
* New translations en.yml (Danish)
[ci skip]
* New translations en.yml (Danish)
[ci skip]
* New translations en.yml (Danish)
[ci skip]
* New translations en.json (Arabic)
[ci skip]
* New translations en.yml (Arabic)
[ci skip]
* New translations en.yml (Arabic)
[ci skip]
* New translations en.json (Arabic)
[ci skip]
* New translations en.yml (Arabic)
[ci skip]
* New translations en.json (Arabic)
[ci skip]
* New translations en.yml (Corsican)
[ci skip]
* New translations en.json (Corsican)
[ci skip]
* New translations en.yml (Corsican)
[ci skip]
* New translations en.yml (French)
[ci skip]
* New translations en.yml (Czech)
[ci skip]
* New translations en.yml (Czech)
[ci skip]
* New translations en.yml (Czech)
[ci skip]
* New translations en.json (German)
[ci skip]
* New translations en.yml (German)
[ci skip]
* New translations en.yml (German)
[ci skip]
* New translations simple_form.en.yml (German)
[ci skip]
* New translations en.json (German)
[ci skip]
* New translations en.json (German)
[ci skip]
* New translations en.json (Slovak)
[ci skip]
* New translations en.yml (German)
[ci skip]
* New translations en.yml (Slovak)
[ci skip]
* New translations simple_form.en.yml (German)
[ci skip]
* New translations activerecord.en.yml (German)
[ci skip]
* New translations devise.en.yml (German)
[ci skip]
* New translations en.yml (Slovak)
[ci skip]
* New translations simple_form.en.yml (French)
[ci skip]
* New translations en.yml (French)
[ci skip]
* New translations en.yml (French)
[ci skip]
* New translations en.json (Ukrainian)
[ci skip]
* New translations en.json (Ukrainian)
[ci skip]
* New translations en.yml (Ukrainian)
[ci skip]
* New translations en.json (Ukrainian)
[ci skip]
* New translations en.yml (Ukrainian)
[ci skip]
* New translations simple_form.en.yml (Ukrainian)
[ci skip]
* New translations en.yml (Ukrainian)
[ci skip]
* New translations en.yml (Slovak)
[ci skip]
* New translations en.json (Slovak)
[ci skip]
* New translations en.json (French)
[ci skip]
* New translations en.yml (Greek)
[ci skip]
* New translations en.yml (Greek)
[ci skip]
* New translations en.json (Ukrainian)
[ci skip]
* New translations en.json (Ukrainian)
[ci skip]
* New translations en.yml (Ukrainian)
[ci skip]
* New translations en.yml (Ukrainian)
[ci skip]
* New translations en.yml (Ukrainian)
[ci skip]
* New translations en.yml (Ukrainian)
[ci skip]
* New translations en.yml (Ukrainian)
[ci skip]
* New translations en.yml (Ukrainian)
[ci skip]
* New translations en.json (Ukrainian)
[ci skip]
* New translations simple_form.en.yml (Ukrainian)
[ci skip]
* New translations en.yml (Ukrainian)
[ci skip]
* New translations en.yml (Ukrainian)
[ci skip]
* New translations simple_form.en.yml (Ukrainian)
[ci skip]
* New translations simple_form.en.yml (Ukrainian)
[ci skip]
* New translations en.yml (Ukrainian)
[ci skip]
* New translations simple_form.en.yml (Ukrainian)
[ci skip]
* New translations en.yml (Ukrainian)
[ci skip]
* New translations en.yml (Ukrainian)
[ci skip]
* New translations en.yml (Ukrainian)
[ci skip]
* New translations en.yml (Ukrainian)
[ci skip]
* New translations en.yml (Czech)
[ci skip]
* New translations en.json (Turkish)
[ci skip]
* New translations en.yml (Turkish)
[ci skip]
* New translations en.yml (Turkish)
[ci skip]
* New translations en.yml (Turkish)
[ci skip]
* New translations en.yml (Corsican)
[ci skip]
* New translations en.yml (Corsican)
[ci skip]
* New translations en.json (Galician)
[ci skip]
* New translations en.yml (Galician)
[ci skip]
* New translations simple_form.en.yml (Galician)
[ci skip]
* i18n-tasks normalize
* yarn manage:translations
2019-09-10 12:43:06 +02:00
1110ea1a91
Add batch actions and categories to admin UI for custom emojis ( #11793 )
2019-09-09 22:44:17 +02:00
14d4a783cd
Fix display of instance actor in reports UI ( #11798 )
2019-09-09 20:42:43 +02:00
2aa0cdf7e6
Use the `Icon` component instead of directly using `i` tag
2019-09-09 19:00:20 +02:00
f154d9d6e9
Use upstream's Icon component
...
Rework the codebase to avoid unnecessary differences with upstream
2019-09-09 19:00:20 +02:00
f2b307af25
Move “export” before decorators
...
As this is what upstream does.
See also https://github.com/tc39/proposal-decorators/issues/69
2019-09-09 18:36:43 +02:00
ec2a439a22
Add account bio to account admin view ( #11473 )
...
* Add account bio to account admin view
* Change styling to make bio fields / content more readable
2019-09-09 14:15:52 +02:00
7b1b968b73
Bump fastimage from 2.1.5 to 2.1.7 ( #11785 )
...
Bumps [fastimage](https://github.com/sdsykes/fastimage ) from 2.1.5 to 2.1.7.
- [Release notes](https://github.com/sdsykes/fastimage/releases )
- [Commits](https://github.com/sdsykes/fastimage/compare/v2.1.5...v2.1.7 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2019-09-09 20:10:17 +09:00
9aa2a5320e
Bump sanitize from 5.0.0 to 5.1.0 ( #11786 )
...
Bumps [sanitize](https://github.com/rgrove/sanitize ) from 5.0.0 to 5.1.0.
- [Release notes](https://github.com/rgrove/sanitize/releases )
- [Changelog](https://github.com/rgrove/sanitize/blob/master/HISTORY.md )
- [Commits](https://github.com/rgrove/sanitize/compare/v5.0.0...v5.1.0 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2019-09-09 20:08:45 +09:00
4f3e183dc8
Bump jest from 24.8.0 to 24.9.0 ( #11781 )
...
Bumps [jest](https://github.com/facebook/jest ) from 24.8.0 to 24.9.0.
- [Release notes](https://github.com/facebook/jest/releases )
- [Changelog](https://github.com/facebook/jest/blob/master/CHANGELOG.md )
- [Commits](https://github.com/facebook/jest/compare/v24.8.0...v24.9.0 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2019-09-09 20:07:02 +09:00
5dcacde6a2
Bump mime-types from 3.2.2 to 3.3 ( #11788 )
...
Bumps [mime-types](https://github.com/mime-types/ruby-mime-types ) from 3.2.2 to 3.3.
- [Release notes](https://github.com/mime-types/ruby-mime-types/releases )
- [Changelog](https://github.com/mime-types/ruby-mime-types/blob/master/History.md )
- [Commits](https://github.com/mime-types/ruby-mime-types/compare/v3.2.2...v3.3 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2019-09-09 20:03:07 +09:00
a9ea638a49
Bump json-ld-preloaded from 3.0.3 to 3.0.4 ( #11790 )
...
Bumps [json-ld-preloaded](https://github.com/ruby-rdf/json-ld-preloaded ) from 3.0.3 to 3.0.4.
- [Release notes](https://github.com/ruby-rdf/json-ld-preloaded/releases )
- [Commits](https://github.com/ruby-rdf/json-ld-preloaded/compare/3.0.3...3.0.4 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2019-09-09 19:52:33 +09:00
3642021d58
Bump oj from 3.9.0 to 3.9.1 ( #11789 )
...
Bumps [oj](https://github.com/ohler55/oj ) from 3.9.0 to 3.9.1.
- [Release notes](https://github.com/ohler55/oj/releases )
- [Changelog](https://github.com/ohler55/oj/blob/develop/CHANGELOG.md )
- [Commits](https://github.com/ohler55/oj/compare/v3.9.0...v3.9.1 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2019-09-09 19:50:38 +09:00
Thibaut Girka