rubiline
/
Glitch-Shrike
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
19,358 Commits
3 Branches
0 Tags
273 MiB
Commit Graph

19358 Commits (656a41db2ac53329c4eca6897adfd6ce7d9b2344)

Author SHA1 Message Date
Claire 656a41db2a Merge commit '77098c6f1c25958960df98a1510b28352a39704f' into glitch-soc/merge-upstream 
Conflicts:
- `README.md`:
  Upstream has updated its README, we have a completely different one.
  Kept ours.
- `app/views/auth/sessions/two_factor.html.haml`:
  Upstream refactored stuff and the conflict is because of glitch-soc's theming
  system.
  Ported upstream changes while accounting for the different theming system.
 2023-10-17 20:59:18 +02:00
Renaud Chaput 77098c6f1c
Delete .github/FUNDING.yml (#27390) 2023-10-13 12:01:33 +02:00
renovate[bot] 5c287c4958
Update dependency rubocop to v1.57.1 (#27389) 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
 2023-10-13 11:46:25 +02:00
KMY（雪あすか） 45bdd60f3c
Fix when unfollow a tag, my post also disappears from the home timeline (#27391) 2023-10-13 11:15:47 +02:00
github-actions[bot] 773d25e8df
New Crowdin Translations (automated) (#27388) 
Co-authored-by: GitHub Actions <noreply@github.com>
 2023-10-13 11:01:40 +02:00
renovate[bot] 6a9aab38d7
Update dependency devise-two-factor to v4.1.1 (#27382) 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
 2023-10-13 10:52:55 +02:00
Matt Jankowski 133f218a4d
Add system specs for admin area `batch` actions (#25027) 2023-10-13 10:42:59 +02:00
Claire c86ad45660
Change PWA start URL from `/home` to `/` (#27377) 2023-10-12 16:47:18 +02:00
Claire 45a19ddfe4
Merge pull request #2440 from ClearlyClaire/glitch-soc/merge-upstream 
Merge upstream changes up to 27e84c0691
 2023-10-12 12:18:43 +02:00
github-actions[bot] c348b904a5
New Crowdin Translations (automated) (#27376) 
Co-authored-by: GitHub Actions <noreply@github.com>
 2023-10-12 10:07:40 +02:00
Matt Jankowski d4c2dca874
Fix haml-lint `InstanceVariables` rule for auth/sessions/two_factor/o… (#27372) 2023-10-12 09:44:20 +02:00
renovate[bot] 85b36fbbd3
Update dependency devise to v4.9.3 (#27373) 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
 2023-10-12 09:35:25 +02:00
Matt Jankowski d7a8f6b658
Fix haml-lint `InstanceVariables` rule for relationships/account (#27342) 2023-10-11 17:06:26 +02:00
github-actions[bot] f1ae72ba46
New Crowdin Translations (automated) (#27364) 
Co-authored-by: GitHub Actions <noreply@github.com>
 2023-10-11 16:37:01 +02:00
renovate[bot] d0a3331caa
Update dependency rubocop to v1.57.0 (#27371) 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
 2023-10-11 16:36:50 +02:00
François Hodierne 608cd66239
Update README requirements from node 14 to node 16 (#27369) 2023-10-11 16:24:28 +02:00
renovate[bot] 1afb7f4104
Update dependency lograge to v0.14.0 (#27363) 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
 2023-10-11 16:21:59 +02:00
Matt Jankowski f9abe700e7
Fix haml-lint `InstanceVariables` rule for auth/registrations/status (#27341) 2023-10-11 16:20:26 +02:00
renovate[bot] 0111e48893
Update dependency sidekiq to v6.5.12 (#27358) 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
 2023-10-11 16:02:51 +02:00
Matt Jankowski 66becf9a1e
Fix haml-lint `InstanceVariables` rule for admin/reports/actions (#27339) 2023-10-11 15:58:33 +02:00
Claire 7d2cd7195b
Add variable delay before link verification of remote account links (#27351) 2023-10-11 15:14:18 +02:00
Claire 99c72830bc [Glitch] Fix scroll position in thread view reseting when closing a modal 
Port 9d1c3d0678 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2023-10-10 19:53:59 +02:00
Claire 3735e6f79d Merge commit '27e84c069112a3d2abfad947642457cc997a261a' into glitch-soc/merge-upstream 2023-10-10 19:53:41 +02:00
Claire 1a4a23b5c8
Merge pull request #2439 from ClearlyClaire/glitch-soc/merge-upstream 
Merge upstream changes up to 4c2aca777f
 2023-10-10 19:51:17 +02:00
Claire 27e84c0691
Fix duplicate reports being sent when reporting some remote posts (#27355) 2023-10-10 16:00:50 +02:00
Claire 9d1c3d0678
Fix scroll position in thread view reseting when closing a modal (#27350) 2023-10-10 11:35:32 +02:00
github-actions[bot] 1a2a4c389f
New Crowdin Translations (automated) (#27347) 
Co-authored-by: GitHub Actions <noreply@github.com>
 2023-10-10 10:06:37 +02:00
renovate[bot] 1745c582f8
Update dependency sidekiq to v6.5.11 (#27345) 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
 2023-10-10 09:52:09 +02:00
Claire 05159d2f94 [Glitch] Fix clicking on already-loaded thread scrolling to the top of the thread 
Port 4c2aca777f to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2023-10-09 21:15:59 +02:00
Claire 8ef1a95b1c Merge commit '4c2aca777f6ae6942d0cf11aee56a925694ccdef' into glitch-soc/merge-upstream 2023-10-09 21:14:57 +02:00
Renaud Chaput 7b325aa81b [Glitch] Autofix missing comma and indentation in JS files 
Port 774e1189d2 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2023-10-09 21:14:25 +02:00
Claire 4a9cdfb928 Merge commit '774e1189d26fffd914107a4236f6287043c988f8' into glitch-soc/merge-upstream 2023-10-09 21:12:28 +02:00
Claire b63d526590 [Glitch] Fix clicking on already-opened thread post scrolling to the top of the thread 
Port c310374a2f to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2023-10-09 21:11:44 +02:00
Claire 3da7afdeed Merge commit 'c310374a2f83a890520ace50e41c1e3d046e15e1' into glitch-soc/merge-upstream 2023-10-09 21:10:47 +02:00
Claire 4c2aca777f
Fix clicking on already-loaded thread scrolling to the top of the thread (#27338) 2023-10-09 16:46:09 +02:00
Claire 9af24835f6
Merge pull request #2434 from ClearlyClaire/glitch-soc/merge-upstream 
Merge upstream changes up to 640421f661
 2023-10-09 15:44:35 +02:00
Renaud Chaput 774e1189d2
Change `eslint` config to autofix missing comma and indentation in JS files (#26711) 2023-10-09 13:38:29 +02:00
Claire c310374a2f
Fix clicking on already-opened thread post scrolling to the top of the thread (#27331) 2023-10-09 12:21:02 +02:00
github-actions[bot] 89b48681cf
New Crowdin Translations (automated) (#27321) 
Co-authored-by: GitHub Actions <noreply@github.com>
 2023-10-09 10:32:06 +02:00
renovate[bot] 5fc5a548b4
Update DefinitelyTyped types (non-major) (#27327) 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
 2023-10-09 10:19:13 +02:00
renovate[bot] eabe839744
Update eslint (non-major) (#27328) 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
 2023-10-09 09:43:42 +02:00
Claire 967bd543bb [Glitch] Fix auto-loading-more when not scrolled 
Port 2b98e2ecd6 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2023-10-08 17:34:10 +02:00
Claire 53f5b27bd1 Merge commit '640421f661ee4d7e76a2aab607e7b15687940b6f' into glitch-soc/merge-upstream 2023-10-08 17:30:48 +02:00
Claire 86c9c5afa0 Merge commit '40ba6e119b7457161fd43b449875d0fb9d473c1a' into glitch-soc/merge-upstream 
Conflicts:
- `app/controllers/concerns/web_app_controller_concern.rb`:
  Upstream changed the order of Action Controller filters for web app
  controllers.
  Glitch-soc has an extra filter due to its theming system.
  Changed the order accordingly.
- `app/views/settings/preferences/appearance/show.html.haml`:
  Conflict due to an extra newline in glitch-soc.
  Removed that newline and applied upstream's changes.
 2023-10-08 17:26:43 +02:00
Claire ac2370778a Merge commit 'c676bc91e9c3aa81eb7cfbce3c5c5e80b84d3d02' into glitch-soc/merge-upstream 
Conflicts:
- `config/environments/production.rb`:
  Upstream enforced a code style change and glitch-soc had a few different lines.
  Applied upstream's code style to glitch-soc's changes.
 2023-10-08 17:21:12 +02:00
Claire 74c27e33e3 Merge commit '37bbd3c1064380a756b4e821655d7697105f99f5' into glitch-soc/merge-upstream 2023-10-08 17:10:39 +02:00
Michael Stanclift 8eb09c6f72 [Glitch] Keep version string displayed without breakpoints in UI 
Port 5a437edc7f to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2023-10-08 17:09:02 +02:00
Claire a5dbb1ee5a Merge commit '5a437edc7f22d5797e5af29d9b450a03eccec304' into glitch-soc/merge-upstream 2023-10-08 17:05:40 +02:00
Claire e83059fd9d [Glitch] Fix explore prompt appearing because of posts being received out of order 
Port d80a819fc6 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2023-10-08 17:03:40 +02:00
Claire e9a181c52c Merge commit 'e95d25e1013b6328457b81bd98e8d6a841d45ec2' into glitch-soc/merge-upstream 2023-10-08 16:53:05 +02:00