Commit Graph

17389 Commits (07492326d102380bb0613e723ca383d2cb375617)

Author SHA1 Message Date
kouhai dev 07492326d1 th: berry flavored yarn 2023-04-22 00:38:08 -07:00
kouhai dev 86480e9b49 th: update js deps 2023-04-22 00:38:08 -07:00
kouhai dev ee1dc4a0d1 th: Merge remote-tracking branch 'glitch/main' 2023-04-22 00:38:08 -07:00
kouhai dev 7ce5d26bf4 th: Add foreman to development deps 2023-04-22 00:38:08 -07:00
kouhai dev 3bb32113c8 th: use {RAILS,NODE}_ENV=development when running webpack-dev-server with Foreman 2023-04-22 00:38:08 -07:00
kouhai dev da1aa87c6f th: Merge remote-tracking branch 'glitch/main' 2023-04-22 00:38:08 -07:00
kouhai dev 228f9c72d4 th: update models, node/Gemfile state 2023-04-22 00:38:08 -07:00
kouhai dev 705fd6c182 th: Merge remote-tracking branch 'glitch/main' 2023-04-22 00:38:08 -07:00
kouhai dev a936e75d02 th: Merge remote-tracking branch 'glitch/main' 2023-04-22 00:38:08 -07:00
kouhai dev 4de0440c46 th: consistent dividers 2023-04-22 00:38:08 -07:00
kouhai dev 4f30ab5515 th: add deps rake tasks 2023-04-22 00:38:08 -07:00
Claire f7a679a4f5 New Crowdin updates (#2118)
* New translations en.json (Spanish)
[ci skip]

* New translations en.yml (Spanish)
[ci skip]
2023-03-05 20:38:18 +01:00
Claire 1103612c66 Merge pull request #2121 from ClearlyClaire/glitch-soc/merge-upstream
Merge upstream changes
2023-03-05 20:37:42 +01:00
Christian Schmidt b50a08b15b [Glitch] Add `lang` attribute to media and poll options
Port 41655e16ea to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
2023-03-05 17:52:53 +01:00
Claire a95dc48e01 Merge branch 'main' into glitch-soc/merge-upstream 2023-03-02 17:32:38 +01:00
Matt Jankowski 35cbd0685d Fix deprecation warning about merging conditions (#23618) 2023-03-02 16:21:04 +01:00
Matt Jankowski 0d409f9fd7 Update rspec-rails to version 6.0.1 (#23908) 2023-03-02 15:55:37 +01:00
Matt Jankowski 0fe721074b Add spec coverage for Admin::Trends::StatusesHelper (#23898) 2023-03-02 15:30:40 +01:00
Shlee aadfaf38a8 [Dependashlee] Bump @github/webauthn-json from 0.5.7 to 2.1.1 (js) (#23819) 2023-03-02 11:45:14 +01:00
Shlee a54a2c4af7 [Dependashlee] Bump fuzzysort from 1.9.0 to 2.0.4 (JS) (#23822) 2023-03-02 11:41:32 +01:00
Shlee a2087edbf4 [Dependashlee] Bump color-blend from 3.0.1 to 4.0.0 (JS) (#23823) 2023-03-02 11:08:22 +01:00
Stanislav Dobrovolschii eaea285368 Add rspecs for FollowRecommendationsScheduler (#23890) 2023-03-02 10:05:05 +01:00
Matt Jankowski 5bf8f34842 Spec coverage for HomeHelper (#23907) 2023-03-02 10:04:14 +01:00
Eugen Rochko 096f622340 New Crowdin updates (#23802)
Co-authored-by: Yamagishi Kazutoshi <ykzts@desire.sh>
2023-02-28 23:01:05 +09:00
Nick Schonning 19be243493 Autofix Rubocop Style/HashConversion (#23852) 2023-02-28 22:59:19 +09:00
Matt Jankowski 04082726de Admin mailer spec coverage improvement (#23863) 2023-02-28 22:33:34 +09:00
Shlee 8ed5fc7252 [Dependashlee] Update to Puma 6.1.0 (#23795) 2023-02-28 13:30:28 +01:00
Matt Jankowski 9cf4671ba1 Remove unused admin/announcements helper (#23899) 2023-02-28 11:56:50 +01:00
Matt Jankowski 1d248c3f57 Remove unused InstancePresenter#sample_accounts method (#23900) 2023-02-27 19:03:35 +01:00
Matt Jankowski 7e7fa6cb40 Add policies and serializers groups to simplecov output (#23897) 2023-02-27 16:35:47 +01:00
Matt Jankowski 385ae6681d Fix single-record invalid condition on PollVote (#23810) 2023-02-27 09:31:15 +01:00
Christian Schmidt 41655e16ea Add `lang` attribute to media and poll options (#23891) 2023-02-26 20:13:27 +01:00
Claire 8d645954fa Merge pull request #2119 from ClearlyClaire/glitch-soc/merge-upstream
Merge upstream changes
2023-02-26 15:06:03 +01:00
Claire 42f73a411c Move misc rules from components/index.scss to components/misc.scss 2023-02-25 23:47:21 +01:00
Claire 59b7c6e3d8 Fix glitch-soc SCSS code style and refactor closer to upstream 2023-02-25 23:46:23 +01:00
Claire 2e98a75c36 Add glitch-soc's win95.scss and reset.scss to stylelint's ingore list 2023-02-25 23:45:30 +01:00
Christian Schmidt 5eaad2ae5b [Glitch] Add `lang` attribute to preview card
Port e56145661c to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
2023-02-25 14:43:57 +01:00
Tim Lucas 650ea1316a [Glitch] Increase contrast of upload progress background
Port 808c9a7cf4 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
2023-02-25 14:43:24 +01:00
Botao Wang 213b82d0a4 [Glitch] Fix sidebar cut-off on small screens in admin UI
Port 1f844d0d18 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
2023-02-25 14:40:29 +01:00
Claire 5548b2c73f [Glitch] Add `lang` tag to native language names in language picker
Port 82c464d4d0 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
2023-02-25 14:37:05 +01:00
Renaud Chaput 295d193e7f [Glitch] Rename JSX files with proper `.jsx` extension
Port ae3812d182 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
2023-02-25 14:35:31 +01:00
Claire f3cd30942c Fix building vanilla flavor after JSX change 2023-02-25 14:28:59 +01:00
Claire f15ded319f Merge branch 'main' into glitch-soc/merge-upstream
Conflicts:
- `.prettierignore`:
  Upstream added a line at the end of the file, while glitch-soc had its own
  extra lines.
  Took upstream's change.
- `CONTRIBUTING.md`:
  We have our custom CONTRIBUTING.md quoting upstream. Upstream made changes.
  Ported upstream changes.
- `app/controllers/application_controller.rb`:
  Upstream made code style changes in a method that is entirely replaced
  in glitch-soc.
  Ignored the change.
- `app/models/account.rb`:
  Code style changes textually close to glitch-soc-specific changes.
  Ported upstream changes.
- `lib/sanitize_ext/sanitize_config.rb`:
  Upstream code style changes.
  Ignored them.
2023-02-25 14:00:40 +01:00
Matt Jankowski c759d6f31d Remove unused HTML Validator (#23866) 2023-02-24 20:06:32 +01:00
Christian Schmidt e56145661c Add `lang` attribute to preview card (#23869) 2023-02-24 20:04:38 +01:00
Nick Schonning 1cdd7d6c8f Rename ActivityPub Serializer Specs (#23844) 2023-02-23 23:17:48 +01:00
Claire bc4837a600 Change auto-deletion throttling constants to better scale with server size (#23320) 2023-02-23 16:52:40 +01:00
Tim Lucas 808c9a7cf4 Increase contrast of upload progress background (#23836) 2023-02-23 12:58:42 +01:00
Nick Schonning 43a3812265 Fix mispelled spec filenames (#23834) 2023-02-23 11:28:56 +01:00
Eugen Rochko 6bfb54dccc New Crowdin updates (#23625)
Co-authored-by: Yamagishi Kazutoshi <ykzts@desire.sh>
2023-02-22 21:16:02 +09:00