Skip to content

Commit 52b51f9

Browse files
vbernier02vbernier02
authored
Merge branch 'FossifyOrg:master' into master
2 parents b8b4cf8 + c391867 commit 52b51f9

39 files changed

+732
-218
lines changed

‎.github/PULL_REQUEST_TEMPLATE.md‎

Lines changed: 0 additions & 28 deletions
This file was deleted.

‎.github/dependabot.yml‎

Lines changed: 34 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,34 @@
1+
version: 2
2+
updates:
3+
- package-ecosystem: "bundler"
4+
directory: "/"
5+
schedule:
6+
interval: "weekly"
7+
commit-message:
8+
prefix: "chore"
9+
prefix-development: "chore"
10+
include: "scope"
11+
assignees:
12+
- "naveensingh"
13+
14+
- package-ecosystem: "gradle"
15+
directory: "/"
16+
schedule:
17+
interval: "weekly"
18+
commit-message:
19+
prefix: "chore"
20+
prefix-development: "chore"
21+
include: "scope"
22+
assignees:
23+
- "naveensingh"
24+
25+
- package-ecosystem: "github-actions"
26+
directory: "/"
27+
schedule:
28+
interval: "weekly"
29+
commit-message:
30+
prefix: "chore"
31+
prefix-development: "chore"
32+
include: "scope"
33+
assignees:
34+
- "naveensingh"

‎.github/workflows/foss-release.yml‎

Lines changed: 25 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,25 @@
1+
name: Github Release
2+
3+
on:
4+
push:
5+
tags:
6+
- "*.*.*"
7+
8+
permissions:
9+
contents: read
10+
11+
jobs:
12+
call-release-workflow:
13+
uses: FossifyOrg/.github/.github/workflows/release.yml@main
14+
with:
15+
tag: ${{ github.ref_name }}
16+
flavor: "foss"
17+
package_name: "org.fossify.notes"
18+
19+
secrets:
20+
ANDROID_KEYSTORE_BASE64: ${{ secrets.ANDROID_KEYSTORE_BASE64 }}
21+
SIGNING_KEY_ALIAS: ${{ secrets.SIGNING_KEY_ALIAS }}
22+
SIGNING_KEY_PASSWORD: ${{ secrets.SIGNING_KEY_PASSWORD }}
23+
SIGNING_STORE_PASSWORD: ${{ secrets.SIGNING_STORE_PASSWORD }}
24+
SERVICE_ACCOUNT_JSON_KEY_BASE64: ""
25+
FOSSIFYBOT_TOKEN: ${{ secrets.FOSSIFYBOT_TOKEN }}

‎.github/workflows/gplay-release.yml‎

Lines changed: 46 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,46 @@
1+
name: Google Play Release
2+
3+
on:
4+
workflow_dispatch:
5+
inputs:
6+
track:
7+
description: "Google Play Store release track"
8+
required: false
9+
type: choice
10+
default: "beta"
11+
options:
12+
- internal
13+
- alpha
14+
- beta
15+
- production
16+
rollout:
17+
description: "Rollout fraction (0.0-1.0)"
18+
required: false
19+
type: string
20+
default: "0.05"
21+
validate_only:
22+
description: "Fastlane dry-run?"
23+
required: false
24+
type: boolean
25+
default: false
26+
27+
permissions:
28+
contents: read
29+
30+
jobs:
31+
call-release-workflow:
32+
uses: FossifyOrg/.github/.github/workflows/release.yml@main
33+
with:
34+
flavor: "gplay"
35+
package_name: "org.fossify.notes"
36+
track: ${{ github.event.inputs.track }}
37+
rollout: ${{ github.event.inputs.rollout }}
38+
validate_only: ${{ github.event.inputs.validate_only == 'true' }}
39+
40+
secrets:
41+
ANDROID_KEYSTORE_BASE64: ${{ secrets.ANDROID_KEYSTORE_BASE64 }}
42+
SIGNING_KEY_ALIAS: ${{ secrets.SIGNING_KEY_ALIAS }}
43+
SIGNING_KEY_PASSWORD: ${{ secrets.SIGNING_KEY_PASSWORD }}
44+
SIGNING_STORE_PASSWORD: ${{ secrets.SIGNING_STORE_PASSWORD }}
45+
SERVICE_ACCOUNT_JSON_KEY_BASE64: ${{ secrets.SERVICE_ACCOUNT_JSON_KEY_BASE64 }}
46+
FOSSIFYBOT_TOKEN: ""

