Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix: typos #1351

Merged
merged 1 commit into from
Jan 24, 2024
Merged

fix: typos #1351

merged 1 commit into from
Jan 24, 2024

Conversation

barredterra
Copy link
Collaborator

No description provided.

@ruchamahabal
Copy link
Member

Unrelated tests failing. Will be fixed with this: #1352

@ruchamahabal ruchamahabal merged commit b57ec34 into frappe:develop Jan 24, 2024
6 of 8 checks passed
mergify bot pushed a commit that referenced this pull request Jan 24, 2024
(cherry picked from commit b57ec34)
mergify bot pushed a commit that referenced this pull request Jan 24, 2024
(cherry picked from commit b57ec34)

# Conflicts:
#	frontend/src/components/FormView.vue
@barredterra barredterra deleted the fix-typos branch January 24, 2024 16:44
ruchamahabal added a commit that referenced this pull request Jan 24, 2024
* fix: typos (#1351)

(cherry picked from commit b57ec34)

* chore: delete unused file

---------

Co-authored-by: Raffael Meyer <[email protected]>
Co-authored-by: Rucha Mahabal <[email protected]>
ruchamahabal pushed a commit that referenced this pull request Jan 24, 2024
(cherry picked from commit b57ec34)

Co-authored-by: Raffael Meyer <[email protected]>
frappe-pr-bot pushed a commit that referenced this pull request Jan 31, 2024
# [15.10.0](v15.9.2...v15.10.0) (2024-01-31)

### Bug Fixes

* background scroll ([cbed472](cbed472))
* caching of rendered job openings ([d570998](d570998))
* filter drawer content overflow ([3103da4](3103da4))
* placement of bottom bar in Filters drawer ([c522e35](c522e35))
* rendering of Create buttons for unsubmitted documents ([514dddc](514dddc))
* responsiveness for individual jobs ([b3c7a4b](b3c7a4b))
* search and pagination ([8f4a500](8f4a500))
* template generation ([bc88028](bc88028))
* typos (backport [#1351](#1351)) ([#1354](#1354)) ([44f6083](44f6083))
* utilization of space by Job Title ([e22e6d8](e22e6d8))

### Features

* add Apply Now button ([8b58a6f](8b58a6f))
* add Create button for Income Tax Slab and Salary Structure Assignment ([3934365](3934365))
* add filters for mobile ([c6c63a6](c6c63a6))
* add sorting for mobile ([d9c70d9](d9c70d9))
* **Attendance Request:**  add 'Include Holidays' checkbox (backport [#1040](#1040)) ([#1365](#1365)) ([bf492eb](bf492eb))
* **Filters Drawer:** add Close button ([d4d06a8](d4d06a8))
* make cards and general view responsive ([9c79f53](9c79f53))
* **Payroll:** Option to use Email Template when send Salary Slip email ([403ee10](403ee10))
* **Salary Component:** add Create Salary Structure button ([b4ffd3b](b4ffd3b))
* **Salary Structure:** add Create Income Tax Slab button ([1292072](1292072))
frappe-pr-bot pushed a commit that referenced this pull request Jan 31, 2024
## [14.21.4](v14.21.3...v14.21.4) (2024-01-31)

### Bug Fixes

* get income tax slabs by getting ss_assignment based on from_date ([#1338](#1338)) ([fe38ef2](fe38ef2))
* typos (backport [#1351](#1351)) ([#1353](#1353)) ([3ae5354](3ae5354))
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants