4760c6e767
On mobile, go back in browser history upon posting, unless threaded mode is enabled
2018-12-14 23:56:53 +01:00
56890834ab
Remove form_action from CSP
...
This trips an issue when trying to authenticate through to
third-party sites, e.g. bridge.joinmastodon.org:
Refused to send form data to 'https://bridge.joinmastodon.org/ '
because it violates the following Content Security Policy
directive: "form-action 'self'".
Thread: https://vulpine.club/@digifox/101230933751352042
2018-12-14 08:02:06 +01:00
656e2d3121
[Glitch] Fix timeline pagination in the WebUI
...
The `hasMore` property of timelines in redux store was set whenever an API
request returned only one page of results, *even* if the query only requested
newer statuses (using `since_id`), causing `hasMore` to be incorrectly set to
false whenever fetching new toots in a timeline, which happens each time
an account's timeline or media gallery is visited.
2018-12-13 21:59:46 +01:00
61cf3bf52a
[Glitch] Fix hasMore in notifications
2018-12-13 21:58:48 +01:00
9fd8019854
[Glitch] Fix “load more” button when no data has been fetched
2018-12-13 15:00:36 +01:00
4b2c0e4e73
[Glitch] Make account media gallery more consistent with account timeline
...
Display “load more” more consistently, add a loading indicator on first load.
2018-12-13 15:00:36 +01:00
dda787761b
[Glitch] Fix LoadMore usage in account media gallery
...
(Even though that codepath is probably never actually used…)
2018-12-13 15:00:36 +01:00
50f8e59820
[Glitch] Do not display empty message when the list is known to have more elements
2018-12-13 15:00:36 +01:00
a68d1d0ee2
Minor cleanup in ScrollableList component
2018-12-13 15:00:36 +01:00
a2e53af335
Merge pull request #849 from ThibG/glitch-soc/merge-upstream
...
Merge upstream changes
2018-12-09 16:38:09 +01:00
7dfd0c7995
Fix directory controller in glitch-soc
2018-12-09 16:08:10 +01:00
3d859a7c2b
[Glitch] Fix various things in the directory
...
Port ac437d6b25
2018-12-09 16:08:10 +01:00
6259051853
Port directory CSS changes from upstream
...
Port fd8ca11f19
2018-12-09 16:08:10 +01:00
b62953b3d2
Merge branch 'master' into glitch-soc/merge-upstream
...
Conflicts:
- app/javascript/packs/public.js
- app/models/user.rb
- config/settings.yml
- db/schema.rb
Moved public.js changes to settings.js.
2018-12-09 16:08:04 +01:00
097d866028
Add setting to not aggregate reblogs ( #9248 )
...
* Add setting to not aggregate reblogs
Fixes #9222
* Handle cases where user is nil in add_to_home and add_to_list
* Add hint for setting_aggregate_reblogs option
* Reword setting_aggregate_reblogs label
2018-12-09 13:03:01 +01:00
f551383e4a
Cache hashtag sample accounts, and exclude ineligible ones ( #9465 )
2018-12-08 01:32:26 +01:00
d72487aef6
Make notification time smaller and reduce contrast ( #9464 )
2018-12-08 00:40:11 +01:00
4379a39c05
i18n: Update Polish translation ( #9459 )
...
Signed-off-by: Marcin Mikołajczak <me@m4sk.in>
2018-12-07 21:08:29 +01:00
246dfe9d47
Remove pending spec ( #9453 )
2018-12-07 16:53:55 +01:00
53c462bf66
Bump rubocop from 0.61.0 to 0.61.1 ( #9451 )
...
Bumps [rubocop](https://github.com/rubocop-hq/rubocop ) from 0.61.0 to 0.61.1.
- [Release notes](https://github.com/rubocop-hq/rubocop/releases )
- [Changelog](https://github.com/rubocop-hq/rubocop/blob/master/CHANGELOG.md )
- [Commits](https://github.com/rubocop-hq/rubocop/compare/v0.61.0...v0.61.1 )
Signed-off-by: dependabot[bot] <support@dependabot.com>
2018-12-07 16:42:50 +01:00
03289a4d14
Escape HTML in profile name preview in profile settings ( #9446 )
...
* fix non-escaped html in the profile settings
* provide a default profile text in case if there's no custom one
* update haml syntax
* simplify default profile name to username
* sanitize user-input html but display emojified icons
2018-12-07 16:42:22 +01:00
d61410c306
Add specs for ActivityPub::InboxesController ( #9456 )
2018-12-07 16:40:01 +01:00
f607161253
Add specs for Admin::AccountModerationNotesHelper ( #9455 )
2018-12-07 16:39:20 +01:00
994c20699c
Remove pending spec ( #9454 )
...
Since dots are not allowed in username,
this spec is no longer needed.
2018-12-07 16:38:50 +01:00
26345b7cf2
Add specs for AccountTagStat model ( #9452 )
2018-12-07 16:37:56 +01:00
ac437d6b25
Fix various things in the directory ( #9449 )
...
* Fix missing variable in directory page title
* Order hashtags by number of people instead of alphabetically
* Add icon to OpenGraph preview of directory page
* Prevent line breaks in hashtags and ensure lowercase in the table
2018-12-07 16:37:32 +01:00
f2ca159c3b
Fix tag mb_chars comparison of profile directory ( #9448 )
2018-12-07 04:18:37 +01:00
b34053e888
Merge pull request #848 from ThibG/glitch-soc/merge-upstream
...
Merge upstream changes
2018-12-06 17:40:43 +01:00
fd8ca11f19
Add profile directory ( #9427 )
...
Fix #5578
2018-12-06 17:36:11 +01:00
467786f29b
Fix mention links in detailed statuses not opening in the WebUI
2018-12-06 15:31:21 +01:00
516adec7ad
Revert "Add database statement timeout of 60s ( #9382 )"
...
This reverts commit 01861b4f8e
2018-12-06 14:39:04 +01:00
4aca9b4e0f
Merge branch 'master' into glitch-soc/merge-upstream
2018-12-06 12:44:38 +01:00
6d73528424
Remove pending spec ( #9442 )
...
`#from_account` isn't defined.
2018-12-06 17:39:15 +09:00
23607d43da
Add spec for Identity.find_for_oauth ( #9441 )
2018-12-06 17:38:49 +09:00
579e2d632a
Bump rails from 5.2.1.1 to 5.2.2 ( #9430 )
...
Bumps [rails](https://github.com/rails/rails ) from 5.2.1.1 to 5.2.2.
- [Release notes](https://github.com/rails/rails/releases )
- [Commits](https://github.com/rails/rails/compare/v5.2.1.1...v5.2.2 )
Signed-off-by: dependabot[bot] <support@dependabot.com>
2018-12-06 16:10:18 +09:00
ae2eafd897
Bump rails-controller-testing from 1.0.3 to 1.0.4 ( #9440 )
...
Bumps [rails-controller-testing](https://github.com/rails/rails-controller-testing ) from 1.0.3 to 1.0.4.
- [Release notes](https://github.com/rails/rails-controller-testing/releases )
- [Commits](https://github.com/rails/rails-controller-testing/compare/v1.0.3...v1.0.4 )
Signed-off-by: dependabot[bot] <support@dependabot.com>
2018-12-06 16:09:13 +09:00
79c837efd9
Bump rubocop from 0.60.0 to 0.61.0 ( #9439 )
...
Bumps [rubocop](https://github.com/rubocop-hq/rubocop ) from 0.60.0 to 0.61.0.
- [Release notes](https://github.com/rubocop-hq/rubocop/releases )
- [Changelog](https://github.com/rubocop-hq/rubocop/blob/master/CHANGELOG.md )
- [Commits](https://github.com/rubocop-hq/rubocop/compare/v0.60.0...v0.61.0 )
Signed-off-by: dependabot[bot] <support@dependabot.com>
2018-12-06 16:08:54 +09:00
88faa4ff2d
Attempt fixing deadlocks by moving account stats update outside transaction ( #9437 )
...
* Use `update_column` instead of `update_attribute` in callback
`update_attribute` would normally cause callbacks to be called.
Called from a callback, it seems to stop further callbacks from executing.
`update_column` does the same work, but without calling callbacks or
preventing other callbacks from executing.
* Fix deadlocks by moving account stats update outside transaction
2018-12-05 22:51:12 +01:00
2a9843a021
Add visible dates for notifications in Notification column ( #9423 )
...
* add RelativeTimestamp elements
* style the elements properly with CSS
2018-12-05 05:08:43 +01:00
5e2cd7f672
Fix thread depth computation in statuses_controller ( #9426 )
...
* Add test that should currently fail
* Fix depth computation (will still fail if statuses have been filtered out)
* Fix handling of broken threads
2018-12-05 02:12:29 +01:00
9734868448
Bump capybara from 3.11.1 to 3.12.0 ( #9388 )
...
Bumps [capybara](https://github.com/teamcapybara/capybara ) from 3.11.1 to 3.12.0.
- [Release notes](https://github.com/teamcapybara/capybara/releases )
- [Changelog](https://github.com/teamcapybara/capybara/blob/master/History.md )
- [Commits](https://github.com/teamcapybara/capybara/compare/3.11.1...3.12.0 )
Signed-off-by: dependabot[bot] <support@dependabot.com>
2018-12-04 09:27:17 +09:00
58a6c7004f
Bump rails-controller-testing from 1.0.2 to 1.0.3 ( #9417 )
...
Bumps [rails-controller-testing](https://github.com/rails/rails-controller-testing ) from 1.0.2 to 1.0.3.
- [Release notes](https://github.com/rails/rails-controller-testing/releases )
- [Commits](https://github.com/rails/rails-controller-testing/compare/v1.0.2...v1.0.3 )
Signed-off-by: dependabot[bot] <support@dependabot.com>
2018-12-04 09:26:55 +09:00
9cecfb2e4f
Bump pry-rails from 0.3.7 to 0.3.8 ( #9418 )
...
Bumps [pry-rails](https://github.com/rweng/pry-rails ) from 0.3.7 to 0.3.8.
- [Release notes](https://github.com/rweng/pry-rails/releases )
- [Commits](https://github.com/rweng/pry-rails/compare/v0.3.7...v0.3.8 )
Signed-off-by: dependabot[bot] <support@dependabot.com>
2018-12-04 09:26:40 +09:00
01861b4f8e
Add database statement timeout of 60s ( #9382 )
2018-12-03 01:32:27 +01:00
626a544d08
Improve account suspension speed and completeness ( #9290 )
...
- Some associations were missing from the clean-up
- Some attributes were not reset on suspension
- Skip federation and streaming deletes when purging a dead domain
- Move account association definitions to concern
2018-12-03 01:32:08 +01:00
3988b60bc2
Merge pull request #838 from ThibG/glitch-soc/features/reply-all-streaming-entries
...
Display a double reply arrow on public pages for toots that are replies
2018-12-02 16:30:52 -06:00
5aaf52b46c
Merge pull request #842 from ThibG/glitch-soc/merge-upstream
...
Merge upstream changes
2018-12-02 20:42:10 +01:00
e5aadde0d5
Merge branch 'master' into glitch-soc/merge-upstream
2018-12-02 20:29:14 +01:00
9b85750348
Bump version to 2.6.5 ( #9413 )
2018-12-02 17:41:38 +01:00
4813053e97
Preload common JSON-LD contexts ( #9412 )
...
Fixes #9411
2018-12-02 16:46:13 +01:00
Thibaut Girka