‎.github/workflows/pr-labeler.yml‎

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,15 @@
1+
name: PR Labeler
2+
3+
on:
4+
pull_request_target:
5+
types: [opened]
6+
7+
permissions:
8+
contents: read
9+
# write permission is not required as FOSSIFYBOT_TOKEN is used
10+
11+
jobs:
12+
call-pr-labeler-workflow:
13+
uses: FossifyOrg/.github/.github/workflows/pr-labeler.yml@main
14+
secrets:
15+
FOSSIFYBOT_TOKEN: ${{ secrets.FOSSIFYBOT_TOKEN }}

‎.github/workflows/release-commenter.yml‎

Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,17 @@
1+
name: Release Commenter
2+
3+
on:
4+
release:
5+
types: [published]
6+
7+
permissions:
8+
contents: read
9+
issues: read
10+
pull-requests: read
11+
# write permission is not required as FOSSIFYBOT_TOKEN is used
12+
13+
jobs:
14+
call-release-commenter:
15+
uses: FossifyOrg/.github/.github/workflows/release-commenter.yml@main
16+
secrets:
17+
FOSSIFYBOT_TOKEN: ${{ secrets.FOSSIFYBOT_TOKEN }}

‎.gitignore‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,5 +9,4 @@
99
keystore.jks
1010
keystore.properties
1111
fastlane/fastlane.json
12-
Gemfile
13-
Gemfile.lock
12+
fastlane/report.xml

‎CHANGELOG.md‎

Lines changed: 61 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -1,21 +1,67 @@
1-
Changelog
2-
==========
1+
# Changelog
32

4-
Version 1.1.1 *(2025-03-18)
5-
----------------------------
3+
All notable changes to this project will be documented in this file.
64

7-
* Fixed security vulnerability in app lock
8-
* Minor bug fixes and improvements
9-
* Added more translations
5+
The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.1.0/),
6+
and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
107

11-
Version 1.1.0 *(2024-07-22)
12-
----------------------------
8+
## [1.2.0] - 2025-05-07
139

14-
* Added collapsible checked items section at the bottom
15-
* Minor bug fixes and improvements
16-
* Added new translations
10+
### Added
1711

18-
Version 1.0.0 *(2024-04-14)*
19-
----------------------------
12+
- Support for per-note sorting ([#81])
2013

21-
* Initial release
14+
### Changed
15+
16+
- Replaced checkboxes in settings with switches
17+
- Moved "Move checked items to the bottom" sort option to app settings
18+
- Updated translations
19+
20+
### Fixed
21+
22+
- Multiline pastes are now correctly reflected in the UI ([#99])
23+
- Fixed sorting in widgets and Open Notes dialog ([#83], [#110])
24+
- Corrected security label color in settings
25+
26+
### Removed
27+
28+
- Dropped support for Android 7 and older versions
29+
30+
## [1.1.1] - 2025-03-18
31+
32+
### Changed
33+
34+
- Minor bug fixes and improvements
35+
- Added more translations
36+
37+
### Fixed
38+
39+
- Fixed security vulnerability in app lock
40+
41+
## [1.1.0] - 2024-07-22
42+
43+
### Added
44+
45+
- Added collapsible checked items section at the bottom
46+
47+
### Changed
48+
49+
- Minor bug fixes and improvements
50+
- Added new translations
51+
52+
## [1.0.0] - 2024-04-14
53+
54+
### Added
55+
56+
- Initial release
57+
58+
[Unreleased]: https://github.com/FossifyOrg/Notes/compare/1.2.0...HEAD
59+
[1.2.0]: https://github.com/FossifyOrg/Notes/compare/1.1.1...1.2.0
60+
[1.1.1]: https://github.com/FossifyOrg/Notes/compare/1.1.0...1.1.1
61+
[1.1.0]: https://github.com/FossifyOrg/Notes/compare/1.0.0...1.1.0
62+
[1.0.0]: https://github.com/FossifyOrg/Notes/releases/tag/1.0.0
63+
64+
[#81]: https://github.com/FossifyOrg/Notes/issues/81
65+
[#83]: https://github.com/FossifyOrg/Notes/issues/83
66+
[#99]: https://github.com/FossifyOrg/Notes/issues/99
67+
[#110]: https://github.com/FossifyOrg/Notes/issues/110

‎Gemfile‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
source "https://rubygems.org"
2+
3+
gem "fastlane"
4+
gem "fastlane-plugin-fossify", "~> 1.0"

0 commit comments

Comments
 (0)