vassili/seitime-frappe
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 4
33300 commits 1 branch 0 tags 587 MiB
Commit graph

33300 commits

This branch
This branch
All branches
Author SHA1 Message Date
barredterra
bd0839b111 Merge branch 'develop' into google_drive_picker 2021-06-18 15:44:11 +02:00
Suraj Shetty
a9411e8456
Merge pull request #13506 from frappe/mergify/bp/develop/pr-13318 2021-06-18 17:52:42 +05:30
Suraj Shetty
e8f22c4221
Merge branch 'develop' into mergify/bp/develop/pr-13318 2021-06-18 17:30:45 +05:30
Suraj Shetty
ba1c73cc52
Merge pull request #13520 from surajshetty3416/fix-style-leak 2021-06-18 16:37:43 +05:30
Suraj Shetty
8ae1147abc fix: Avoid style leak from email or comment 2021-06-18 14:16:40 +05:30
Suraj Shetty
363961fedb
Merge pull request #12334 from rmehta/refactor-website 2021-06-17 20:41:30 +05:30
Suraj Shetty
70f5df6a05 chore: debug 2021-06-17 18:50:21 +05:30
Suraj Shetty
b52f2c5512 fix: Remove deprecated comments 2021-06-17 15:44:58 +05:30
Suraj Shetty
59be3afc2d fix: Only replace hyphen in file name 2021-06-17 15:30:27 +05:30
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
Saqib
660e54242d fix: remove unused imports 
(cherry picked from commit 183c0ec85c837e84698b525b6f0a1d7ff10e3096)
 2021-06-16 07:45:25 +00:00
Saqib Ansari
775ed653c7 chore: remove unecessary method 
(cherry picked from commit 1535c1b411ddb7076d8788f092ac4fb7e74a7f00)
 2021-06-16 07:45:25 +00:00
Saqib
36643f630c fix: next condition fieldname 
Co-authored-by: Suraj Shetty <13928957+surajshetty3416@users.noreply.github.com>
(cherry picked from commit 0d74a64b722924776cf6bb22331b6c2b36e5396e)
 2021-06-16 07:45:21 +00:00
Saqib
b6bbfb29ed chore: apply review changes 
Co-authored-by: Suraj Shetty <13928957+surajshetty3416@users.noreply.github.com>
(cherry picked from commit a12631b2ec7d7095d3286fb577545ee41289cc85)
 2021-06-16 07:45:20 +00:00
Saqib Ansari
e2e43d4b49 chore: modify field positions 
(cherry picked from commit b50b99772293dfab1f519627231d37fde47efe57)
 2021-06-16 07:45:20 +00:00
Saqib Ansari
13d7dce86f fix: sider issue 
(cherry picked from commit 57b24cee23286496aad4a0cb3be4b7872652334a)
 2021-06-16 07:45:19 +00:00
Saqib Ansari
0cda1e4295 feat: prevent next step until condition satisfied 
(cherry picked from commit 29bbbae9c4e24cdf2829acd509c6743112851854)
 2021-06-16 07:45:19 +00:00
Saqib Ansari
321002fe80 feat: custom position for popovers 
(cherry picked from commit 227019e1c63e61264c51f5841cfae476610628bf)
 2021-06-16 07:45:18 +00:00
Saqib Ansari
6d5c0a523b feat: init form tour doctype 
(cherry picked from commit ad13bebe3103f0c06436d945c13df6020b03df70)
 2021-06-16 07:45:18 +00:00
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