Commit Graph

17401 Commits (9a600c00284acef251c7e61ee0be03ccd4a3711b)

Author SHA1 Message Date
Ariadne Conill 9a600c0028 Merge pull request 'fun, image tagging, and SOURCE_TAG' (#53) from kouhai/tagging into main
ci/woodpecker/push/woodpecker Pipeline was successful Details
Reviewed-on: #53
2023-04-16 02:11:06 +00:00
kouhai dev 2ff8fbd6e7 oops
ci/woodpecker/push/woodpecker Pipeline was successful Details
ci/woodpecker/pr/woodpecker Pipeline was successful Details
2023-04-15 18:54:02 -07:00
kouhai dev a00a7d1ce2 forgot to save 2023-04-15 18:51:48 -07:00
kouhai dev 4c6679ef33 fix ci 2023-04-15 18:47:38 -07:00
kouhai dev 047aa2c63d re-export 3000 2023-04-15 17:44:15 -07:00
kouhai dev d805785e90 recompose, but with postgres:15-alpine 2023-04-15 17:31:35 -07:00
kouhai dev ad81a51e37 lol, broke the build 2023-03-18 17:07:29 -07:00
kouhai dev e52819c2fb hack: fix excessively noisy babel traces 2023-03-18 14:19:34 -07:00
kouhai dev 093356a9af ugh 2023-03-18 01:54:31 -07:00
kouhai dev 73d37e9e66 compose out of the box, more-or-less 2023-03-18 01:54:21 -07:00
kouhai dev dfdb6b4020 fun, image tagging, and SOURCE_TAG 2023-03-17 01:56:38 -07:00
kouhai dev 758986e170 optimize dockerfile (attempt was made)
ci/woodpecker/push/woodpecker Pipeline was successful Details
2023-03-15 20:48:49 -07:00
kouhai dev 24b1095d14 berry flavored yarn 2023-03-15 20:48:49 -07:00
kouhai dev bc8f689d3b update js deps 2023-03-15 20:47:05 -07:00
kouhai dev a16bd97026 Merge remote-tracking branch 'glitch/main'
ci/woodpecker/push/woodpecker Pipeline failed Details
2023-03-12 20:02:44 -07:00
kouhai dev aa49562d32 Add foreman to development deps
ci/woodpecker/push/woodpecker Pipeline failed Details
2023-03-12 20:00:22 -07:00
kouhai dev dd9655c31f Use {RAILS,NODE}_ENV=development when running webpack-dev-server with Foreman 2023-03-12 20:00:09 -07:00
kouhai dev 9146104f56 Merge remote-tracking branch 'glitch/main' 2023-03-12 19:58:37 -07:00
Claire bb4e211c86
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 bcbc2a43d4
Merge pull request #2121 from ClearlyClaire/glitch-soc/merge-upstream
Merge upstream changes
2023-03-05 20:37:42 +01:00
Christian Schmidt 0e476f3c4f [Glitch] Add `lang` attribute to media and poll options
Port d3eefead30 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
2023-03-05 17:52:53 +01:00
Claire 276c1d32d6 Merge branch 'main' into glitch-soc/merge-upstream 2023-03-02 17:32:38 +01:00
Matt Jankowski af578e8ce0
Fix deprecation warning about merging conditions (#23618) 2023-03-02 16:21:04 +01:00
Matt Jankowski 9da52ac044
Update rspec-rails to version 6.0.1 (#23908) 2023-03-02 15:55:37 +01:00
Matt Jankowski 35dff48edf
Add spec coverage for Admin::Trends::StatusesHelper (#23898) 2023-03-02 15:30:40 +01:00
Shlee 59f42c262b
[Dependashlee] Bump @github/webauthn-json from 0.5.7 to 2.1.1 (js) (#23819) 2023-03-02 11:45:14 +01:00
Shlee 083e18e45b
[Dependashlee] Bump fuzzysort from 1.9.0 to 2.0.4 (JS) (#23822) 2023-03-02 11:41:32 +01:00
Shlee 6047c84468
[Dependashlee] Bump color-blend from 3.0.1 to 4.0.0 (JS) (#23823) 2023-03-02 11:08:22 +01:00
Stanislav Dobrovolschii d9271126ce
Add rspecs for FollowRecommendationsScheduler (#23890) 2023-03-02 10:05:05 +01:00
Matt Jankowski b6602f68eb
Spec coverage for HomeHelper (#23907) 2023-03-02 10:04:14 +01:00
Eugen Rochko cb97ba7a2f
New Crowdin updates (#23802)
Co-authored-by: Yamagishi Kazutoshi <ykzts@desire.sh>
2023-02-28 23:01:05 +09:00
Nick Schonning 56489cdc4f
Autofix Rubocop Style/HashConversion (#23852) 2023-02-28 22:59:19 +09:00
Matt Jankowski 6185efbc3c
Admin mailer spec coverage improvement (#23863) 2023-02-28 22:33:34 +09:00
Shlee f8848a5c8b
[Dependashlee] Update to Puma 6.1.0 (#23795) 2023-02-28 13:30:28 +01:00
Matt Jankowski cc3633539e
Remove unused admin/announcements helper (#23899) 2023-02-28 11:56:50 +01:00
Matt Jankowski 055ed5a616
Remove unused InstancePresenter#sample_accounts method (#23900) 2023-02-27 19:03:35 +01:00
Matt Jankowski 9ee83a9f3b
Add policies and serializers groups to simplecov output (#23897) 2023-02-27 16:35:47 +01:00
Matt Jankowski 4bb39ac3c3
Fix single-record invalid condition on PollVote (#23810) 2023-02-27 09:31:15 +01:00
Christian Schmidt d3eefead30
Add `lang` attribute to media and poll options (#23891) 2023-02-26 20:13:27 +01:00
Claire 6a4be4e966
Merge pull request #2119 from ClearlyClaire/glitch-soc/merge-upstream
Merge upstream changes
2023-02-26 15:06:03 +01:00
Claire b91756fd4d Move misc rules from components/index.scss to components/misc.scss 2023-02-25 23:47:21 +01:00
Claire cc94cc86ae Fix glitch-soc SCSS code style and refactor closer to upstream 2023-02-25 23:46:23 +01:00
Claire ac8512a73a Add glitch-soc's win95.scss and reset.scss to stylelint's ingore list 2023-02-25 23:45:30 +01:00
Christian Schmidt b632c5a55a [Glitch] Add `lang` attribute to preview card
Port 8000a8f230 to glitch-soc

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

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

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

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

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
2023-02-25 14:35:31 +01:00
Claire 859eb01aac Fix building vanilla flavor after JSX change 2023-02-25 14:28:59 +01:00
Claire 4ed09276d5 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