Thibaut Girka
00552d2f79
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
Eugen Rochko
b788e58ea4
Change /settings/preferences to redirect to appearance, add /settings/preferences/other ( #10988 )
2019-06-07 16:51:08 +02:00
Thibaut Girka
390f22ab44
Fix display of alt-text when a media attachment is not available
2019-06-07 16:39:07 +02:00
ThibG
2b35ddc80a
Fix display of alt-text when a media attachment is not available ( #10981 )
2019-06-07 12:41:08 +02:00
Alix Rossi
9cf5686de5
i18n: Update Corsican translations ( #10987 )
2019-06-07 19:12:17 +09:00
Eugen Rochko
8bf8d6d9d9
Change preferences page into appearance, notifications, and other ( #10977 )
2019-06-07 03:39:24 +02:00
Eugen Rochko
87f5646ec3
Add waiting time to list of pending accounts in admin UI ( #10985 )
2019-06-07 03:24:10 +02:00
Yamagishi Kazutoshi
e20f7876e8
Fix sass-lint config ( #10982 )
2019-06-06 18:51:46 +02:00
ThibG
131bc26601
Change e-mail contact for CoC enforcement
2019-06-06 17:42:07 +02:00
Wenceslao Páez Chávez
796b8e8d34
Fix overlap of emoji button on search popup ( #10978 )
2019-06-06 13:40:17 +02:00
Thibaut Girka
2b54b78962
Fix CW field automatically getting the focus when it is always enabled
2019-06-06 13:26:42 +02:00
Eugen Rochko
a36e4db82f
Fix not being able to directly switch between list timelines in web UI ( #10973 )
2019-06-06 13:04:49 +02:00
ThibG
024ec0759c
Fix “mark as sensitive” not being used in delete & redraft ( #10980 )
2019-06-06 13:04:34 +02:00
Yamagishi Kazutoshi
cb4f45ab83
require rubocop-rails in .rubocop.yml ( #10974 )
...
* Revert "Revert #10957 (rubocop-rails) which is incompatible with CodeClimate (#10965 )"
This reverts commit fd0a944959
.
* Disable Rails/HelperInstanceVariable
2019-06-06 12:31:48 +02:00
Takeshi Umeda
88a04bf6c4
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
Jeong Arm
91ae2d1275
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
ThibG
806c2f8102
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
ThibG
e80cb67ed7
Fix potential private status leak ( #10969 )
2019-06-05 13:40:20 +02:00
ThibG
1fee4b0fe2
Fix refreshing featured toots when the new collection is empty ( #10971 )
...
Fixes #10945
2019-06-05 13:39:59 +02:00
ThibG
5e251a9b55
Merge pull request #1093 from ThibG/glitch-soc/merge-upstream
...
Merge upstream changes
2019-06-05 13:28:05 +02:00
ThibG
be6e54a70c
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
Eugen Rochko
b01b8521ec
Fix margins on profile metadata in single column mode ( #10961 )
2019-06-04 23:11:57 +02:00
Eugen Rochko
a7952c3a54
Change reblogs counter to be updated when boosted privately ( #10964 )
2019-06-04 23:11:44 +02:00
Eugen Rochko
57098a1b8d
Refactor all ActivityPub deliveries to be serialized and signed through one concern ( #10966 )
2019-06-04 23:11:18 +02:00
Thibaut Girka
a76c660645
Merge remote-tracking branch 'upstream/master' into glitch-soc/merge-upstream
2019-06-04 20:40:19 +02:00
Eugen Rochko
f3a02e70a8
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
Eugen Rochko
4331f4948e
Add profile directory link to single column navigation panel ( #10963 )
2019-06-04 19:50:38 +02:00
Yamagishi Kazutoshi
fd0a944959
Revert #10957 (rubocop-rails) which is incompatible with CodeClimate ( #10965 )
2019-06-04 19:35:19 +02:00
Jeong Arm
ca61d7577a
Add missing Korean translations ( #10962 )
...
And change some word.
2019-06-04 18:00:09 +02:00
dependabot-preview[bot]
4118bce123
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
Yamagishi Kazutoshi
8e7c0e9621
Replace from scss-lint to sass-lint ( #10958 )
2019-06-04 17:23:18 +02:00
ThibG
608d98cd4e
Merge pull request #1079 from ThibG/glitch-soc/merge-upstream
...
Merge upstream changes
2019-06-04 17:12:25 +02:00
Yamagishi Kazutoshi
335bf3fb23
Use rubocop-rails ( #10957 )
2019-06-04 15:25:52 +02:00
Yamagishi Kazutoshi
ac8f6df6f1
Replace from uglifyjs to terser ( #10956 )
2019-06-04 14:17:09 +02:00
dependabot-preview[bot]
347e235168
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
dependabot-preview[bot]
a7904ddc4b
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
dependabot-preview[bot]
486ccb1eac
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
Eugen Rochko
6b68adbc96
Change dependabot update schedule from live to weekly ( #10949 )
2019-06-04 11:23:19 +02:00
dependabot-preview[bot]
5a9b97b359
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
dependabot-preview[bot]
f2b9a0ed6d
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
dependabot-preview[bot]
179a5480ab
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
Jeong Arm
3d34bc17e2
[Glitch] Fix profile picture preview
...
Port 77375ad7df
to glitch-soc
Signed-off-by: Thibaut Girka <thib@sitedethib.com>
2019-06-03 20:20:33 +02:00
ThibG
c45a330824
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
dependabot-preview[bot]
1f83cdf4fe
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
dependabot-preview[bot]
4b840fe2b1
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
Lady Lumb
ace8a5158d
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
Thibaut Girka
a4e0071538
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
dependabot-preview[bot]
5ed0319b58
Bump offline-plugin from 5.0.6 to 5.0.7 ( #10937 )
...
Bumps [offline-plugin](https://github.com/NekR/offline-plugin ) from 5.0.6 to 5.0.7.
- [Release notes](https://github.com/NekR/offline-plugin/releases )
- [Changelog](https://github.com/NekR/offline-plugin/blob/master/CHANGELOG.md )
- [Commits](https://github.com/NekR/offline-plugin/compare/v5.0.6...v5.0.7 )
2019-06-03 21:12:34 +09:00
dependabot-preview[bot]
0a6a875536
Bump babel-jest from 24.5.0 to 24.8.0 ( #10938 )
...
Bumps [babel-jest](https://github.com/facebook/jest/tree/HEAD/packages/babel-jest ) from 24.5.0 to 24.8.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/commits/v24.8.0/packages/babel-jest )
2019-06-03 21:12:08 +09:00
Yamagishi Kazutoshi
fb051cdac2
Revert "Bump react-redux-loading-bar from 4.0.8 to 4.2.0 ( #10897 )" ( #10927 )
...
This reverts commit ef1c750f4e
.
2019-06-02 18:22:38 +02:00