b32a62fe95
[Glitch] Scroll to compose form when focus
...
Port 8f3c32e29c
2019-06-07 17:39:46 +02:00
cc8f6b3cda
Fix some React warnings ( #10989 )
2019-06-07 17:15:18 +02:00
01aae33a5f
[Glitch] Fix refreshing featured toots when the new collection is empty
...
Port d34a3a2cc7
2019-06-07 17:05:32 +02:00
34b8346e7f
Merge branch 'master' into glitch-soc/merge-upstream
...
Conflicts:
- app/controllers/statuses_controller.rb
- app/controllers/stream_entries_controller.rb
2019-06-07 17:00:36 +02:00
560ec24e58
Change /settings/preferences to redirect to appearance, add /settings/preferences/other ( #10988 )
2019-06-07 16:51:08 +02:00
8360019896
Fix display of alt-text when a media attachment is not available
2019-06-07 16:39:07 +02:00
cdb420862e
Fix display of alt-text when a media attachment is not available ( #10981 )
2019-06-07 12:41:08 +02:00
62e6a29f0b
i18n: Update Corsican translations ( #10987 )
2019-06-07 19:12:17 +09:00
1db4117030
Change preferences page into appearance, notifications, and other ( #10977 )
2019-06-07 03:39:24 +02:00
a60364ca7d
Add waiting time to list of pending accounts in admin UI ( #10985 )
2019-06-07 03:24:10 +02:00
c672676c03
Fix sass-lint config ( #10982 )
2019-06-06 18:51:46 +02:00
a03fb7b703
Change e-mail contact for CoC enforcement
2019-06-06 17:42:07 +02:00
fe3bf3b0fc
Fix overlap of emoji button on search popup ( #10978 )
2019-06-06 13:40:17 +02:00
a7f6e72b30
Fix CW field automatically getting the focus when it is always enabled
2019-06-06 13:26:42 +02:00
5bfd802c57
Fix not being able to directly switch between list timelines in web UI ( #10973 )
2019-06-06 13:04:49 +02:00
2657765d2a
Fix “mark as sensitive” not being used in delete & redraft ( #10980 )
2019-06-06 13:04:34 +02:00
70423ce81f
require rubocop-rails in .rubocop.yml ( #10974 )
...
* Revert "Revert #10957 (rubocop-rails) which is incompatible with CodeClimate (#10965 )"
This reverts commit 121d19d7fa
2019-06-06 12:31:48 +02:00
c402c291f4
Fix emoji picker being always displayed ( #10979 )
...
* Fix emoji picker being always displayed
* Remove duplicate content with other pull-requests
2019-06-06 12:30:14 +02:00
8f3c32e29c
Scroll to compose form when focus ( #10970 )
...
* Scroll to compose form when focus
* Get rid of constructor
2019-06-05 15:29:45 +02:00
cac9110533
Cleanup various controllers ( #10972 )
...
* Remove skip_session! as it is not supported in Rails 5
* Minor cleanup in StreamEntriesController
* Remove redundant mark_cacheable! calls
2019-06-05 14:02:59 +02:00
7fa23ec697
Fix potential private status leak ( #10969 )
2019-06-05 13:40:20 +02:00
d34a3a2cc7
Fix refreshing featured toots when the new collection is empty ( #10971 )
...
Fixes #10945
2019-06-05 13:39:59 +02:00
ff74aaca7c
Merge pull request #1093 from ThibG/glitch-soc/merge-upstream
...
Merge upstream changes
2019-06-05 13:28:05 +02:00
6c464cd424
Do not misattribute inlined boosts if `attributedTo` isn't present ( #10967 )
...
* Do not misattribute inlined boosts if `attributedTo` isn't present
Fixes #10950
* Fix tests
2019-06-04 23:24:31 +02:00
ed19f33440
Fix margins on profile metadata in single column mode ( #10961 )
2019-06-04 23:11:57 +02:00
6a9a759f40
Change reblogs counter to be updated when boosted privately ( #10964 )
2019-06-04 23:11:44 +02:00
f2b743e715
Refactor all ActivityPub deliveries to be serialized and signed through one concern ( #10966 )
2019-06-04 23:11:18 +02:00
02b56c7e1a
Merge remote-tracking branch 'upstream/master' into glitch-soc/merge-upstream
2019-06-04 20:40:19 +02:00
48fee1a800
Fix poll API not requiring authentication on non-public polls ( #10960 )
...
* Fix poll API not requiring authentication on non-public polls
That API does not reveal the content of the status, i.e. the question
itself, nor who the author is, nor which status it belongs to, but it
does reveal the poll options and how many answers they got
Fix #10959
* Add test
2019-06-04 20:10:26 +02:00
6077eca240
Add profile directory link to single column navigation panel ( #10963 )
2019-06-04 19:50:38 +02:00
121d19d7fa
Revert #10957 (rubocop-rails) which is incompatible with CodeClimate ( #10965 )
2019-06-04 19:35:19 +02:00
a1e96b2d8a
Add missing Korean translations ( #10962 )
...
And change some word.
2019-06-04 18:00:09 +02:00
781179b823
Bump intersection-observer from 0.5.1 to 0.7.0 ( #10953 )
...
Bumps [intersection-observer](https://github.com/w3c/IntersectionObserver ) from 0.5.1 to 0.7.0.
- [Release notes](https://github.com/w3c/IntersectionObserver/releases )
- [Commits](https://github.com/w3c/IntersectionObserver/commits )
2019-06-05 00:56:31 +09:00
3e56f95c73
Replace from scss-lint to sass-lint ( #10958 )
2019-06-04 17:23:18 +02:00
58946fef3c
Merge pull request #1079 from ThibG/glitch-soc/merge-upstream
...
Merge upstream changes
2019-06-04 17:12:25 +02:00
3f536f06d6
Use rubocop-rails ( #10957 )
2019-06-04 15:25:52 +02:00
da38c0a6b8
Replace from uglifyjs to terser ( #10956 )
2019-06-04 14:17:09 +02:00
7c682c4825
Bump babel-plugin-react-intl from 3.1.0 to 3.1.3 ( #10944 )
...
Bumps [babel-plugin-react-intl](https://github.com/formatjs/babel-plugin-react-intl ) from 3.1.0 to 3.1.3.
- [Release notes](https://github.com/formatjs/babel-plugin-react-intl/releases )
- [Commits](https://github.com/formatjs/babel-plugin-react-intl/commits )
2019-06-04 20:52:48 +09:00
07aebe1417
Bump webpacker from 4.0.6 to 4.0.7 ( #10948 )
...
Bumps [webpacker](https://github.com/rails/webpacker ) from 4.0.6 to 4.0.7.
- [Release notes](https://github.com/rails/webpacker/releases )
- [Changelog](https://github.com/rails/webpacker/blob/master/CHANGELOG.md )
- [Commits](https://github.com/rails/webpacker/compare/v4.0.6...v4.0.7 )
2019-06-04 20:50:06 +09:00
c633d65e6f
Bump react-swipeable-views from 0.13.0 to 0.13.3 ( #10952 )
...
Bumps [react-swipeable-views](https://github.com/oliviertassinari/react-swipeable-views ) from 0.13.0 to 0.13.3.
- [Release notes](https://github.com/oliviertassinari/react-swipeable-views/releases )
- [Changelog](https://github.com/oliviertassinari/react-swipeable-views/blob/master/CHANGELOG.md )
- [Commits](https://github.com/oliviertassinari/react-swipeable-views/compare/v0.13.0...v0.13.3 )
2019-06-04 20:28:58 +09:00
8265c5e7c8
Change dependabot update schedule from live to weekly ( #10949 )
2019-06-04 11:23:19 +02:00
c11742dd9b
Bump fuubar from 2.3.2 to 2.4.0 ( #10947 )
...
Bumps [fuubar](https://github.com/thekompanee/fuubar ) from 2.3.2 to 2.4.0.
- [Release notes](https://github.com/thekompanee/fuubar/releases )
- [Changelog](https://github.com/thekompanee/fuubar/blob/master/CHANGELOG.md )
- [Commits](https://github.com/thekompanee/fuubar/compare/releases/v2.3.2...releases/v2.4.0 )
2019-06-04 14:15:32 +09:00
4e03e50c37
Bump @babel/* from 7.3.4 to 7.4.5 ( #10936 )
...
* Bump @babel/plugin-proposal-object-rest-spread from 7.3.4 to 7.4.4
Bumps [@babel/plugin-proposal-object-rest-spread](https://github.com/babel/babel ) from 7.3.4 to 7.4.4.
- [Release notes](https://github.com/babel/babel/releases )
- [Changelog](https://github.com/babel/babel/blob/master/CHANGELOG.md )
- [Commits](https://github.com/babel/babel/compare/v7.3.4...v7.4.4 )
* Bump @babel/core from 7.3.4 to 7.4.5
* Bump @babel/plugin-proposal-class-properties from 7.3.4 to 7.4.4
* Bump @babel/plugin-proposal-decorators from 7.3.0 to 7.4.4
* Bump @babel/preset-env from 7.3.4 to 7.4.5
* Bump @babel/runtime from 7.3.4 to 7.4.5
2019-06-04 07:00:35 +09:00
716ea754e7
Bump react from 16.7.0 to 16.8.6 ( #10935 )
...
* Bump react from 16.7.0 to 16.8.6
Bumps [react](https://github.com/facebook/react/tree/HEAD/packages/react ) from 16.7.0 to 16.8.6.
- [Release notes](https://github.com/facebook/react/releases )
- [Changelog](https://github.com/facebook/react/blob/master/CHANGELOG.md )
- [Commits](https://github.com/facebook/react/commits/v16.8.6/packages/react )
* Bump react-dom from 16.7.0 to 16.8.6
* Bump react-test-renderer from 16.7.0 to 16.8.6
2019-06-04 06:59:54 +09:00
8eb7c3304e
[Glitch] Fix profile picture preview
...
Port e13e4b28db
2019-06-03 20:20:33 +02:00
3a84bacf86
Handle blank poll options more gracefully ( #10946 )
...
Pleroma currently allows (erroneously imho) empty poll options, that is,
options with an empty (but existing) `name`.
2019-06-03 20:04:00 +02:00
8bd2e4403e
Bump sass from 1.20.1 to 1.20.3 ( #10941 )
...
Bumps [sass](https://github.com/sass/dart-sass ) from 1.20.1 to 1.20.3.
- [Release notes](https://github.com/sass/dart-sass/releases )
- [Changelog](https://github.com/sass/dart-sass/blob/master/CHANGELOG.md )
- [Commits](https://github.com/sass/dart-sass/compare/1.20.1...1.20.3 )
2019-06-04 00:46:51 +09:00
8ca93c8654
Bump react-intl from 2.7.2 to 2.9.0 ( #10940 )
...
Bumps [react-intl](https://github.com/yahoo/react-intl ) from 2.7.2 to 2.9.0.
- [Release notes](https://github.com/yahoo/react-intl/releases )
- [Commits](https://github.com/yahoo/react-intl/compare/v2.7.2...v2.9.0 )
2019-06-04 00:14:17 +09:00
1d5434d34c
Add audio length var to env sample
...
Added MAX_AUDIO_LENGTH var and documented in .env.production.sample
2019-06-03 16:16:21 +02:00
76918554a6
Merge remote-tracking branch 'upstream/master' into glitch-soc/merge-upstream
...
Conflicts:
- Gemfile.lock
- config/webpack/rules/css.js
- package.json
- yarn.lock
2019-06-03 14:54:30 +02:00
Jeong Arm
Eugen Rochko
Thibaut Girka
Alix Rossi
Yamagishi Kazutoshi
Wenceslao Páez Chávez
Takeshi Umeda
dependabot-preview[bot]
Lady Lumb