Commit graph

8312 commits

Author SHA1 Message Date
Thibaut Girka
3793296fed Port a few public.js changes from upstream, move some code around
glitch-soc's public.js was a bit out of date, and code was put inappropriately
to the common public.js
2019-01-10 18:45:17 +01:00
Thibaut Girka
ba82ff7c12 [Glitch] Only consider mouse move in scrolling on item insertion
Port 4e067b1bd0 to glitch-soc
2019-01-10 12:09:12 +01:00
Thibaut Girka
069657286f [Glitch] Identify manual scrolling to cancel scroll to top reset on mouse idle
Port 59ecfbd28c to glitch-soc
2019-01-10 12:09:12 +01:00
Thibaut Girka
d768d0b851 [Glitch] Cancel list scroll reset after mouse move on wheel scroll
Port 54bc905a57 to glitch-soc
2019-01-10 12:09:12 +01:00
Thibaut Girka
f4191a8a00 [Glitch] Temporarily hold timeline if mouse moved recently
Port 6e72dda7ef to glitch-soc
2019-01-10 12:09:12 +01:00
Thibaut Girka
cf48c0e6e1 Fix how flavour screenshots are displayed in the vanilla flavour 2019-01-08 20:20:35 +01:00
Thibaut Girka
6fcb487e75 Update glitch-soc admin page style from upstream
Port SCSS changes from 171c20ce72 to glitch-soc
2019-01-08 20:20:35 +01:00
ash lea
b22f9c8792 add list title editing 2019-01-06 13:03:57 +01:00
Thibaut Girka
07592234ac Add local setting to disable swipe-to-change-columns 2019-01-05 21:47:48 +01:00
ThibG
396c1a4c83 Merge pull request #878 from ThibG/glitch-soc/merge-upstream
Merge upstream changes
2019-01-02 20:03:32 +01:00
Thibaut Girka
6956a99a98 [Glitch] Update dependencies for Node.js (2018-12-31)
Port compatibility changes from 101a46ac24 to glitch-soc
2019-01-02 16:07:33 +01:00
Thibaut Girka
9b6e4daca7 [Glitch] Improve admin UI for account view
Port SCSS changes from 8958e58bd4 to glitch-soc
2019-01-02 15:38:48 +01:00
Thibaut Girka
7f96b7ec99 [Glitch] Update emoji codepoint mappings to v11.0
Port 36a5585cac to glitch-soc
2019-01-02 15:36:59 +01:00
Thibaut Girka
6ab727bf6a Revert "Add handler for Move activity (#9629)"
This reverts commit 4e3131f02f.
2019-01-02 15:36:59 +01:00
Thibaut Girka
536dc2cdea Fix some image paths in SCSS files 2019-01-02 15:36:59 +01:00
Thibaut Girka
59a693e210 Fix syntax errors in win95 SCSS file 2019-01-02 15:36:59 +01:00
Thibaut Girka
6f9ac2d85e Fix CircleCI 2019-01-02 15:36:59 +01:00
Thibaut Girka
44f2224606 Merge branch 'master' into glitch-soc/merge-upstream
Conflicts manually resolved:
- app/services/post_status_service.rb
- config/locales/simple_form.pl.yml
- config/routes.rb
- config/webpack/loaders/sass.js
- config/webpack/shared.js
- package.json
- yarn.lock
2019-01-02 15:36:53 +01:00
Eugen Rochko
6936271536 Improve e-mail digest (#9689)
- Reduce time-to-digest from 20 to 7 days
- Fetch mentions starting from +1 day since last login
- Fix case when last login is more recent than last e-mail
- Do not render all mentions, only 40, but show number in subject
- Do not send digest to moved accounts
- Do send digest to silenced accounts
2019-01-02 10:47:32 +01:00
Yamagishi Kazutoshi
735940a1bf Upgrade ESLint to v5.x (#9694) 2019-01-02 07:28:53 +01:00
ThibG
ffcaa4719a Ensure blocked user unfollows blocker if Block/Undo Block are processed out of order (#9687)
* Ensure blocked user unfollows blocker if Block/Undo Block are processed out of order

* Add specs for Block causing unfollow and for out-of-order Block + Undo
2019-01-02 01:12:02 +01:00
Eugen Rochko
ebe56fbca1 Upgrade default Ruby version to 2.6.0 (#9688) 2019-01-01 16:40:17 +01:00
Eugen Rochko
611a9ff3fe Add tootctl accounts follow ACCT (#9414)
Fix #9369
2019-01-01 16:24:26 +01:00
ThibG
fe1c04eed4 Fix icon alignment in onboarding interaction screen (#9686) 2019-01-01 16:19:51 +01:00
Eugen Rochko
9244a06846 Add CSV export for lists and domain blocks (#9677)
Fix #6893
Fix #9268
2019-01-01 13:44:04 +01:00
ThibG
e29480083a Restore ReplyDistributionWorker to allow existing jobs to be processed (#9676) 2019-01-01 13:43:11 +01:00
Yamagishi Kazutoshi
6eae9c5601 Installing libxml2 and libxslt on Docker (#9680) 2019-01-01 04:03:54 +01:00
Eugen Rochko
5fee09d35f Remove visible timestamps for notifications (#9675)
Revert #9423. Issues with line breaks / clutter.
2018-12-31 18:12:07 +01:00
Yamagishi Kazutoshi
101a46ac24 Update dependencies for Node.js (2018-12-31) (#9669)
* Update react-* to v16.7.0

* Upgrade react-hotkeys to v1.1.4

* Update react-intl to v2.7.2

* Update react-select to v2.2.0

* Update react-swipeable-views to v0.13.0

* Upgrade react-textarea-autosize to v7.1.0

* Upgrade redux to v4.0.1

* Upgrade reselect to v4.0.0

* Update raf to v3.4.1

* Update enzyme to v3.8.0

* Update rails-ujs to v5.2.2

* Update axios to v0.18.0

* Update http-link-header to v1.0.2

* Update rellax to v1.7.1

* Update intersection-observer to v0.5.1

* Update stringz to v1.0.0

* Upgrade babel-eslint to v10.0.1

* Update @babel/* to v7.2.x

* Update babel-plugin-react-intl to v3.0.1

* Update babel-plugin-transform-react-remove-prop-types to v0.4.21

* Upgrade dotenv to v6.2.0

* Update express to v4.16.4

* Update webpack to v4.28.3

* Upgrade autoprefixer to v9.4.3

* Update babel-loader to v8.0.4

* Upgrade css-loader to v2.1.0

* Upgrade file-loader to v3.0.1

* Update marky to v1.2.1

* Update mini-css-extract-plugin to v0.5.0

* Update offline-plugin to v5.0.6

* Update style-loader to v0.23.1

* Update eslint-plugin-jsx-a11y to v6.1.2

* yarn upgrade

* fix

* Replace webpack-manifest-plugin to webpack-assets-manifest

* Replace node-zopfli to @gfz/zopfli

* Remove monkey-patch for http-link-header
2018-12-31 18:11:48 +01:00
kodai
9648c59d6f Fix links not being verified (#9673)
Fix #9365
2018-12-31 15:29:10 +01:00
Fred Wenzel
99272005f0 Install both rvm gpg keys in vagrant (#9670) 2018-12-31 05:08:50 +01:00
Jeong Arm
c176b4ec80 Skip full text search if failed (#9654)
* Skip full text search if failed

* Move rescue block to "perform_statuses_search!"
2018-12-30 19:00:29 +01:00
ThibG
0244534700 Avoid duplicate work by merging ReplyDistributionWorker into DistributionWorker (#9660) 2018-12-30 19:00:04 +01:00
ThibG
9bc77287d2 Do not ignore federated reports targetting already-reported accounts (#9534) 2018-12-30 18:58:51 +01:00
ThibG
88b8ddfd9c Immediately go back in browser history upon successfully sending toot (#9663)
Avoids possible misleading delay before redirection during which the
composer would be cleared and redrawn.
2018-12-30 18:58:25 +01:00
Takeshi Umeda
c3a406ec62 If it is disabled, remove the link of the profile directory (#9665) 2018-12-30 18:57:50 +01:00
ThibG
cd5a929037 Fix crash when clearing uninitialized timeline (#9662) 2018-12-30 18:57:39 +01:00
Thibaut Girka
c1b47fe774 Fix crash when clearing uninitialized timeline
Fixes #875
2018-12-30 16:56:55 +01:00
Thibaut Girka
57791a2044 Immediately go back in browser history upon successfully sending toot 2018-12-30 14:07:57 +01:00
ThibG
bdc44c3558 Reduce usage of LD signatures (#9659)
* Do not LDS-sign Follow, Accept, Reject, Undo, Block

* Do not use LDS for Create activities of private toots

* Minor cleanup

* Ignore unsigned activities instead of misattributing them

* Use status.distributable? instead of querying visibility directly
2018-12-30 09:48:59 +01:00
ysksn
41afd670c9 Add specs for FollowLimitValidator (#9655) 2018-12-29 08:24:52 +01:00
ysksn
5eb6d7e3e0 Add specs for BlackListedEmailValidator (#9651)
* Add specs for BlackListedEmailValidator

* Use instance variable
2018-12-29 07:23:44 +01:00
ashleyhull-versent
9d9b81ff42 Replace Ruby 2.3 with 2.6 in CircleCI (#9652)
* Update config.yml

* Update Gemfile

* dropping ruby 2.3

2.3 EOL date: scheduled for 2019-03-31

* Updating docker containers

* Update Gemfile
2018-12-29 07:23:07 +01:00
ysksn
a3b4684435 Add specs for DisallowedHashtagsValidator (#9653)
In order to implement tests easier, `#select_tags` created.
2018-12-29 07:22:51 +01:00
Eugen Rochko
4e3131f02f Add handler for Move activity (#9629) 2018-12-29 02:24:36 +01:00
Ben Lubar
02a84db787 Add healthcheck commands to docker-compose.yml (#9143)
This will allow Docker to be automatically check the health of services.

Docker won't do anything other than showing the state in the output of
"docker-compose ps" by default, but some management tools may watch for
container health events.

Here's what my local instance looks like right now:

          Name                        Command                  State                     Ports
-------------------------------------------------------------------------------------------------------------
mastodon_db_1              docker-entrypoint.sh postgres    Up (healthy)
mastodon_es_1              /usr/local/bin/docker-entr ...   Up (healthy)
mastodon_redis_1           docker-entrypoint.sh redis ...   Up (healthy)
mastodon_redis_cache_1     docker-entrypoint.sh redis ...   Up (healthy)
mastodon_sidekiq_1         /sbin/tini -- bundle exec  ...   Up             3000/tcp, 4000/tcp
mastodon_streaming_1       /sbin/tini -- yarn start         Up (healthy)   3000/tcp, 127.0.0.1:4000->4000/tcp
mastodon_web_1             /sbin/tini -- bash -c rm - ...   Up (healthy)   127.0.0.1:3000->3000/tcp, 4000/tcp
2018-12-29 00:43:41 +01:00
Thibaut Girka
41676bb021 Rename hide_followers_count helper to hide_followers_count? 2018-12-28 20:05:47 +01:00
Thibaut Girka
6b0ee17046 Do not leak followers count on public pages
Fixes #873
2018-12-28 20:05:47 +01:00
ysksn
44c1647ea1 Add specs for StatusPinValidator (#9648) 2018-12-28 18:09:32 +09:00
ysksn
c4559969b4 Add pending specs for StatusLengthValidator (#9647)
* Add pending specs of StatusLengthValidator

* Use instance variable
2018-12-28 08:18:47 +01:00