Commit graph

3206 commits

Author SHA1 Message Date
mergify[bot]
03fedd0994
Merge pull request #11304 from scmmishra/fix-perm-duplication-issue
fix: DocPerm duplication
2020-08-24 08:17:41 +00:00
Shivam Mishra
65165b6be6 fix: translation syntax 2020-08-24 13:09:20 +05:30
mergify[bot]
60d9667a8e
Merge pull request #11223 from gwhitney/ragged_child_tables
fix(Data Import): Allow parent with differing child table lengths
2020-08-24 06:45:28 +00:00
Faris Ansari
891456e1e6
Merge branch 'develop' into attach-files-to-doc-on-update 2020-08-21 13:33:41 +05:30
Faris Ansari
85cac9122e test: For file attachment on update 2020-08-21 13:31:07 +05:30
Faris Ansari
56521d51b5 fix: return early in parse_doc if invalid values 2020-08-19 14:36:39 +05:30
Shivam Mishra
2655a3f8dc feat: freeze dom on updating permissions 2020-08-19 12:49:40 +05:30
Shivam Mishra
90da644834 fix: add parrenttype in query 2020-08-19 12:48:38 +05:30
Rushabh Mehta
9786485f70 fix(minor): report.py: adapt recent group_by changes 2020-08-18 17:35:00 +05:30
Rushabh Mehta
6100169233 fix(minor): report.py: adapt recent group_by changes 2020-08-18 17:16:31 +05:30
Rushabh Mehta
5aea22eb33 fix(minor): report.py: adapt recent group_by changes 2020-08-18 17:05:19 +05:30
Rushabh Mehta
6bd38fd00a fix(minor): report.py 2020-08-18 14:52:37 +05:30
Rushabh Mehta
e3f686276e fix(minor): pass columns to build_data_dict in report.py 2020-08-18 14:52:37 +05:30
Rushabh Mehta
b6cd4330f2 feat(reports): add columns and filters via configuration 2020-08-18 14:52:37 +05:30
mergify[bot]
11b54c304d
Merge pull request #10959 from prssanna/group-by-email-report
fix: auto email report for group by reports
2020-08-18 06:03:59 +00:00
mergify[bot]
7f14c29911
Merge pull request #9751 from prssanna/prepared-report-button
feat(Prepared Report): System Setting to automatically delete old prepared reports
2020-08-18 05:50:39 +00:00
Rushabh Mehta
77018fc9d6 fix(cleanup): cleanup layout of doctype, user, role, add home_page to Portal Settings, Role 2020-08-17 09:41:54 +05:30
Shivam Mishra
3de0c18ab2
Merge pull request #10723 from scmmishra/feat-search-api-changes
feat: Search API changes
2020-08-14 14:00:56 +00:00
gavin
56a9cc51e3
Merge pull request #11094 from gavindsouza/bulk-restore
feat: Bulk restore documents in Deleted Document List view
2020-08-14 16:34:34 +05:30
Anurag Mishra
6bfd07be51
feat: Ignore doctypes for cancel_all (#11034) 2020-08-14 16:12:02 +05:30
Suraj Shetty
2cfbe95c68
Merge branch 'develop' into attach-files-to-doc-on-update 2020-08-13 17:56:45 +05:30
Mangesh-Khairnar
b49571f9b3
feat(notification): Add WhatsApp/SMS channels (#9623)
Co-authored-by: Suraj Shetty <13928957+surajshetty3416@users.noreply.github.com>
2020-08-13 17:53:09 +05:30
Faris Ansari
b7e6f85a85
fix: convert to sentence case 2020-08-13 16:44:56 +05:30
Gavin D'souza
f06dc0f7d9 fix: Literal strings for translation
* Used const instead of let
* Used template strings instead of repl
2020-08-13 16:29:31 +05:30
gavin
2699160853
style: few word do trick
why waste time say lot word when few word do trick

Co-authored-by: Faris Ansari <netchampfaris@users.noreply.github.com>
2020-08-13 16:17:21 +05:30
Prssanna Desai
312b5d699f
Merge branch 'develop' into group-by-email-report 2020-08-13 14:31:46 +05:30
Glen Whitney
46ac0735b3 fix(Data Import): Allow parent with differing child table lengths
Prior to this commit, if a parent has multiple child tables and
  the child tables have different numbers of rows, then the
  data import will fail with an error when it detects missing
  mandatory fields in the (necessary) empty records in the
  shorter child table.

  This commit fixes the problem by ignoring child rows that have
  only INVALID_VALUES for fields relating to that child (e.g.,
  that are altogether empty in the fields for that child).

  Fixes #11222.
2020-08-13 05:14:12 +00:00
Gavin D'souza
a4c5750bd8 fix: Move message handling to client side instead 2020-08-12 19:26:41 +05:30
Gavin D'souza
e363886485 Merge branch 'develop' of github.com:frappe/frappe into bulk-restore 2020-08-12 18:48:58 +05:30
Suraj Shetty
48a5ab3a25
Merge branch 'develop' into attach-files-to-doc-on-update 2020-08-12 16:48:31 +05:30
Prssanna Desai
53141b2236
Merge branch 'develop' into group-by-email-report 2020-08-12 15:09:50 +05:30
prssanna
5ab919ed75 refactor: enable auto deletion by default 2020-08-12 14:39:17 +05:30
Prssanna Desai
4a6d87fa68
Merge branch 'develop' into prepared-report-button 2020-08-12 14:11:39 +05:30
prssanna
79c1a5fe24 fix: label for group by column 2020-08-12 14:08:04 +05:30
Deepesh Garg
a7f3956740 fix: Pass entire navbar settings 2020-08-11 23:04:05 +05:30
Deepesh Garg
445161fcf6 Merge branch 'develop' of https://github.com/frappe/frappe into configurable_navbar 2020-08-11 22:40:12 +05:30
Shivam Mishra
f6d110f115 Merge branch 'develop' of https://github.com/frappe/frappe into feat-search-api-changes 2020-08-11 20:25:33 +05:30
Suraj Shetty
a8bb3cd11f
Merge branch 'develop' into prepared-report-button 2020-08-10 12:21:55 +05:30
Suraj Shetty
48634e131a
Merge branch 'develop' into dib-fixes-2020-07-22 2020-08-10 12:14:58 +05:30
Deepesh Garg
0c92e9d5f7 fix: Validate method for standard items 2020-08-06 21:22:27 +05:30
Deepesh Garg
5a2703e0df Merge branch 'develop' of https://github.com/frappe/frappe into configurable_navbar 2020-08-06 20:49:40 +05:30
Deepesh Garg
170d3c221b feat: Configurable navbar logo and dropdowns 2020-08-06 20:26:34 +05:30
Shivam Mishra
7521c3d14f feat: add allow web indexing check to doctype 2020-08-06 19:47:46 +05:30
Suraj Shetty
21a0cafe62
fix: Validate and sanitise whitelisted search methods using decorator (#11197)
* fix: Validate and sanitize whitelisted search methods using decorator

Co-authored-by: Prssanna Desai <prssud@gmail.com>
Co-authored-by: Shivam Mishra <scmmishra@users.noreply.github.com>

* refactor: Replace decorator name

Co-authored-by: Prssanna Desai <prssud@gmail.com>
Co-authored-by: Shivam Mishra <scmmishra@users.noreply.github.com>

Co-authored-by: Prssanna Desai <prssud@gmail.com>
Co-authored-by: Shivam Mishra <scmmishra@users.noreply.github.com>
2020-08-05 19:42:19 +05:30
Rucha Mahabal
cc22350b04
fix: remove Video DocType from Core module (#11151)
Co-authored-by: Suraj Shetty <13928957+surajshetty3416@users.noreply.github.com>
2020-08-04 17:42:47 +05:30
Prssanna Desai
645331799a
fix: whitelist functions called through search widget (#11153) 2020-08-04 12:17:33 +05:30
Shivam Mishra
9445c115ec
fix: check if is_standard is "Yes" (#11180) 2020-08-03 15:51:30 +05:30
Faris Ansari
7427fb9cd3 fix: Dont validate skipped columns 2020-07-30 15:56:38 +05:30
Suraj Shetty
be207d1e1f
Merge branch 'develop' into dib-fixes-2020-07-22 2020-07-30 13:19:04 +05:30
prssanna
6ca654c93c fix: revert removed field attach_view_link 2020-07-29 18:28:47 +05:30