Suraj Shetty
7dfced5047
Merge branch 'develop' of https://github.com/frappe/frappe into refactor-website
2021-06-17 09:48:50 +05:30
Leela vadlamudi
f09bbfdb39
Merge pull request #13516 from leela/fix-incoming-mails
...
fix: incoming mail handler
2021-06-17 08:13:04 +05:30
leela
f54600a400
fix: incoming mail handler
...
While creating a communication record from incoming mail is failing
in a case where there exists a reference document.
reason for bug is misspelled `self.from_email` as `email.from_email`
2021-06-17 07:31:10 +05:30
mergify[bot]
f4be870e58
Merge pull request #13510 from netchampfaris/throttle-set-open-count
...
fix: Throttle set_open_count
2021-06-16 13:52:06 +00:00
Faris Ansari
f713cc7842
fix: Throttle set_open_count
...
set_open_count is called everytime form refresh is called.
Form links don't update frequently, so it can be throttled.
2021-06-16 19:01:55 +05:30
Rushabh Mehta
4268010fbb
fix(minor): text-indent only works for the first line
2021-06-16 17:42:29 +05:30
Faris Ansari
45b2504d91
Merge pull request #13508 from netchampfaris/esbuild-rmdir-node-16
2021-06-16 14:26:36 +05:30
mergify[bot]
d699a99b5c
Merge pull request #13496 from shariquerik/allow_rename_email_grp
...
fix: Allow renaming Email Groups
2021-06-16 08:33:51 +00:00
Faris Ansari
d20cf5c02f
fix: Check if folder exists before cleaning
...
If folder doesn't exist, an exception is thrown in node 16
2021-06-16 13:49:04 +05:30
mergify[bot]
9866aab28c
Merge pull request #13466 from shariquerik/allow_comment_for_guest
...
fix: Allow guest to comment on Web Page & Blog Post
2021-06-16 07:43:36 +00:00
mergify[bot]
107de3e4c5
Merge pull request #13491 from shariquerik/blog_feedback
...
feat: Feedback feature for Blog Post
2021-06-16 07:42:13 +00:00
shariquerik
e9a83f2764
fix: minor fix
2021-06-16 12:49:30 +05:30
shariquerik
622001396f
fix: server-side validation
2021-06-16 12:44:06 +05:30
shariquerik
5dfe65f8f9
fix: sider fix
2021-06-15 21:23:38 +05:30
shariquerik
e7fc63271e
test: Added test case
2021-06-15 21:21:13 +05:30
shariquerik
d08e0f6605
fix: server-side validation
2021-06-15 20:27:55 +05:30
Suraj Shetty
724923afab
Merge pull request #13498 from surajshetty3416/fix-charts-rendering
2021-06-15 19:36:24 +05:30
mergify[bot]
a62cba4828
Merge pull request #13499 from gavindsouza/db-bugs
...
fix: Logical bug in DatabaseQuery.extract_tables
2021-06-15 12:36:38 +00:00
Gavin D'souza
7e68fad061
fix: Add test for DatabaseQuery.extract_tables
...
Test for selecting field from another table and field that includes tab
2021-06-15 17:19:42 +05:30
Suraj Shetty
4524cc85da
fix: Do not append child table doctype in case of _aggregate_column
...
_aggregate_column is a special column which should not be linked with any doctype
since it is a derived column
2021-06-15 14:05:08 +05:30
Suraj Shetty
1e926b55ce
fix: Rename WebPage to BaseRenderer
2021-06-15 14:01:56 +05:30
Gavin D'souza
ffb2aceb43
fix: Logical bug in DatabaseQuery.extract_tables
...
Introduced via 888aa8ad84
2021-06-15 12:50:29 +05:30
mergify[bot]
30e25fa31c
Merge pull request #13400 from nextchamp-saqib/group-by-tags
...
feat: group by tags in report view
2021-06-15 07:17:55 +00:00
shariquerik
818ba11031
fix: Allow renaming Email Groups
2021-06-15 11:26:51 +05:30
shariquerik
09c7d66ae2
fix: New 1-10 rating design
2021-06-15 10:54:04 +05:30
mergify[bot]
cb4f36a546
Merge pull request #13478 from ankush/implicit_commit_tests
...
fix: test failure due to uncommited transaction
2021-06-14 11:28:19 +00:00
shariquerik
1f83d3d54f
feat: Feedback feature for Blog Post
2021-06-14 15:28:44 +05:30
Suraj Shetty
fb8ecd6b26
Merge pull request #13464 from frappe/mergify/bp/develop/pr-13463
2021-06-14 15:20:56 +05:30
Suraj Shetty
020596ac17
Merge pull request #13433 from frappe/mergify/bp/develop/pr-13427
2021-06-14 15:20:10 +05:30
Suraj Shetty
d11e8e1d08
Merge branch 'develop' into mergify/bp/develop/pr-13427
2021-06-14 15:19:51 +05:30
gavin
da38adbc6d
Merge pull request #13454 from gavindsouza/retry-flaky-tests
...
fix(test): Flaky TestAPI.test_update_document
2021-06-14 15:05:55 +05:30
mergify[bot]
f73572e695
Merge pull request #13489 from resilient-tech/fix-grid-row-css
...
fix(UI): fixed grid view for uneditable rows
2021-06-14 08:58:41 +00:00
Suraj Shetty
55d3d7a41b
Merge branch 'develop' into mergify/bp/develop/pr-13463
2021-06-14 14:28:38 +05:30
Gavin D'souza
91fd070d41
Merge branch 'develop' of github.com:frappe/frappe into retry-flaky-tests
2021-06-14 14:07:41 +05:30
Gavin D'souza
e5db89dd4d
fix: commit for postgres db_type before each TestAPI test
2021-06-14 13:44:20 +05:30
Gavin D'souza
3b310afc68
Revert "fix(test): Retry flaky test"
...
This reverts commit 7a30b2455e .
2021-06-14 13:43:52 +05:30
mergify[bot]
7c5624dd56
Merge pull request #13173 from ankush/unnecessary_comprehensions
...
perf(minor): remove unnecessary comprehensions
2021-06-14 07:14:20 +00:00
walstanb
abebc91872
fix(UI): fixed grid view for uneditable rows
2021-06-14 12:33:12 +05:30
Suraj Shetty
3cbc7dfb92
Merge branch 'develop' of https://github.com/frappe/frappe into refactor-website
2021-06-14 12:24:50 +05:30
Leela vadlamudi
5a2ea4edc8
Merge pull request #13476 from leela/email-account-based-mail-usage
...
fix: consider email accounts while checking email limits
2021-06-14 12:10:34 +05:30
Suraj Shetty
daeb615423
Merge pull request #13486 from surajshetty3416/fix-shortcut-filter
2021-06-14 11:59:03 +05:30
Gavin D'souza
e6bdfd8d4f
Merge branch 'develop' of github.com:frappe/frappe into unnecessary_comprehensions
2021-06-14 11:53:21 +05:30
Suraj Shetty
e7d1eecef9
fix: Remove "No filter" message only if filter exists
2021-06-14 11:53:20 +05:30
Suraj Shetty
425b73ab6a
fix: Remove "No filter" message while adding filters
2021-06-14 11:03:13 +05:30
Suraj Shetty
a571cb9f91
fix: Allow to remove filters from shortcut
...
completely
2021-06-14 11:02:17 +05:30
Leela vadlamudi
b4f4e48bd6
Merge pull request #13484 from frappe/mergify/bp/develop/pr-13314
...
fix: encode error to add outgoing mail to sent folder
2021-06-14 10:53:12 +05:30
Suraj Shetty
3b0b147847
Merge pull request #13468 from leela/clickable-urls-in-texteditor
2021-06-14 10:05:45 +05:30
Suraj Shetty
eae6ab3cf9
style: Add missing semicolon
2021-06-14 10:05:14 +05:30
Suraj Shetty
fa97515cf2
Merge pull request #13396 from nextchamp-saqib/shortcut-for-actions-menu-item
...
fix: cannot set shortcut for actions menu item
2021-06-14 09:44:22 +05:30
Suraj Shetty
62bcd72400
Merge pull request #13479 from frappe/mergify/bp/develop/pr-13439
2021-06-14 09:42:53 +05:30