Commit graph

3706 commits

Author SHA1 Message Date
Leela vadlamudi
3875004d7e
Merge pull request #13057 from leela/email-refactoring
refactor: Email Module - 1
2021-05-05 11:45:04 +05:30
Ankush Menat
a617348a79
chore: remove py2 specific code from boilerplate 2021-05-03 20:11:00 +05:30
Ernesto Ruiz
b0af8886d5
fix: Make strings translatable (#13046)
Co-authored-by: Mohammad Hasnain Mohsin Rajan <hasnain2808@gmail.com>
Co-authored-by: Suraj Shetty <13928957+surajshetty3416@users.noreply.github.com>
2021-05-03 09:34:16 +05:30
Suraj Shetty
23ffca83ed
Merge branch 'develop' into fix-mentions 2021-05-03 09:20:47 +05:30
leela
a8f74d9471 refactor: Move finding email accounts code to EmailAccount doctype 2021-05-03 06:22:35 +05:30
Nabin Hait
b4d57b0174 fix: Fixed merge conflict 2021-05-01 14:52:06 +05:30
Suraj Shetty
959b27ef0e fix: Bust user / user group cache on change 2021-04-30 10:44:09 +05:30
Frappe Bot
ffef39dd07 refactor: Delete Qunit test files
Since it is no longer used

(cherry picked from commit d30596b15e)
2021-04-28 03:48:49 +00:00
Frappe Bot
d30596b15e refactor: Delete Qunit test files
Since it is no longer used
2021-04-27 21:37:15 +05:30
Faris Ansari
b2302bab09 fix: Pass score to ace to let it handle sorting 2021-04-27 14:54:36 +05:30
Faris Ansari
58f1db0417 fix: remove hardcoded value 2021-04-27 14:54:36 +05:30
Faris Ansari
a877747261 fix: Include all keys and sort by score 2021-04-27 14:54:36 +05:30
Faris Ansari
43f3ba3cba fix: Add autocompletion items in Server Script
- API to add autocompletion items in Code field
2021-04-27 14:54:36 +05:30
prssanna
5fd856db27 fix: aggregate column in auto email report 2021-04-27 14:54:36 +05:30
Rohan Bansal
3142723d41 feat: manage Python 3 compatiblity with dependencies 2021-04-27 14:54:34 +05:30
Sagar Vora
bc1b928d73 fix: cannot read property doc of undefined (#12891) 2021-04-27 14:54:33 +05:30
barredterra
72dc556bb3 fix: make Default Email Template a link field 2021-04-27 14:45:47 +05:30
barredterra
eac90c26d1 feat: default_email_template 2021-04-27 14:42:55 +05:30
mergify[bot]
bdbdef92a8
Merge pull request #12888 from netchampfaris/server-script-autocompletion
feat: Add autocompletion items in Server Script
2021-04-20 16:50:21 +00:00
Faris Ansari
c309cb2d29 fix: Pass score to ace to let it handle sorting 2021-04-20 16:23:20 +05:30
Faris Ansari
8ca7ba6b56 fix: remove hardcoded value 2021-04-20 16:08:11 +05:30
Faris Ansari
8aa26c7286 fix: Include all keys and sort by score 2021-04-20 16:01:56 +05:30
prssanna
b7e75e5305 fix: aggregate column in auto email report 2021-04-20 14:36:41 +05:30
Rohan Bansal
a7794d9f6c Merge remote-tracking branch 'upstream/develop' into feat-py3-dependencies 2021-04-19 12:51:50 +05:30
Sagar Vora
33b12d91f9
fix: cannot read property doc of undefined (#12891) 2021-04-18 12:38:19 +05:30
Faris Ansari
d927d393ee fix: Add autocompletion items in Server Script
- API to add autocompletion items in Code field
2021-04-17 23:09:16 +05:30
Raffael Meyer
6f73455eb2
Merge branch 'develop' into default_email_template 2021-04-16 12:32:51 +02:00
mergify[bot]
c4d95ecafb
Merge pull request #12827 from anupamvs/data-import-issues
fix: don't allow user to remove/change data source file in data import
2021-04-16 03:33:26 +00:00
mergify[bot]
e36d9283af
Merge pull request #12534 from CaseSolvedUK/qr-cols-v13
feat: allow query/custom reports to save custom data in the json field
2021-04-16 02:36:19 +00:00
Suraj Shetty
a2af812dfb
Merge pull request #12844 from surajshetty3416/group-mentions 2021-04-15 16:38:45 +05:30
Suraj Shetty
7d335a9bef fix: Make group mention clickable 2021-04-15 16:22:17 +05:30
Suraj Shetty
1bfeafca5f fix: Check if data-is-group should be true before getting doc 2021-04-15 16:08:18 +05:30
Suraj Shetty
f71a6c09f5 fix: Sync user groups realtime 2021-04-15 14:53:01 +05:30
Suraj Shetty
4f8ced5b1b fix: Remove unnecessary field 2021-04-15 14:27:41 +05:30
Suraj Shetty
8a5e8b53e8 fix: Make group_name and user group members mandatory 2021-04-15 14:22:52 +05:30
Suraj Shetty
9830406afa test: Add test to check group mentions 2021-04-15 11:55:48 +05:30
Rohan Bansal
86851028ea feat: manage Python 3 compatiblity with dependencies 2021-04-14 14:40:58 +05:30
Rohit Waghchaure
b33ae71fa5 fix: travis patch while creating limited access user type 2021-04-13 18:48:00 +05:30
Rushabh Mehta
3d22019b98 fix(minor): dynamically changing grid properties 2021-04-13 11:52:57 +05:30
Suraj Shetty
a1190a0c4a feat: Add option to mention a group of users 2021-04-12 16:35:11 +05:30
Rohit Waghchaure
d929d8cba2 fix: patch travis 2021-04-12 14:04:08 +05:30
rohitwaghchaure
d10861bf21
Merge pull request #12828 from rohitwaghchaure/fixed-user-type-patch
fix: user type patch
2021-04-11 16:59:22 +05:30
Rohit Waghchaure
0bc74cc89b fix: user type patch 2021-04-11 10:12:04 +05:30
Anupam
4c787effc6 fix: don't allow user to remove/change data source file in data import 2021-04-11 01:52:43 +05:30
casesolved-co-uk
15b3cc890f feat: allow query/custom reports to save custom data in the json field 2021-04-09 14:01:48 +00:00
Leela vadlamudi
e5d3aac707
Merge pull request #12693 from leela/notifications-into-timeline
feat: Include automated mail notifications in timeline
2021-04-08 20:38:29 +05:30
Prssanna Desai
b5a8d9a295
Merge branch 'develop' into perm-check-on-report-status-change 2021-04-08 19:04:23 +05:30
mergify[bot]
0bf28cf059
Merge pull request #12722 from shariquerik/show-users-attachments-only-fix
fix: Only allow user's attachments to show in attachments tree
2021-04-08 10:38:28 +00:00
leela
ace1edae56 test: authorization test for Report status toggle 2021-04-08 15:43:28 +05:30
shariquerik
0affa16f14 test: permission fix 2021-04-08 15:11:54 +05:30