tykayn/mastodon
1
0
Fork 0
mirror of https://framagit.org/tykayn/mastodon.git synced 2023-08-25 08:33:12 +02:00
Code Issues Projects Releases Wiki Activity
12,622 Commits 20 Branches 113 Tags 222 MiB
a681980307
Commit Graph

12622 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Thibaut Girka
a681980307 Submit timeline markers closer to the moment they change 2020-09-17 15:22:56 +02:00
Thibaut Girka
60eebc6cc4 Fix crashes when connection drops 2020-09-17 15:22:56 +02:00
Thibaut Girka
f1c0cf9806 Add button to manually mark all notifications as read 2020-09-17 15:22:56 +02:00
Thibaut Girka
94c290d7d2 Only update read marker when giving focus/mounting column 2020-09-17 15:22:56 +02:00
Thibaut Girka
145ed37978 Refactor and change logic to only update marker if we reached the last 
read notification.
 2020-09-17 15:22:56 +02:00
Thibaut Girka
66e9a77e36 Display unread marker for notifications 2020-09-17 15:22:56 +02:00
Thibaut Girka
ae698469d0 Clean up leftover from DM conversation view redesign 2020-09-17 15:22:56 +02:00
kedama
afa753a890 [Glitch] Set z-index of dropdown to 9999. 
Port 678f5ed296 to glitch-soc

Signed-off-by: Thibaut Girka <thib@sitedethib.com>
 2020-09-10 17:44:38 +02:00
ThibG
6e83020950
Merge pull request #1419 from ThibG/glitch-soc/merge-upstream 
Merge upstream changes
 2020-09-08 17:20:00 +02:00
Thibaut Girka
9748f074a3 Merge branch 'master' into glitch-soc/merge-upstream 
Conflicts:
- app/controllers/api/v1/timelines/public_controller.rb
- app/lib/feed_manager.rb
- app/models/status.rb
- app/services/precompute_feed_service.rb
- app/workers/feed_insert_worker.rb
- spec/models/status_spec.rb

All conflicts are due to upstream refactoring feed management and us having
local-only toots on top of that. Rewrote local-only toots management for
upstream's changes.
 2020-09-08 16:26:47 +02:00
