Fayaz Ahmed
6deb3764dc
Fix: Pagination bug with filters payload ( #3747 )
...
* Removes the last operators value
* Moved removing the last operator to the payload generator
* Update app/javascript/dashboard/helper/filterQueryGenerator.js
This makes sure the last operator is never sent to the request
Co-authored-by: Nithin David Thomas <1277421+nithindavid@users.noreply.github.com>
* Fixed the test specs
* Fixed the intendation and added comments
Co-authored-by: Sivin Varghese <64252451+iamsivin@users.noreply.github.com>
Co-authored-by: Nithin David Thomas <1277421+nithindavid@users.noreply.github.com>
2022-01-17 20:35:53 +05:30
Sivin Varghese
4398734bdf
feat: Adds the ability to have custom view for conversations ( #3666 )
...
* feat: Adds the ability to save custom filters and display folders on the sidebar
* Minor fixes
* Review fixes
* Review fixes
* i18n fixes
* Shows conversations when the user click on the folder sidebar item
* Spacing fixes
* Review fixes
Co-authored-by: Muhsin Keloth <muhsinkeramam@gmail.com>
2022-01-17 09:18:54 +05:30
Sojan Jose
290196d43b
chore: Clean up assignment logic ( #3763 )
2022-01-13 21:38:10 -08:00
Ximena Sandoval
cab5a3e53b
chore: Add a redirect link to the conversation in success toast message ( #3711 )
...
When creating a conversation from the contacts tab now we can go directly to the conversation by clicking the link in the success message
Co-authored-by: Pranav Raj S <pranav@chatwoot.com>
2022-01-13 11:15:40 -08:00
Muhsin Keloth
359caf754c
fix: Update contact bio style to solve overflow ( #3753 )
2022-01-13 10:57:12 -08:00
Sivin Varghese
7fcac532df
fix: Update timestamp style on the private message from bot ( #3758 )
2022-01-13 10:54:52 -08:00
Nithin David Thomas
d57be3ffae
fix: Allow private note without selecting a tweet ( #3754 )
2022-01-13 10:54:00 -08:00
Pranav Raj S
5046dcaf61
fix: Update broken CSS Styles in liquid template ( #3756 )
2022-01-13 10:52:48 -08:00
Tejaswini Chile
7df68c6388
Feat: Automations Actions ( #3564 )
2022-01-13 11:21:06 +05:30
Sojan Jose
905fd62974
chore: Support Whatsapp Interactive messages (360Dialog) ( #3751 )
...
Render button and list reply clicks as text messages in agent dashboard
fixes : #3684
2022-01-12 19:42:23 -08:00
Sojan Jose
1c99294c8c
chore: Fix 360Dialog template message breakage ( #3750 )
...
Template parsing fails when regexp characters are present in templates.
Fixes : #3587
2022-01-12 17:41:42 -08:00
Nithin David Thomas
94209d29cb
fix: Fixes widget unread view blocking parent page ( #3658 )
...
Co-authored-by: Pranav <pranav@chatwoot.com>
Co-authored-by: Muhsin Keloth <muhsinkeramam@gmail.com>
Co-authored-by: Sivin Varghese <64252451+iamsivin@users.noreply.github.com>
2022-01-12 12:27:16 -08:00
Pranav Raj S
9c31d7c672
feat: Use vue-router on widget route management ( #3415 )
...
* feat: Add vue-router to widget
Co-authored-by: Pranav <pranav@chatwoot.com>
* Move to dynamic imports
* Move to routerMixin
* Fix popup button display
* Remove unnecessary import
* router -> route
* Fix open state
* Fix issues
* Remove used CSS
* Fix specs
* Fix specs
* Fix widgetColor specs
* Fix mutation specs
* Fixes broken lint errors
* Fixes issues with widget flow
Co-authored-by: Nithin <nithin@chatwoot.com>
Co-authored-by: Nithin David <1277421+nithindavid@users.noreply.github.com>
Co-authored-by: Muhsin Keloth <muhsinkeramam@gmail.com>
2022-01-12 16:25:27 +05:30
Vishnu Narayanan
acba07cf6e
chore: revert GlobalConfig changes ( #3702 )
...
Priority to GlobalConfig changes are reverted and for the time being, env vars will take precedence if set.
Fixes #3699
2022-01-11 19:20:23 -08:00
Sojan Jose
f44be0b1e6
fix: SuperAdmin Improvements ( #3733 )
...
- Fix broken access tokens pages
- Fix broken avatar images in the super admin users tab
- Fix broken pagination links in super admin
- Add agent bot tabs
Fixes : #2021
2022-01-11 19:00:00 -08:00
Prithvi Tharun
bec1266242
fix: Update shortcode -> short code ( #3708 )
...
Closes #3672
2022-01-11 15:20:52 -08:00
Sojan Jose
ebb04487a8
chore: Prevent null in Contact JSONB attributes ( #3730 )
2022-01-11 15:14:55 -08:00
Aswin Dev P.S
7ee7062843
feat: Toggle to disallow users to send messages after a conversation is resolved ( #3605 )
2022-01-11 00:32:03 -08:00
Tejaswini Chile
a0884310f4
feat: Save automation rules ( #3359 )
2022-01-10 12:41:59 +05:30
Anisha-art
9a9462f5cb
fix: Removed extra space before "." ( #3717 )
...
Fixes Removed extra space before "." as mentioned in the issue: #3669
2022-01-09 22:27:45 -08:00
Prithvi Tharun
9b6f1df871
fix: Update copy in canned responses ( #3716 )
...
Fixes #3669
2022-01-09 22:26:35 -08:00
Anisha-art
ab4d63a006
Error with plurals in Invite members onboarding guide. Issue #3671 ( #3718 )
...
Updated "email address" to "email addresses" in the Invite your team members guide.
2022-01-10 10:29:16 +05:30
Fayaz Ahmed
0745ceb430
Chore: Update ninja keys to 1.1.9 ( #3710 )
2022-01-07 13:52:08 -08:00
Pranav Raj S
f7ed7756d9
chore: Use logo thumbnail instead of logo in the sidebar ( #3706 )
2022-01-06 15:09:01 -08:00
Muhsin Keloth
e1fe4f09bc
chore: Add subscription delete API ( #3703 )
2022-01-06 21:40:43 +05:30
Nithin David Thomas
fade94658a
chore: Show scrollbar for sidebar only on hover ( #3688 )
2022-01-05 09:37:43 +05:30
Vishnu Narayanan
e775d22b98
feat: add new view and controller to display app configs together ( #3563 )
...
fixes : #3578
2022-01-04 21:50:16 +05:30
Prithvi Tharun
3e8ae3865f
chore: Update the copy for new password in profile settings ( #3676 )
...
Fixes #3656
2022-01-02 22:43:50 -08:00
Nithin David Thomas
223fb2b7e4
chore: Updates design of resolve context menu ( #3667 )
2021-12-29 22:24:11 +05:30
Nithin David Thomas
666028a443
feat: Adds multiple path support for fluent icons ( #3665 )
...
* feat: Adds multiple path support for icons
* Changes dashboard icon
2021-12-29 18:01:49 +05:30
Sojan Jose
577e9905c6
chore: Fix issue with conversation assignment notifications ( #3661 )
...
- fixes issues with conversation assignment notifications not working in certain cases
2021-12-28 21:53:13 +05:30
Muhsin Keloth
9606abe251
chore: Fix Eslint warnings ( #3654 )
...
* Fix all the eslint warnings
* Revert the schema
2021-12-27 13:49:31 +05:30
Sojan Jose
13d6734977
chore: Minor API cleanups ( #3645 )
...
- exception list updated
- revert mail presenter changes
2021-12-23 00:55:49 +05:30
Tejaswini Chile
c57c975a0d
bug: NoMethodError: undefined method `match' for in_reply_to ( #3641 )
...
Fixes #3615
2021-12-22 22:33:18 +05:30
Tejaswini Chile
44486fc8e1
chore: Improve email parsing using email trimmer gem ( #3611 )
...
Email parsing using email_trimmer gem
Fixes : #3539 , #2954 , #3572
2021-12-22 18:16:40 +05:30
Sojan Jose
009abc1948
chore: API improvements ( #3637 )
...
- Unique validations for Inbox members and Team member objects
- Move notification processing to Async
2021-12-21 22:48:01 +05:30
Muhsin Keloth
262474166f
chore: Add display id in all conversation notifications ( #3635 )
...
- Added conversation display id in push payload for the notifications conversation_creation and conversation_assignment
2021-12-21 19:59:22 +05:30
Nithin David Thomas
307118b235
feat: Shows error message with retry for widget messages ( #3594 )
...
- Adds error message retry option for widget bubbles
- Adds a fallback for widget images with file type bubble
2021-12-21 12:02:43 +05:30
Sivin Varghese
0130e08016
fix: Remove animated running numbers ( #3604 )
2021-12-20 18:19:59 -08:00
Nithin David Thomas
83655f4ca4
feat: Show errors for message bubbles in dashboard ( #3585 )
2021-12-21 00:07:33 +05:30
Sojan Jose
6fe5484119
chore: Allow more filetypes in uploads ( #3557 )
...
- Allowing the ability to upload more common file types like zip, Docx etc
- Fallback for image bubble when the image URL isn't available
fixes : #3270
Co-authored-by: Muhsin Keloth <muhsinkeramam@gmail.com>
Co-authored-by: Nithin David <1277421+nithindavid@users.noreply.github.com>
2021-12-20 23:50:37 +05:30
Tejaswini Chile
76e8acd3c6
Fix: Editable attrs presence check for the channel class ( #3630 )
2021-12-20 19:38:38 +05:30
Sivin Varghese
ad09c5dc5f
bug: Fixes pressing enter key not submitting values in widget. ( #3610 )
2021-12-20 08:48:09 +05:30
Sojan Jose
46d2a8f218
chore: New Crowdin updates ( #3616 )
2021-12-19 11:38:02 +05:30
Amit Kumar
6069cd9eba
chore: Contact builder ignores custom attributes ( #3571 )
...
This is incorrect as per the documentation here: https://www.chatwoot.com/developers/api/#operation/create-a-contact
This allows setting the proper attributes when creating a contact
2021-12-19 10:59:03 +05:30
Sojan Jose
8d65608666
chore: Clean up migrations ( #3613 )
...
Fixes : #3530
2021-12-19 09:47:07 +05:30
Aswin Dev P.S
5ee209c079
chore: Fix user email re-confirmation flow ( #3581 )
...
Users can change their email from profile settings. They will be logged out immediately. Users can log in again with the updated email without verifying the same. This is a security problem.
So this change enforce the user to reconfirm the email after changing it. Users can log in with the updated email only after the confirmation.
Fixes: https://huntr.dev/bounties/7afd04b4-232e-4907-8a3c-acf8bd4b5b22/
2021-12-16 19:32:49 +05:30
Sivin Varghese
e0c9687f5e
bug: Fixes irregular padding on agent selector in report page ( #3593 )
...
* bug: Fixes irregular padding on agent selector in report page
* code climate fixes
2021-12-16 13:20:35 +05:30
Sivin Varghese
93f384a3ec
enhancement: Changes button design for tables in settings page ( #3553 )
...
* enhancement: Changes button design for tables in settings page
* Minor fixes
* Review fixes
2021-12-16 13:00:55 +05:30
Tejaswini Chile
9984edd3ef
Feat: Manage conversation for tweets based on the tweet flag ( #3353 )
...
Add tweet conversation only if tweets are enabled.
Fixes #1961
2021-12-16 00:24:50 +05:30
Sivin Varghese
e2e459a1ac
bug: Fixes space missing issue with message bubbles after sending messages ( #3562 )
2021-12-15 19:12:11 +05:30
Tejaswini Chile
b7336eca65
Fix: Add max retries for all jobs ( #3582 )
2021-12-15 17:31:16 +05:30
Nithin David Thomas
6ae06f2c7a
fix: Fixes wrong color for note tab in reply box ( #3566 )
...
* fix: Fixes wrong color for note tab in reply box
* Changes color for warning button
* Fixes spacing
2021-12-14 20:09:52 +05:30
Nithin David Thomas
c2191e48b1
Chore: Fixes icon size in button ( #3555 )
...
* Chore: Fixes icon size in button
* Changes normal button to woot button
2021-12-14 17:37:25 +05:30
Sivin Varghese
178cb34319
bug: Fixes expanded reply box is not closing after the message is sent ( #3537 )
2021-12-13 12:37:21 +05:30
Tejaswini Chile
c2519ea1ea
Fix: fixing mail to and in_reply_to issues ( #3451 )
2021-12-10 19:42:26 +05:30
Sojan Jose
b1eea7f7d1
chore: Introduce enterprise edition license ( #3209 )
...
- Initialize an "enterprise" folder that is copyrighted.
- You can remove this folder and the system will continue functioning normally, in case you want a purely MIT licensed product.
- Enable limit on the number of user accounts in enterprise code.
- Use enterprise edition injector methods (inspired from Gitlab).
- SaaS software would run enterprise edition software always.
Co-authored-by: Pranav Raj S <pranav@chatwoot.com>
2021-12-09 12:07:48 +05:30
Pranav Raj S
2f63ebb8a6
fix: Add fixes for sentry errors ( #3522 )
...
- Add fixes for sentry errors
2021-12-09 11:50:28 +05:30
Pranav Raj S
2be71e73dc
feat: Add a view for mentions ( #3505 )
...
- Added a new table mentions for saving user mentions
- Added a filter conversation_type in the API
- Added a view to see the mentions
2021-12-09 11:20:14 +05:30
Sojan Jose
1db82f235d
Chore: Improve confirmation flow for agents ( #3519 )
...
- Agents are redirected to the password reset page which confirms the agent as well as sets a new password.
2021-12-09 11:11:46 +05:30
Muhsin Keloth
9306b725d8
chore: Fix pre-commit hooks ( #3525 )
...
Co-authored-by: Pranav Raj S <pranav@chatwoot.com>
2021-12-08 17:32:00 -08:00
Muhsin Keloth
3ee6b7d6e9
chore: Add the ability to use same key for conversation and contact ( #3526 )
2021-12-08 20:15:27 +05:30
Tejaswini Chile
f609a28c6b
Fix: Added facebook login scope with new advanced access for page read ( #3518 )
2021-12-08 16:17:49 +05:30
Sivin Varghese
714c10dc66
bug: Fixes error with the secondary menu. ( #3524 )
2021-12-08 14:20:59 +05:30
Nithin David Thomas
f5d79ffe58
chore: Updates icon for network disconnect alert ( #3514 )
...
* chore: Upadates icon for network disconnect alert
* Changes background color
* Review fixes
Co-authored-by: Sivin Varghese <64252451+iamsivin@users.noreply.github.com>
2021-12-07 23:45:36 +05:30
Nithin David Thomas
824101bc30
fix: Fixes cc bcc being sent when mail head is empty ( #3515 )
...
* fix: Fixes cc bcc being sent wrongly with emails
* fixes values not sycned to parent component
* Update app/javascript/dashboard/components/widgets/conversation/ReplyBox.vue
* Review fixes
2021-12-07 23:44:32 +05:30
Muhsin Keloth
46afcd9348
fix: Index custom attribute uniqueness on account ( #3516 )
...
- Move custom attribute uniqueness validation to account
2021-12-07 18:20:47 +05:30
Nithin David Thomas
6b025816f5
fix: Update sidebar toggle icon breaking message view ( #3512 )
2021-12-06 08:41:34 -08:00
Sivin Varghese
3c72a2759f
enhancement: Improves sidebar open/close toggle design ( #3507 )
2021-12-06 18:16:36 +05:30
Sivin Varghese
a98f10130b
bug: Fix cannot copy text content from sidebar ( #3506 )
...
* bug: Fixes cannot copy text content from sidebar .
* fixes cannot copy issue in sidebar
Co-authored-by: Muhsin Keloth <muhsinkeramam@gmail.com>
2021-12-06 14:38:04 +05:30
Muhsin Keloth
b46ee5e580
Fix: Conversation status event in widget side ( #3509 )
2021-12-03 22:45:00 +05:30
thedev105
6d378eb206
Fix: Update contact validation messages ( #3500 )
...
Fixes #3476
2021-12-03 13:19:11 +05:30
Fayaz Ahmed
d7cfe6858e
feat: Add advanced contact filters ( #3471 )
...
Co-authored-by: Tejaswini <tejaswini@chatwoot.com>
Co-authored-by: Pranav Raj S <pranav@chatwoot.com>
Co-authored-by: Muhsin Keloth <muhsinkeramam@gmail.com>
2021-12-02 19:12:44 -08:00
Sivin Varghese
1c29f5bbe4
bug: Fixes missing inbox icon in Twillio SMS channel. ( #3502 )
2021-12-02 11:47:49 +05:30
Pranav Raj S
8b4134c790
fix: Update route permissions in the new primary menu ( #3499 )
...
* fix: Display rolewise primary sidebar
* Fix issues with roles
* Fix active style
* Fix accessible menu
* Fix key missing
* Changes menu icon size
Co-authored-by: Nithin David <1277421+nithindavid@users.noreply.github.com>
2021-12-02 11:02:43 +05:30
Nithin David Thomas
2a5932cf1b
chore: Fixes error in reply box code ( #3494 )
2021-12-01 16:04:02 +05:30
Nithin David Thomas
0a18993b70
fix: Changes thumbnail colors to new color scheme ( #3483 )
...
* Enhancement: Updates sidebar to a new design (#2733 )
* feat: Changes primary navbar to new design (#2598 )
* feat: updates design for secondary navbar (#2612 )
* Changes primary nvbar to new design
* Updates design for contexual sidebar
* Fixes issues with JSON
* Remove duplication of notificatons in Navigation
* Fixes broken tests
* Fixes broken tests
* Update app/javascript/dashboard/components/layout/AvailabilityStatus.vue
* Update app/javascript/dashboard/components/layout/AvailabilityStatus.vue
* Update app/javascript/dashboard/components/layout/SidebarItem.vue
Co-authored-by: Sivin Varghese <64252451+iamsivin@users.noreply.github.com>
* Update app/javascript/dashboard/components/layout/SidebarItem.vue
Co-authored-by: Sivin Varghese <64252451+iamsivin@users.noreply.github.com>
* Update app/javascript/dashboard/modules/sidebar/components/Secondary.vue
Co-authored-by: Sivin Varghese <64252451+iamsivin@users.noreply.github.com>
Co-authored-by: Sivin Varghese <64252451+iamsivin@users.noreply.github.com>
* Chore: Update design changes to features
* Fixes menu transitions and refactors code
* Refactors sidebar routeing logic
* lint error fixes
* Fixes dropdown menu styles
* Fixes secondary new item links
* Fixes lint scss issues
* fixes linter issues
* Fixes broken test cases
* Update AvailabilityStatus.spec.js
* Review feedbacks
* Fixes add modal for label
* Add tooltip for primary menu item
* Tooltip for notifications
* Adds tooltip for primary menu items
* Review fixes
* Review fixes
* Fix merge issues
* fixes logo size for login pages
* fixes Merge breaks with styles
* fix: Changes thumbnail colors to new color scheme
Co-authored-by: Sivin Varghese <64252451+iamsivin@users.noreply.github.com>
Co-authored-by: Pranav Raj S <pranav@chatwoot.com>
2021-12-01 15:18:41 +05:30
Nithin David Thomas
b01d032d0d
feat: Updates sidebar to accomodate sub menu ( #3416 )
...
* Enhancement: Updates sidebar to a new design (#2733 )
* feat: Changes primary navbar to new design (#2598 )
* feat: updates design for secondary navbar (#2612 )
* Changes primary nvbar to new design
* Updates design for contexual sidebar
* Fixes issues with JSON
* Remove duplication of notificatons in Navigation
* Fixes broken tests
* Fixes broken tests
* Update app/javascript/dashboard/components/layout/AvailabilityStatus.vue
* Update app/javascript/dashboard/components/layout/AvailabilityStatus.vue
* Update app/javascript/dashboard/components/layout/SidebarItem.vue
Co-authored-by: Sivin Varghese <64252451+iamsivin@users.noreply.github.com>
* Update app/javascript/dashboard/components/layout/SidebarItem.vue
Co-authored-by: Sivin Varghese <64252451+iamsivin@users.noreply.github.com>
* Update app/javascript/dashboard/modules/sidebar/components/Secondary.vue
Co-authored-by: Sivin Varghese <64252451+iamsivin@users.noreply.github.com>
Co-authored-by: Sivin Varghese <64252451+iamsivin@users.noreply.github.com>
* Chore: Update design changes to features
* Fixes menu transitions and refactors code
* Refactors sidebar routeing logic
* lint error fixes
* Fixes dropdown menu styles
* Fixes secondary new item links
* Fixes lint scss issues
* fixes linter issues
* Fixes broken test cases
* Update AvailabilityStatus.spec.js
* Review feedbacks
* Fixes add modal for label
* Add tooltip for primary menu item
* Tooltip for notifications
* Adds tooltip for primary menu items
* Review fixes
* Review fixes
* Fix merge issues
* fixes logo size for login pages
* fixes Merge breaks with styles
Co-authored-by: Sivin Varghese <64252451+iamsivin@users.noreply.github.com>
Co-authored-by: Pranav Raj S <pranav@chatwoot.com>
2021-12-01 12:45:39 +05:30
Pranav Raj S
c792cfc0be
feat: Use Fluent SVG icons on the dashboard ( #3482 )
2021-11-30 21:03:18 -08:00
Pranav Raj S
98be3b33c1
fix: Update missing method onNewToastMessage ( #3481 )
2021-11-30 10:57:44 -08:00
Sojan Jose
d5c30760a7
chore: Whatsapp templates fix for 360 dialog ( #3479 )
...
Fixes : #3426
2021-11-30 20:50:35 +05:30
Pranav Raj S
0899f62912
fix: Use bus.$off to remove listeners on destroy ( #3478 )
2021-11-30 10:45:36 +05:30
Shivam Chahar
bfcde9b022
chore: Conversation history in email notifications ( #3414 )
...
Display recent messages in the notification email when a new conversation is created.
Fixes : #2041
2021-11-27 15:38:27 +05:30
Akhil G Krishnan
6a98a812e7
Fix: Outgoing email sender header translation issue ( #3393 )
...
Outgoing email-sender header translation fix for "from"
Fixes #3380
2021-11-27 09:46:12 +05:30
Shivam Chahar
a4ee8ee239
Chore: Improve conversation auto resolution ( #3405 )
...
Fixes : #1583
2021-11-27 09:26:18 +05:30
Sanju
89f9f39e6e
chore: add account id in account settings page ( #3365 )
...
Fixes : #3317
2021-11-27 09:07:09 +05:30
Santhosh C
b326da7d94
feat: Ability to remove user profile picture ( #3156 )
...
Fixes #3107
2021-11-27 00:56:07 +05:30
Sojan Jose
add004a56e
Chore: API Improvements ( #3469 )
2021-11-27 00:48:46 +05:30
Sivin Varghese
55843c5bad
chore: fixes filter input multiselect height issue ( #3466 )
2021-11-26 13:41:09 +05:30
Sanju
2c3c1888f1
Enhancement: Show unread marker on widget bubble ( #3390 )
...
* add unread marker
* add removeClass in IFramehelper
* Update app/javascript/sdk/sdk.js
* Update app/javascript/sdk/sdk.js
Co-authored-by: Nithin David Thomas <1277421+nithindavid@users.noreply.github.com>
2021-11-25 20:25:14 +05:30
Tejaswini Chile
b0370ce44d
Feat: Fix contact filter pagination ( #3463 )
2021-11-25 12:01:31 +05:30
Vishnu Narayanan
3a48e08fe0
feat: migrate facebook env vars to globalConfig ( #3369 )
...
Migrate facebook env vars to globalConfig and make it editable from the super admin UI.
2021-11-25 00:55:26 +05:30
Nithin David Thomas
c23e2c23d4
chore: Update design for filters ( #3423 )
2021-11-24 14:26:32 +05:30
Tejaswini Chile
330a97b5c5
Fix: contact filter values ( #3456 )
2021-11-24 12:58:00 +05:30
Muhsin Keloth
00143f7ee5
fix: Render checkbox if string value passed ( #3453 )
2021-11-24 11:02:45 +05:30
Sivin Varghese
da8f9d0337
feat: Add support for List and Checkbox in Custom Attributes ( #3439 )
2021-11-24 09:00:55 +05:30
Pranav Raj S
0530e9491c
fix: Use role permissions from accounts instead of role attribute ( #3445 )
...
Use role permissions from accounts instead of the role attribute
Fixes : #2557
2021-11-23 17:37:01 +05:30
Sivin Varghese
e182b59002
bug: fixes link icon doesn't work in the campaign editor ( #3447 )
2021-11-23 15:26:26 +05:30
Fayaz Ahmed
7f8204a9da
fix: Required check for Conversation filters ( #3442 )
2021-11-23 09:42:47 +05:30
Sojan
0033a35ab8
Merge branch 'hotfix/1.22.1' into develop
...
# Conflicts:
# db/schema.rb
2021-11-22 23:35:44 +05:30
