Commit Graph

2871 Commits

Author SHA1 Message Date
Liam Newman
5f3cc9ad99
Merge branch 'main' into feature/support-import-meta-syntax 2022-03-29 11:38:40 -07:00
Liam Newman
3fed13578d
Merge pull request #2008 from beautify-web/staging/main
Pulling staging/main into main
2022-03-29 01:33:14 -07:00
GitHub Action
a877e951fd Bump version numbers for 1.14.2 2022-03-29 08:30:49 +00:00
Liam Newman
0c4443f7f7
Update release-all.sh 2022-03-29 01:29:42 -07:00
Liam Newman
865a5b4559
Merge pull request #2006 from lyonbot/fix/npm-dep
fix: remove npm dep
2022-03-29 00:57:04 -07:00
Liam Newman
ea23c2af0e
Merge branch 'main' into feature/support-import-meta-syntax 2022-03-29 00:48:41 -07:00
Liam Newman
27341772ab
Merge branch 'main' into fix/npm-dep 2022-03-29 00:47:45 -07:00
Liam Newman
66a95b03d3
Merge pull request #2007 from beautify-web/bitwiseman-patch-2
Remove lock on python black version
2022-03-29 00:47:31 -07:00
Liam Newman
a0f390f2f8 Update formatting 2022-03-29 00:40:37 -07:00
Liam Newman
9871dd44bc
Update pyproject.toml 2022-03-29 00:24:35 -07:00
Liam Newman
0afdebd296
Remove lock on python black version 2022-03-29 00:21:09 -07:00
Liam Newman
3be5c35a86
Remove python 2.7 from CI matrix 2022-03-29 00:19:38 -07:00
lyonlv
24a4a9d5ab fix: remove npm dep 2022-03-29 15:10:47 +08:00
Liam Newman
427b8320b1
Merge branch 'main' into feature/support-import-meta-syntax 2022-03-28 10:39:41 -07:00
Liam Newman
37071a0160
Merge pull request #2000 from beautify-web/staging/main
Pulling staging/main into main
2022-03-28 10:38:01 -07:00
GitHub Action
49fa82c8ed Bump version numbers for 1.14.1 2022-03-28 17:20:38 +00:00
GitHub Action
ef32da440e Update Changelog 2022-03-28 17:20:25 +00:00
Liam Newman
cb20409f0a
Merge pull request #1993 from mhnaeem/feature/add-cmd-enter-for-mac
feature: allow mac users to use command+enter for submit button
2022-03-13 14:33:14 -07:00
Hammad
2df9f3ec28 Fixing styling issues caught by CI 2022-03-13 01:49:24 -03:30
Hammad
a0790551e5 Merge remote-tracking branch 'origin/main' into feature/support-import-meta-syntax 2022-03-13 01:22:30 -03:30
Hammad
1f425d6316 Merge remote-tracking branch 'origin/main' into feature/add-cmd-enter-for-mac 2022-03-13 01:20:00 -03:30
Liam Newman
83f1beccbf
Merge pull request #1996 from mhnaeem/bug/specify-black-package-version
bug: fix psf/black package version
2022-03-12 17:08:03 -08:00
Muhammad Hammad
cf8617a101 bug: fix psf/black package version
The latest release of black has introduced breaking changes which affect the ci pipeline and python test. Specify a version for download until that can be fixed. #1995
2022-03-06 02:32:33 -03:30
Muhammad Hammad
f270c194eb feature: support import.meta syntax and treat it different from an import statement 2022-03-05 17:58:43 -03:30
Muhammad Hammad
ab205a40ec feature: allow mac users to use command+enter for submit button 2022-03-05 17:12:48 -03:30
Liam Newman
6a919cc4ff
Merge pull request #1973 from kevinbackhouse/GHSL-2021-113-fix-ReDoS-second-attempt
GHSL-2021-113: Fix ReDoS bug (second attempt)
2021-12-08 22:58:54 -08:00
Kevin Backhouse
19c5862299
GHSL-2021-113: Fix ReDoS bug (second attempt). 2021-12-08 11:08:37 +00:00
Liam Newman
37098bafd1
Merge pull request #1970 from beautify-web/revert-1968-GHSL-2021-113-fix-ReDoS
Revert "GHSL-2021-113: fix ReDoS bug"
2021-12-07 12:12:25 -08:00
Liam Newman
229b23732e
Revert "GHSL-2021-113: fix ReDoS bug" 2021-12-07 02:03:17 -08:00
Liam Newman
4b3fb8502f
Merge pull request #1968 from kevinbackhouse/GHSL-2021-113-fix-ReDoS
GHSL-2021-113: fix ReDoS bug
2021-12-07 01:48:52 -08:00
Liam Newman
2024564000
Merge branch 'main' into GHSL-2021-113-fix-ReDoS 2021-12-07 01:30:35 -08:00
Kevin Backhouse
034172dafe
GHSL-2021-113: fix ReDoS bug 2021-12-06 17:18:22 +00:00
Liam Newman
f1823505f2
Merge pull request #1967 from bitwiseman/task/normalize
Task/normalize
2021-11-30 13:25:45 -08:00
Liam Newman
baee71c5fc Fix diff 2021-11-30 13:02:19 -08:00
Liam Newman
ca298891b6 Update dependencies 2021-11-30 11:43:22 -08:00
Liam Newman
e5f6c48d4c Add line end normalization 2021-11-30 11:35:10 -08:00
Liam Newman
157a3e08ef
Merge pull request #1966 from beautify-web/bitwiseman-patch-1
Update Node versions in CI, remove Node 10
2021-11-30 11:30:29 -08:00
Liam Newman
d7774d92ea
Update main.yml 2021-11-30 11:14:38 -08:00
Liam Newman
06aa63fb53
Update main.yml 2021-11-30 11:12:36 -08:00
Liam Newman
d619a8bd17
Update Node versions in CI, remove Node 10 2021-11-30 11:07:44 -08:00
Liam Newman
a481700beb
Merge pull request #1951 from SNDST00M/branding
Branding
2021-11-01 13:40:08 -07:00
Liam Newman
d2955e17ed
Merge branch 'main' into branding 2021-10-29 11:17:08 -07:00
Liam Newman
f26b457d10
Merge pull request #1960 from bitwiseman/main
Fix package-lock.json
2021-10-29 11:16:57 -07:00
Liam Newman
43fd8a974c Fix package-lock.json 2021-10-28 09:48:32 -07:00
Liam Newman
47854e7d40
Rename .jsbeautifyrc to jsbeautifyrc 2021-10-28 09:43:30 -07:00
Liam Newman
cd9d29dffd
Merge branch 'main' into branding 2021-10-25 13:09:18 -07:00
Liam Newman
f7d8cd0637
Update README.md 2021-10-25 13:09:01 -07:00
4086606
c4b23354c1 Merge branch 'branding' of https://github.com/4086606/js-beautify into branding 2021-07-15 21:07:12 +01:00
4086606
67b8962216
Add EOF newlines 2021-07-15 21:07:00 +01:00
Liam Newman
770b92d820
Merge branch 'main' into branding 2021-07-15 12:56:51 -07:00