Commit graph

24037 commits

Author SHA1 Message Date
Suraj Shetty
ba6a73bd34
Merge branch 'develop' into data-options 2020-03-30 13:06:41 +05:30
prafful1234
737ecae59d
feat(website): fetch email comments in issue portal (#9657)
* feat(website): fetch email comments in issue portal

* fix: deepsource issues

Signed-off-by: Chinmay D. Pai <chinmaydpai@gmail.com>

* chore: remove unnecessary import

not sure how i missed it

Signed-off-by: Chinmay D. Pai <chinmaydpai@gmail.com>

Co-authored-by: prafful1234 <prafful@mntechnique.com>
Co-authored-by: Suraj Shetty <13928957+surajshetty3416@users.noreply.github.com>
Co-authored-by: Chinmay D. Pai <chinmaydpai@gmail.com>
2020-03-30 12:53:21 +05:30
mergify[bot]
d9ea19d98b
Merge pull request #9810 from nabinhait/doctype-action-reload
fix: Get valid columns from meta only if table exists
2020-03-30 07:06:06 +00:00
Nabin Hait
a5fc3d82dd fix: Get valid columns from meta only if table exists (for doctype action) 2020-03-30 11:59:27 +05:30
Gavin D'souza
32982a34c9 Merge branch 'data-options' into data-options 2020-03-30 11:20:59 +05:30
Gavin D'souza
6c350f6c7b chore: update msgprint title
fix: circular import
2020-03-30 11:19:15 +05:30
Suraj Shetty
0a65266c1e
Merge branch 'develop' into data-options 2020-03-30 10:44:25 +05:30
Gavin D'souza
a8e1e1c976 style: remove extra spaces for consistency 2020-03-30 10:37:16 +05:30
Gavin D'souza
cf9440439e fix: translatable string for data field options 2020-03-30 10:37:08 +05:30
Gavin D'souza
11aefbd8ed fix: dont validate email if owner and email_data is in STANDARD_USERS 2020-03-30 10:18:30 +05:30
Gavin D'souza
e57a5d347d chore: update .eslintrc globals
style: updated data.js spacing format
2020-03-30 10:16:39 +05:30
mergify[bot]
b4323dce9c
Merge pull request #8603 from hrwX/custom_append_to
feat(Email Account): Allow email append to for other doctypes
2020-03-29 16:27:45 +00:00
mergify[bot]
8625047847
Merge pull request #9803 from deepeshgarg007/role_permission
fix(permission-manager): Hide create, write options for DocTypes which cannot be created
2020-03-29 16:23:43 +00:00
Deepesh Garg
18664430c4 fix: Do not show create, write and delete perm in role permission manager for doctypes with in_create property set 2020-03-28 21:06:56 +05:30
Suraj Shetty
47a19ce6e5
fix(api): Parse data as json only if data is string (#9791)
* fix: Json load data only if data is string

* refactor: Simplify code
2020-03-27 22:54:56 +05:30
Himanshu Warekar
5a5fed29d2 Merge branch 'custom_append_to' of https://github.com/hrwx/frappe into custom_append_to 2020-03-27 15:17:08 +05:30
Himanshu Warekar
7b7e4f1aaf fix: move sender field 2020-03-27 15:13:20 +05:30
mergify[bot]
4198fc3b4d
Merge pull request #9798 from rmehta/markdown-wrap-text
fix(control): Wrap text in markdown editor
2020-03-27 08:30:20 +00:00
Himanshu Warekar
2374e4da14 Merge branch 'develop' of https://github.com/frappe/frappe into custom_append_to 2020-03-27 13:18:02 +05:30
Suraj Shetty
2f697ef290
Merge pull request #9792 from surajshetty3416/fix-response-message
fix: Response message style
2020-03-27 12:51:00 +05:30
Suraj Shetty
d12dd9ad69
Merge branch 'develop' into custom_append_to 2020-03-27 12:34:25 +05:30
mergify[bot]
93f209ba81
Merge pull request #9795 from deepeshgarg007/is_default_perm
fix: Default value not getting set from user permission
2020-03-27 06:47:34 +00:00
Rushabh Mehta
dbc7a7eb08 fix(minor): wrap text in markdown editor 2020-03-27 11:40:05 +05:30
Himanshu Warekar
595979eb1f Merge branch 'develop' of https://github.com/frappe/frappe into custom_append_to 2020-03-27 11:16:41 +05:30
mergify[bot]
85f9a7a37d
Merge pull request #9753 from prssanna/sidebar-spacing
fix: List sidebar style improvements
2020-03-26 17:55:42 +00:00
Suraj Shetty
5566294594
Merge branch 'develop' into is_default_perm 2020-03-26 23:13:57 +05:30
prssanna
7f3a91946b fix: fix spacing of group by fields on list sidebar 2020-03-26 19:05:02 +05:30
Suraj Shetty
d383b0857f
Merge branch 'develop' into sidebar-spacing 2020-03-26 18:51:15 +05:30
Deepesh Garg
10c72246e0
Merge pull request #9786 from scmmishra/report-column-fix
fix: add custom fields from query report
2020-03-26 18:41:18 +05:30
Deepesh Garg
3bf1f03aac fix: Default value not getting set for from user permission 2020-03-26 18:13:02 +05:30
Suraj Shetty
34d854e9c0 fix: Response message style 2020-03-26 17:52:34 +05:30
Nabin Hait
80adca936c fix: delete contact email along with contact 2020-03-26 13:16:04 +05:30
mergify[bot]
0db69866f5
Merge pull request #9775 from netchampfaris/web-view-rendering-fixes
fix: Web View Rendering
2020-03-26 06:29:08 +00:00
Shivam Mishra
908b5b2743 fix: add custom fields from query report 2020-03-26 11:43:34 +05:30
Gavin D'souza
5627981192 fix: safe check of options in docfield 2020-03-25 21:41:48 +05:30
Gavin D'souza
2c5bc5abcf fix: remove type annotations 2020-03-25 17:22:12 +05:30
Gavin D'souza
f7111e20be fix: Improper ValidationError string
returning empty string if parseaddr returns None shows " is not a valid Email Address"

eg: if 'email@' is passed as value, email.utils.parseaddr will return a
(None, None) tuple
2020-03-25 16:28:37 +05:30
mergify[bot]
0dd7ffd915
Merge pull request #9781 from prssanna/customize-form-button
feat: Add button to go to list in Customize Form
2020-03-25 10:41:57 +00:00
Gavin D'souza
dd0d21f04a style: rename variable emph => email_invalid 2020-03-25 16:02:01 +05:30
Gavin D'souza
c199a3555b chore: remove deprecated validate_email_add function 2020-03-25 15:59:01 +05:30
Gavin D'souza
2575006816 feat: validations for Email and Phone Data options
added set_invalid control for docfields. On event of docfield.invalid is
set, in a given form, set_invalid will be executed which changes the
textbox colour to red
2020-03-25 15:53:43 +05:30
Gavin D'souza
d199d8027a feat: added server validations for phone and email
for fieldtype "Data" and options set to "Email" or "Phone", updating
    documents will trigger data validations for email and phone numbers will be made
2020-03-25 15:29:24 +05:30
Gavin D'souza
80c4167a07 feat: server validations for data field options 2020-03-25 15:23:36 +05:30
mergify[bot]
2f18dc30ac
Merge pull request #9755 from surajshetty3416/fix-customized-form
feat: change fieldtype in db with customize form
2020-03-25 07:58:59 +00:00
Suraj Shetty
5194bcd5a4
Merge branch 'develop' into fix-customized-form 2020-03-25 12:57:39 +05:30
Suraj Shetty
1599fc0751 fix: Get latest meta while building table 2020-03-25 12:48:21 +05:30
mergify[bot]
bce278f43e
Merge pull request #9776 from prssanna/report-filters-depends-on
feat(Reports): Enable depends on for script report filters
2020-03-25 04:49:54 +00:00
Suraj Shetty
3375614ad0
Merge branch 'develop' into report-filters-depends-on 2020-03-25 10:05:16 +05:30
dependabot[bot]
bdb77ba521
chore(deps): bump bleach from 2.1.4 to 3.1.2 (#9779)
* chore(deps): bump bleach from 2.1.4 to 3.1.2

Bumps [bleach](https://github.com/mozilla/bleach) from 2.1.4 to 3.1.2.
- [Release notes](https://github.com/mozilla/bleach/releases)
- [Changelog](https://github.com/mozilla/bleach/blob/master/CHANGES)
- [Commits](https://github.com/mozilla/bleach/compare/v2.1.4...v3.1.2)

Signed-off-by: dependabot[bot] <support@github.com>

* chore: use html.parser instead of html5lib

bleach no longer ships html5lib as a requirement and instead has
included it in the system. we can switch to using html.parser instead;
which is not an external dependency unlike html5lib.

source: https://github.com/mozilla/bleach/blob/master/CHANGES#L206

Signed-off-by: Chinmay D. Pai <chinmaydpai@gmail.com>

* chore: use html5lib from bleach

Signed-off-by: Chinmay D. Pai <chinmaydpai@gmail.com>

* chore: import html5lib from bleach._vendor

fixes issue where bs4 is unable to find html5lib in the tree:

bs4.FeatureNotFound: Couldn't find a tree builder with the features you requested: bleach._vendor.html5lib. Do you need to install a parser library?

Signed-off-by: Chinmay D. Pai <chinmaydpai@gmail.com>

* chore: just give up and install html5lib as a dependency

Signed-off-by: Chinmay D. Pai <chinmaydpai@gmail.com>

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: Chinmay D. Pai <chinmaydpai@gmail.com>
2020-03-25 00:20:57 +05:30
Chinmay Pai
4f22a58331
feat: add system override to logout sessions on password reset (#9653)
* feat: add system override to logout sessions on password reset

add a system settings override to logout current user from all existing
sessions on password reset

Signed-off-by: Chinmay D. Pai <chinmaydpai@gmail.com>

* fix: do not override settings if user has opted to logout

do not override the current value if the user has checked "logout of all
sessions".

Signed-off-by: Chinmay D. Pai <chinmaydpai@gmail.com>

* chore: fix variable name

Signed-off-by: Chinmay D. Pai <chinmaydpai@gmail.com>

Co-authored-by: Suraj Shetty <13928957+surajshetty3416@users.noreply.github.com>
2020-03-24 14:13:13 +00:00