Skip to content

Commit

Permalink
Merge branch 'development' of https://github.com/tkambler/electron-pr…
Browse files Browse the repository at this point in the history
…eferences into feature/accesibility

 Conflicts:
	index.js
	src/app/components/main/index.jsx
	src/app/components/sidebar/index.jsx
  • Loading branch information
pvrobays committed Sep 13, 2021
2 parents 38eb6b5 + 3d39d19 commit c388849
Show file tree
Hide file tree
Showing 37 changed files with 24,271 additions and 8,598 deletions.
1 change: 1 addition & 0 deletions .eslintignore
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
build
52 changes: 52 additions & 0 deletions .eslintrc
Original file line number Diff line number Diff line change
@@ -0,0 +1,52 @@
{
"extends": [
"xo",
"plugin:react/recommended"
],
"rules": {
"array-bracket-spacing": [
"error",
"always"
],
"padded-blocks": [
"error",
{
"blocks": "always",
"switches": "always",
"classes": "always"
}
],
"padding-line-between-statements": [
"error",
{
"blankLine": "always",
"prev": "multiline-block-like",
"next": "*"
},
{
"blankLine": "always",
"prev": "*",
"next": "return"
}
],
"object-curly-spacing": [
"error",
"always"
],
"semi": [
2,
"always"
],
"space-in-parens": [
"error",
"never"
]
},
"settings": {
"react": {
"pragma": "React",
"fragment": "Fragment",
"version": "detect"
}
}
}
32 changes: 32 additions & 0 deletions .github/ISSUE_TEMPLATE/bug_report.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,32 @@
---
name: Bug report
about: Create a report to help improve electron-preferences
title: ''
labels: bug
assignees: ''

---

**Describe the bug**
A clear and concise description of what the bug is.

**To Reproduce**
Steps to reproduce the behavior:
1. Go to '...'
2. Click on '....'
3. Scroll down to '....'
4. See error

**Expected behavior**
A clear and concise description of what you expected to happen.

**Screenshots**
If applicable, add screenshots to help explain your problem.

**Machine (please complete the following information):**
- OS: [e.g. Windows 10]
- Electron version: [e.g. 13.1.5]
- electron-preferences version: [e.g. 2.x.x]

**Additional context**
Add any other context we should know
20 changes: 20 additions & 0 deletions .github/ISSUE_TEMPLATE/feature_request.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,20 @@
---
name: Feature request
about: Suggest an idea for this project
title: ''
labels: enhancement
assignees: ''

---

**Is your feature request related to a problem? Please describe.**
A clear and concise description of what the problem is. Ex. I'm always frustrated when [...]

**Describe the solution you'd like**
A clear and concise description of what you want to happen.

**Describe alternatives you've considered**
A clear and concise description of any alternative solutions or features you've considered.

**Additional context**
Add any other context or screenshots about the feature request here.
24 changes: 23 additions & 1 deletion CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,10 +1,32 @@
# Changelog
# Changelog
All notable changes to this project will be documented in this file.

The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).

## [Unreleased]
### Fixed
- Always enable electron contextIsolation (#122)

### Added
- Preferences option `debug: true` which opens the devTools by default (#124)
- Expose `browserWindowOverrides` on the preference object (#112)

### Changed
- Checkbox type supports a single boolean value

## [2.4.1] - 2020-07-13
### Fixed
- Focus the preference window when triggering .show() when window was already created
- Allow the Accelerator value to be cleared via a single backspace or delete keydown
- Checkbox crashing on invalid values
- First click on a checkbox is ignored

## [2.4.0] - 2020-07-10
### Added
- File select component
- Support multiple selection of files and folders via the 'multiSelections' option

### Changed
- Read/write settings file atomically
- Debounced saving settings file to 200ms (prevent overwriting disk)
Expand Down
Loading

0 comments on commit c388849

Please sign in to comment.