055450bc02
Merge branch 'master' into glitch-soc/merge-upstream
2019-07-19 23:37:41 +02:00
c37c1da41e
Disallow numeric-only hashtags ( #11363 )
...
* Add spec covering numeric-only hashtags
* Fix hashtag regex
2019-07-19 23:22:35 +02:00
650459f93c
Fix some flash notices/alerts staying on unrelated pages ( #11364 )
2019-07-19 23:13:21 +02:00
86d4461948
Fix HTML entities being encoded as hashtag links…
2019-07-19 20:15:03 +02:00
3407ae8683
Fix sanitizer text case for glitch-soc, which preserves lists
2019-07-19 19:16:07 +02:00
490cf3aa03
[Glitch] Add ActivityPub actor representing the entire server
...
Port SCSS changes from 730c4053d6
2019-07-19 18:35:45 +02:00
bf3ab44e77
Remove Atom feeds and old URLs in the form of `GET /:username/updates/:id`
...
Port SCSS changes from b851456139
2019-07-19 18:27:26 +02:00
249991c498
Merge branch 'master' into glitch-soc/merge-upstream
...
Conflicts:
- Gemfile.lock
- app/controllers/accounts_controller.rb
- app/controllers/admin/dashboard_controller.rb
- app/controllers/follower_accounts_controller.rb
- app/controllers/following_accounts_controller.rb
- app/controllers/remote_follow_controller.rb
- app/controllers/stream_entries_controller.rb
- app/controllers/tags_controller.rb
- app/javascript/packs/public.js
- app/lib/sanitize_config.rb
- app/models/account.rb
- app/models/form/admin_settings.rb
- app/models/media_attachment.rb
- app/models/stream_entry.rb
- app/models/user.rb
- app/serializers/initial_state_serializer.rb
- app/services/batched_remove_status_service.rb
- app/services/post_status_service.rb
- app/services/process_mentions_service.rb
- app/services/reblog_service.rb
- app/services/remove_status_service.rb
- app/views/admin/settings/edit.html.haml
- config/locales/simple_form.pl.yml
- config/settings.yml
- docker-compose.yml
2019-07-19 18:26:49 +02:00
6867a0beb5
Bump strong_migrations from 0.4.0 to 0.4.1 ( #11307 )
...
Bumps [strong_migrations](https://github.com/ankane/strong_migrations ) from 0.4.0 to 0.4.1.
- [Release notes](https://github.com/ankane/strong_migrations/releases )
- [Changelog](https://github.com/ankane/strong_migrations/blob/master/CHANGELOG.md )
- [Commits](https://github.com/ankane/strong_migrations/compare/v0.4.0...v0.4.1 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2019-07-20 01:08:02 +09:00
aa22b38fdb
Change single-column mode to scroll the whole page ( #11359 )
...
Fix #10840
2019-07-19 09:25:22 +02:00
4fa6472523
Fix avatar animation on hover when not logged in ( #11349 )
2019-07-19 09:18:23 +02:00
8df0022e66
Added logout to dropdown menu ( #11353 )
...
* Added logout to dropdown menu
* Triggering build-and-test with empty commit as it seems it failed due to some internal failure
* Looks fine, ready to review
* Added changes from review
* method can be null without any problems
* Also target can be null
2019-07-19 03:58:46 +02:00
fda437a020
Fix sanitizing lists contents ( #11354 )
...
* Add test
* Fix code for sanitizing nested lists stripping all tags
2019-07-19 01:44:58 +02:00
730c4053d6
Add ActivityPub actor representing the entire server ( #11321 )
...
* Add support for an instance actor
* Skip username validation for local Application accounts
* Add migration script to create instance actor
* Make Codeclimate happy
* Switch to id -99 for instance actor
* Remove unused `icon` and `image` attributes from instance actor
* Use if/elsif/else instead of return + ternary operator
* Add instance actor to fresh installs
* Use instance actor as instance representative
Use instance actor for forwarding reports, relay operations, and spam
auto-reporting.
* Seed database in test environment
* Fix single-user mode
* Fix tests
* Fix specs to accomodate for an extra `Account`
* Auto-reject follows on instance actor
Following an instance actor might make sense, but we are not handling that
right now, so auto-reject.
* Fix webfinger lookup and serialization for instance actor
* Rename instance actor
* Make it clear in the HTML view that the instance actor should not be blocked
* Raise cache time for instance actor as there's no dynamic content
* Re-use /about/more with a flash message for instance actor profile
2019-07-19 01:44:42 +02:00
f170e0492f
Fix timestamp display in boost/fav modals in RTL locales
2019-07-18 20:56:20 +02:00
4c28511e4e
Fixups
2019-07-18 20:56:20 +02:00
45cee95b14
Public pages RTL fixes
2019-07-18 20:56:20 +02:00
c1752b238f
Unfiy status__prepend with upstream
2019-07-18 20:56:20 +02:00
b021efdefe
RTL fixes
2019-07-18 20:56:20 +02:00
964c78c118
Fix some SCSS for RTL behavior
2019-07-18 20:56:20 +02:00
4199f7fd87
Minor fixup
2019-07-18 20:56:20 +02:00
b743308928
[Glitch] Fix RTL layout of status display names
...
Port d723f2a0a8
2019-07-18 20:56:20 +02:00
bcaea5a9e9
[Glitch] RTL: fix settings button margins in column headers
...
Port ef11347281
2019-07-18 20:56:20 +02:00
fabfa90e6c
Make width breakpoint for removing margins consistent and match upstream
...
Fixes #1136
2019-07-18 20:55:38 +02:00
15c7478c55
Change Dockerfile to bind to 0.0.0.0 instead of docker-compose.yml ( #11351 )
2019-07-18 20:28:05 +02:00
20520e6158
When cleaning up remote statuses, keep bookmarked ones
2019-07-18 13:34:54 +02:00
6ff285d948
Fix *another* typo and crash in StatusIcons
2019-07-18 09:54:59 +02:00
a2df11ebaf
Fix typo and crash in StatusIcons
2019-07-18 09:42:22 +02:00
84e988479e
Fix only one middle dot being recognized in hashtags ( #11345 )
...
Fix #10934
2019-07-18 03:02:56 +02:00
4906cabc6b
Add aac, m4a, 3gp to allowed audio formats ( #11342 )
...
Fix #11186
2019-07-18 03:02:30 +02:00
5bfe1e1f05
Change language detection to include hashtags as words ( #11341 )
2019-07-18 03:02:15 +02:00
3a6fe657ba
Bump rack-attack from 6.0.0 to 6.1.0 ( #11313 )
...
Bumps [rack-attack](https://github.com/kickstarter/rack-attack ) from 6.0.0 to 6.1.0.
- [Release notes](https://github.com/kickstarter/rack-attack/releases )
- [Changelog](https://github.com/kickstarter/rack-attack/blob/master/CHANGELOG.md )
- [Commits](https://github.com/kickstarter/rack-attack/compare/v6.0.0...v6.1.0 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2019-07-18 01:07:02 +02:00
cbd7748961
Bump rubocop-rails from 2.2.0 to 2.2.1 ( #11308 )
...
Bumps [rubocop-rails](https://github.com/rubocop-hq/rubocop-rails ) from 2.2.0 to 2.2.1.
- [Release notes](https://github.com/rubocop-hq/rubocop-rails/releases )
- [Changelog](https://github.com/rubocop-hq/rubocop-rails/blob/master/CHANGELOG.md )
- [Commits](https://github.com/rubocop-hq/rubocop-rails/compare/v2.2.0...v2.2.1 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2019-07-18 01:06:39 +02:00
7cc98eba28
Bump puma from 3.12.1 to 4.0.1 ( #11306 )
...
Bumps [puma](https://github.com/puma/puma ) from 3.12.1 to 4.0.1.
- [Release notes](https://github.com/puma/puma/releases )
- [Changelog](https://github.com/puma/puma/blob/master/History.md )
- [Commits](https://github.com/puma/puma/compare/v3.12.1...v4.0.1 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2019-07-18 01:06:14 +02:00
87f4aea52a
Fix typo in StatusPolicy ( #11344 )
2019-07-18 00:48:26 +02:00
46687a3cbd
Shorten status icon tooltip text
2019-07-17 21:35:34 +02:00
572009cf56
Add status icon for local-only toots
2019-07-17 21:35:34 +02:00
7db7cb31b1
Add tooltips to status icons
2019-07-17 21:35:34 +02:00
7e2b6da57f
Add setting to disable the anti-spam ( #11296 )
...
* Add environment variable to disable the anti-spam
* Move antispam setting to admin settings
* Fix typo
* antispam → spam_check
2019-07-17 21:09:15 +02:00
fccd25cf53
Change terms and privacy policy pages to always be accessible ( #11334 )
...
Fix #11328
2019-07-17 19:29:37 +02:00
873828ad2d
Fix custom CSS controller ( #11336 )
2019-07-17 17:14:25 +02:00
e9cc17bbea
Merge pull request #1164 from ThibG/glitch-soc/cherry-pick-upstream
...
Cherry-pick changes from upstream
2019-07-17 16:56:10 +02:00
5599caef49
Extend AUTHORIZED_FETCH mode to user blocks as well ( #11332 )
...
* Extend AUTHORIZED_FETCH mode to user blocks as well
* Move decision to deny access to StatusPolicy
2019-07-17 01:53:37 +02:00
15ddabf95a
Fix caching headers in ActivityPub endpoints ( #11331 )
...
* Fix reverse-proxy caching in public fetch mode
* Fix caching in ActivityPub-specific controllers
2019-07-17 00:00:39 +02:00
e91bf82083
[Glitch] Add option to disable real-time updates in web UI
...
Port 729723f857
2019-07-16 16:51:08 +02:00
c8a47595fb
Make puma bind address configurable with BIND env var ( #11326 )
2019-07-16 16:12:01 +02:00
729723f857
Add option to disable real-time updates in web UI ( #9984 )
...
Fix #9031
Fix #7913
2019-07-16 16:11:50 +02:00
3598305460
Bump eslint-plugin-jsx-a11y from 6.2.1 to 6.2.3 ( #11314 )
...
Bumps [eslint-plugin-jsx-a11y](https://github.com/evcohen/eslint-plugin-jsx-a11y ) from 6.2.1 to 6.2.3.
- [Release notes](https://github.com/evcohen/eslint-plugin-jsx-a11y/releases )
- [Changelog](https://github.com/evcohen/eslint-plugin-jsx-a11y/blob/master/CHANGELOG.md )
- [Commits](https://github.com/evcohen/eslint-plugin-jsx-a11y/compare/v6.2.1...v6.2.3 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2019-07-16 16:10:20 +02:00
bb7f3e4112
Bump webpack from 4.34.0 to 4.35.3 ( #11309 )
...
Bumps [webpack](https://github.com/webpack/webpack ) from 4.34.0 to 4.35.3.
- [Release notes](https://github.com/webpack/webpack/releases )
- [Commits](https://github.com/webpack/webpack/compare/v4.34.0...v4.35.3 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2019-07-16 16:10:20 +02:00
22f1ec1b1e
Bump lodash from 4.17.13 to 4.17.14 ( #11312 )
...
Bumps [lodash](https://github.com/lodash/lodash ) from 4.17.13 to 4.17.14.
- [Release notes](https://github.com/lodash/lodash/releases )
- [Commits](https://github.com/lodash/lodash/compare/4.17.13...4.17.14 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2019-07-16 16:10:20 +02:00
Thibaut Girka