Eugen Rochko
65760f59df
Refactor feed manager (#14761) 2020-09-08 03:41:16 +02:00
dependabot[bot]
169f9105ef
Bump browserslist from 4.14.0 to 4.14.1 (#14753) 
Bumps [browserslist](https://github.com/browserslist/browserslist) from 4.14.0 to 4.14.1.
- [Release notes](https://github.com/browserslist/browserslist/releases)
- [Changelog](https://github.com/browserslist/browserslist/blob/master/CHANGELOG.md)
- [Commits](https://github.com/browserslist/browserslist/compare/4.14.0...4.14.1)

Signed-off-by: dependabot[bot] <support@github.com>

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
 2020-09-08 02:43:22 +02:00
dependabot[bot]
d1c68aa0d8
Bump puma from 4.3.5 to 4.3.6 (#14750) 
Bumps [puma](https://github.com/puma/puma) from 4.3.5 to 4.3.6.
- [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/v4.3.5...v4.3.6)

Signed-off-by: dependabot[bot] <support@github.com>

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
 2020-09-08 08:23:13 +09:00
dependabot[bot]
60282931c1
Bump rubocop from 0.88.0 to 0.90.0 (#14747) 
Bumps [rubocop](https://github.com/rubocop-hq/rubocop) from 0.88.0 to 0.90.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.88.0...v0.90.0)

Signed-off-by: dependabot[bot] <support@github.com>

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
 2020-09-08 08:22:54 +09:00
dependabot[bot]
ac58059cc5
Bump caniuse-lite from 1.0.30001120 to 1.0.30001124 (#14756) 
Bumps [caniuse-lite](https://github.com/ben-eb/caniuse-lite) from 1.0.30001120 to 1.0.30001124.
- [Release notes](https://github.com/ben-eb/caniuse-lite/releases)
- [Changelog](https://github.com/ben-eb/caniuse-lite/blob/master/CHANGELOG.md)
- [Commits](https://github.com/ben-eb/caniuse-lite/compare/v1.0.30001120...v1.0.30001124)

Signed-off-by: dependabot[bot] <support@github.com>

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
 2020-09-08 05:45:50 +09:00
dependabot[bot]
4dfa9a58de
Bump ox from 2.13.2 to 2.13.3 (#14751) 
Bumps [ox](https://github.com/ohler55/ox) from 2.13.2 to 2.13.3.
- [Release notes](https://github.com/ohler55/ox/releases)
- [Changelog](https://github.com/ohler55/ox/blob/develop/CHANGELOG.md)
- [Commits](https://github.com/ohler55/ox/compare/v2.13.2...v2.13.3)

Signed-off-by: dependabot[bot] <support@github.com>

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
 2020-09-08 05:22:50 +09:00
dependabot[bot]
ae36540455
Bump oj from 3.10.13 to 3.10.14 (#14749) 
Bumps [oj](https://github.com/ohler55/oj) from 3.10.13 to 3.10.14.
- [Release notes](https://github.com/ohler55/oj/releases)
- [Changelog](https://github.com/ohler55/oj/blob/develop/CHANGELOG.md)
- [Commits](https://github.com/ohler55/oj/compare/v3.10.13...v3.10.14)

Signed-off-by: dependabot[bot] <support@github.com>

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
 2020-09-08 05:22:33 +09:00
dependabot[bot]
0d38c911dd
Bump sass-loader from 9.0.3 to 10.0.2 (#14741) 
Bumps [sass-loader](https://github.com/webpack-contrib/sass-loader) from 9.0.3 to 10.0.2.
- [Release notes](https://github.com/webpack-contrib/sass-loader/releases)
- [Changelog](https://github.com/webpack-contrib/sass-loader/blob/master/CHANGELOG.md)
- [Commits](https://github.com/webpack-contrib/sass-loader/compare/v9.0.3...v10.0.2)

Signed-off-by: dependabot[bot] <support@github.com>

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
 2020-09-08 05:22:10 +09:00
dependabot[bot]
50f763fcd9
Bump aws-partitions from 1.363.0 to 1.365.0 (#14748) 
Bumps [aws-partitions](https://github.com/aws/aws-sdk-ruby) from 1.363.0 to 1.365.0.
- [Release notes](https://github.com/aws/aws-sdk-ruby/releases)
- [Changelog](https://github.com/aws/aws-sdk-ruby/blob/master/gems/aws-partitions/CHANGELOG.md)
- [Commits](https://github.com/aws/aws-sdk-ruby/commits)

Signed-off-by: dependabot[bot] <support@github.com>

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
 2020-09-08 05:21:01 +09:00
dependabot[bot]
af06c2d15a
Bump esrecurse from 4.2.1 to 4.3.0 (#14746) 
Bumps [esrecurse](https://github.com/estools/esrecurse) from 4.2.1 to 4.3.0.
- [Release notes](https://github.com/estools/esrecurse/releases)
- [Commits](https://github.com/estools/esrecurse/compare/v4.2.1...v4.3.0)

Signed-off-by: dependabot[bot] <support@github.com>

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
 2020-09-08 05:19:03 +09:00
dependabot[bot]
cf74378543
Bump postgres-date from 1.0.6 to 1.0.7 (#14745) 
Bumps [postgres-date](https://github.com/bendrucker/postgres-date) from 1.0.6 to 1.0.7.
- [Release notes](https://github.com/bendrucker/postgres-date/releases)
- [Commits](https://github.com/bendrucker/postgres-date/compare/v1.0.6...v1.0.7)

Signed-off-by: dependabot[bot] <support@github.com>

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
 2020-09-08 05:18:10 +09:00
dependabot[bot]
da12b5b112
Bump postcss-calc from 7.0.3 to 7.0.4 (#14752) 
Bumps [postcss-calc](https://github.com/postcss/postcss-calc) from 7.0.3 to 7.0.4.
- [Release notes](https://github.com/postcss/postcss-calc/releases)
- [Changelog](https://github.com/postcss/postcss-calc/blob/master/CHANGELOG.md)
- [Commits](https://github.com/postcss/postcss-calc/compare/v7.0.3...v7.0.4)

Signed-off-by: dependabot[bot] <support@github.com>

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
 2020-09-08 05:17:46 +09:00
dependabot[bot]
0ea5718415
Bump @babel/plugin-transform-runtime from 7.11.0 to 7.11.5 (#14754) 
Bumps [@babel/plugin-transform-runtime](https://github.com/babel/babel/tree/HEAD/packages/babel-plugin-transform-runtime) from 7.11.0 to 7.11.5.
- [Release notes](https://github.com/babel/babel/releases)
- [Changelog](https://github.com/babel/babel/blob/main/CHANGELOG.md)
- [Commits](https://github.com/babel/babel/commits/v7.11.5/packages/babel-plugin-transform-runtime)

Signed-off-by: dependabot[bot] <support@github.com>

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
 2020-09-08 05:17:08 +09:00
dependabot[bot]
1fb01185a9
Bump public_suffix from 4.0.5 to 4.0.6 (#14743) 
Bumps [public_suffix](https://github.com/weppos/publicsuffix-ruby) from 4.0.5 to 4.0.6.
- [Release notes](https://github.com/weppos/publicsuffix-ruby/releases)
- [Changelog](https://github.com/weppos/publicsuffix-ruby/blob/master/CHANGELOG.md)
- [Commits](https://github.com/weppos/publicsuffix-ruby/compare/v4.0.5...v4.0.6)

Signed-off-by: dependabot[bot] <support@github.com>

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
 2020-09-08 05:15:39 +09:00
dependabot[bot]
2c3b3c2235
Bump @babel/core from 7.11.1 to 7.11.6 (#14755) 
Bumps [@babel/core](https://github.com/babel/babel/tree/HEAD/packages/babel-core) from 7.11.1 to 7.11.6.
- [Release notes](https://github.com/babel/babel/releases)
- [Changelog](https://github.com/babel/babel/blob/main/CHANGELOG.md)
- [Commits](https://github.com/babel/babel/commits/v7.11.6/packages/babel-core)

Signed-off-by: dependabot[bot] <support@github.com>

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
 2020-09-08 05:13:04 +09:00
dependabot[bot]
c3b5e38c78
Bump eventemitter3 from 4.0.5 to 4.0.7 (#14742) 
Bumps [eventemitter3](https://github.com/primus/eventemitter3) from 4.0.5 to 4.0.7.
- [Release notes](https://github.com/primus/eventemitter3/releases)
- [Commits](https://github.com/primus/eventemitter3/compare/4.0.5...4.0.7)

Signed-off-by: dependabot[bot] <support@github.com>

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
 2020-09-08 05:12:16 +09:00
dependabot[bot]
744aeefb4e
Bump bcrypt from 3.1.15 to 3.1.16 (#14739) 
Bumps [bcrypt](https://github.com/codahale/bcrypt-ruby) from 3.1.15 to 3.1.16.
- [Release notes](https://github.com/codahale/bcrypt-ruby/releases)
- [Changelog](https://github.com/codahale/bcrypt-ruby/blob/master/CHANGELOG)
- [Commits](https://github.com/codahale/bcrypt-ruby/compare/v3.1.15...v3.1.16)

Signed-off-by: dependabot[bot] <support@github.com>

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
 2020-09-08 05:11:21 +09:00
dependabot[bot]
5179a8051c
Bump warden from 1.2.8 to 1.2.9 (#14738) 
Bumps [warden](https://github.com/hassox/warden) from 1.2.8 to 1.2.9.
- [Release notes](https://github.com/hassox/warden/releases)
- [Changelog](https://github.com/wardencommunity/warden/blob/master/CHANGELOG.md)
- [Commits](https://github.com/hassox/warden/compare/v1.2.8...v1.2.9)

Signed-off-by: dependabot[bot] <support@github.com>

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
 2020-09-08 05:10:49 +09:00
dependabot[bot]
0f39fc609f
Bump brakeman from 4.9.0 to 4.9.1 (#14737) 
Bumps [brakeman](https://github.com/presidentbeef/brakeman) from 4.9.0 to 4.9.1.
- [Release notes](https://github.com/presidentbeef/brakeman/releases)
- [Changelog](https://github.com/presidentbeef/brakeman/blob/main/CHANGES.md)
- [Commits](https://github.com/presidentbeef/brakeman/compare/v4.9.0...v4.9.1)

Signed-off-by: dependabot[bot] <support@github.com>

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
 2020-09-08 05:09:44 +09:00
dependabot[bot]
16b9074a5d
Bump electron-to-chromium from 1.3.545 to 1.3.562 (#14757) 
Bumps [electron-to-chromium](https://github.com/kilian/electron-to-chromium) from 1.3.545 to 1.3.562.
- [Release notes](https://github.com/kilian/electron-to-chromium/releases)
- [Changelog](https://github.com/Kilian/electron-to-chromium/blob/master/CHANGELOG.md)
- [Commits](https://github.com/kilian/electron-to-chromium/compare/v1.3.545...v1.3.562)

Signed-off-by: dependabot[bot] <support@github.com>

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
 2020-09-08 05:09:18 +09:00
dependabot[bot]
081571549c
Bump rdf from 3.1.5 to 3.1.6 (#14736) 
Bumps [rdf](https://github.com/ruby-rdf/rdf) from 3.1.5 to 3.1.6.
- [Release notes](https://github.com/ruby-rdf/rdf/releases)
- [Changelog](https://github.com/ruby-rdf/rdf/blob/develop/CHANGES.md)
- [Commits](https://github.com/ruby-rdf/rdf/compare/3.1.5...3.1.6)

Signed-off-by: dependabot[bot] <support@github.com>

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
 2020-09-08 05:08:59 +09:00
dependabot[bot]
507ed51983
Bump rubocop-rails from 2.6.0 to 2.8.0 (#14734) 
Bumps [rubocop-rails](https://github.com/rubocop-hq/rubocop-rails) from 2.6.0 to 2.8.0.
- [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.6.0...v2.8.0)

Signed-off-by: dependabot[bot] <support@github.com>

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
 2020-09-08 05:08:17 +09:00
dependabot[bot]
4c2f87e24e
Bump sidekiq-unique-jobs from 6.0.22 to 6.0.23 (#14735) 
Bumps [sidekiq-unique-jobs](https://github.com/mhenrixon/sidekiq-unique-jobs) from 6.0.22 to 6.0.23.
- [Release notes](https://github.com/mhenrixon/sidekiq-unique-jobs/releases)
- [Changelog](https://github.com/mhenrixon/sidekiq-unique-jobs/blob/master/CHANGELOG.md)
- [Commits](https://github.com/mhenrixon/sidekiq-unique-jobs/compare/v6.0.22...v6.0.23)

Signed-off-by: dependabot[bot] <support@github.com>

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
 2020-09-08 05:06:23 +09:00
dependabot[bot]
e2dc61d0f4
Bump tar from 6.0.2 to 6.0.5 (#14758) 
Bumps [tar](https://github.com/npm/node-tar) from 6.0.2 to 6.0.5.
- [Release notes](https://github.com/npm/node-tar/releases)
- [Changelog](https://github.com/npm/node-tar/blob/master/CHANGELOG.md)
- [Commits](https://github.com/npm/node-tar/compare/v6.0.2...v6.0.5)

Signed-off-by: dependabot[bot] <support@github.com>

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
 2020-09-08 05:05:24 +09:00
ThibG
517af45e32
Fix multiple boosts of a same toot erroneously appearing in TL (#14759) 
* Check for and record reblog info atomically

Instead of using ZREVRANK to determine whether a reblog is a new reblog or not,
use ZADD's NX option to perform the check/addition option atomically.

* Replace ZREVRANK call with ZSCORE key which is more efficient

* Make tests a bit stricter

* Fix off-by-one
 2020-09-07 18:00:15 +02:00
abcang
e79d719e92
Changed tag most_used to recently_used (#14760) 2020-09-07 17:47:41 +02:00
ThibG
437d71bddf
Merge pull request #1418 from ThibG/glitch-soc/merge-upstream 
Merge upstream changes
 2020-09-07 14:16:54 +02:00
Eugen Rochko
e8bc187845
Refactor how public and tag timelines are queried (#14728) 2020-09-07 11:02:04 +02:00
Thibaut Girka
e5f934ddf0 Merge branch 'master' into glitch-soc/merge-upstream 
Conflicts:
- `app/controllers/activitypub/collections_controller.rb`:
  Conflict caused because we have additional code to make sure pinned
  local-only toots don't get rendered on the ActivityPub endpoints.
  Ported upstream changes.
 2020-09-07 09:21:38 +02:00
Eugen Rochko
a6121a159c
Remove obsolete IndexedDB operations from web UI (#14730) 
Storing objects in IndexedDB was disabled in #7932, but we were
still trying to read objects from it before making an API call
 2020-09-04 20:22:40 +02:00
Eugen Rochko
68d3b160de
Fix various warnings in rspec (#14729) 2020-09-04 20:22:26 +02:00
Takeshi Umeda
272aa4a109
Fix direct visibility style for light theme (#14727) 2020-09-04 08:49:56 +02:00
ThibG
abee40b232
Add outbox attribute to instance actor (#14721) 
It's not useful for now, but it's required by ActivityPub
 2020-09-02 18:42:50 +02:00
Takeshi Umeda
33ad850c98
Added account featured tags API (#11817) 2020-09-02 02:13:10 +02:00
Eugen Rochko
17340365bb
Add featured hashtags as an ActivityPub collection (#11595) 2020-09-02 02:11:12 +02:00
Y.Yamashiro
abc91e5fa6
Change S3 ACL in "tootctl media remove-orphans --fix-permissions" from fixed value to environment file's value. (#14715) 2020-09-02 00:17:58 +02:00
ThibG
d967251fdc
Merge pull request #1417 from ThibG/glitch-soc/merge-upstream 
Merge upstream changes
 2020-09-01 17:36:30 +02:00
ThibG
787a629b8f [Glitch] Update Tesseract.js 
Port 5fc5a9f9f1 to glitch-soc

Signed-off-by: Thibaut Girka <thib@sitedethib.com>
 2020-09-01 17:10:20 +02:00
ThibG
a2d66a90e6 [Glitch] Add border around 🐞 emoji 
Port JS change from f0b6ddd979 to glitch-soc

Signed-off-by: Thibaut Girka <thib@sitedethib.com>
 2020-09-01 17:08:09 +02:00
Thibaut Girka
3fefb7909b Merge branch 'master' into glitch-soc/merge-upstream 
Conflicts:
- `config/webpack/shared.js`:
  Upstream has changed how Tesseract.js gets included and dropped a dependency.
  The conflict is caused by glitch-soc having different code due to its
  theming system.
  Ported upstream changes.
- `lib/mastodon/version.rb`:
  Upstream refactor/code style change in a place we replaced upstream's
  repo URL with ours.
  Ported upstram changes, keeping our repo URL.
- `yarn.lock`:
  Upstream dropped dependencies, one of which was textually too close to
  a glitch-soc-specific dependency. Not a real conflict.
 2020-09-01 17:02:18 +02:00