Commit graph

3045 commits

Author SHA1 Message Date
mergify[bot]
2e3083bce3
Merge pull request #10395 from Thunderbottom/file-url-fix
fix: make file name and url check stricter
2020-06-02 08:39:41 +00:00
Gavin D'souza
d13a217db8 fix: check if request status code is ok instead of specific codes 2020-05-29 16:46:13 +05:30
Gavin D'souza
f71585ec74 Merge branch 'develop' of github.com:frappe/frappe into site-wise-logging 2020-05-29 14:56:29 +05:30
Himanshu
560e1f2c1d
Merge pull request #10256 from hrwX/dont_create_contacts
fix(Communication): do not create contacts if unchecked
2020-05-29 11:11:54 +05:30
Gavin D'souza
c39a52d764 feat: seperate loggers into frappe, web, scheduler categories and not by
module
2020-05-27 18:33:03 +05:30
mergify[bot]
4a56ae4557 Merge pull request #10248 from ruchamahabal/duration-control
feat: Duration Control
2020-05-27 06:53:46 +00:00
Suraj Shetty
b6a2df8b03
style: Fix cider
- Also, remove redundant code
2020-05-26 10:03:13 +05:30
prssanna
d07fe13890 fix: move code to communication.py and rename function 2020-05-26 00:37:11 +05:30
prssanna
1a576df873 fix: apply assignment rule on setting status as open 2020-05-23 14:30:05 +05:30
Suraj Shetty
fb1ce4c111
Merge branch 'develop' into permissions-fix 2020-05-20 14:09:52 +05:30
Chinmay D. Pai
4cbe236cf1
fix: make file name and url check stricter
* disallow '/' in filenames
* check if the file url points to a directory inside /files/ or
  /private/files
   - raises error otherwise

Signed-off-by: Chinmay D. Pai <chinmaydpai@gmail.com>
2020-05-19 13:21:54 +05:30
prssanna
282197e010 fix: spaces to tabs 2020-05-18 22:06:32 +05:30
Himanshu Warekar
4a51476aa7 fix: bypass check in tests 2020-05-18 14:16:25 +05:30
Himanshu Warekar
cdad543a02 Merge branch 'develop' of https://github.com/frappe/frappe into dont_create_contacts 2020-05-18 13:11:18 +05:30
Faris Ansari
b16f04c50b fix: Use frappe.call instead of frm.call
- frm.call sends the full doc as JSON which can be large
2020-05-17 18:14:00 +05:30
Faris Ansari
9a806585f2 style: Black formatting 2020-05-17 18:12:51 +05:30
Faris Ansari
b4dd66ceb3 fix: Remove empty rows and columns before validating template 2020-05-17 18:12:40 +05:30
Rucha Mahabal
b70321cc50 Merge branch 'develop' into duration-control 2020-05-15 20:07:16 +05:30
Nabin Hait
76db5e11c8 feat: Section Break without border 2020-05-15 10:11:58 +05:30
mergify[bot]
b4e5df62d3
Merge pull request #10293 from gavindsouza/installed-apps
feat: single doctype to store installed apps data
2020-05-14 23:55:16 +00:00
mergify[bot]
1a523b24c3
Merge pull request #10193 from prssanna/heatmap-chart
feat: Heatmap type Dashboard Charts
2020-05-14 12:27:12 +00:00
Rucha Mahabal
c51018c039 Merge branch 'develop' into duration-control 2020-05-14 11:32:49 +05:30
Himanshu Warekar
8761ce9786 fix: enable create contact by default 2020-05-12 16:48:05 +05:30
Himanshu Warekar
a4890e3732 Merge branch 'develop' of https://github.com/frappe/frappe into dont_create_contacts 2020-05-12 16:46:55 +05:30
Gavin D'souza
b48d2921bb chore(installed-applications): renamed doctype and docfields 2020-05-12 10:18:48 +05:30
Gavin D'souza
ed74f52e20 feat: single doctype to store installed apps data
updated on migrate
versions enabled
2020-05-11 20:17:40 +05:30
Faris Ansari
e5c723d4f5 test: Fix Exporter tests 2020-05-11 17:00:58 +05:30
Suraj Shetty
09fe8eaff3
Merge branch 'develop' into dont_create_contacts 2020-05-08 23:23:08 +05:30
prssanna
62c1b74932 feat: add heatmap type dashboard chart 2020-05-08 18:32:16 +05:30
Suraj Shetty
2b8ee1d159
Merge branch 'develop' into comment-xss 2020-05-08 14:23:42 +05:30
Suraj Shetty
4f1350adde
Merge branch 'develop' into dont_create_contacts 2020-05-08 14:23:31 +05:30
Rucha Mahabal
ba5b4406ce fix: conflicts 2020-05-08 00:03:35 +05:30
prssanna
80f6ff7f17 style: formatting fixes 2020-05-07 23:36:49 +05:30
Chinmay Pai
baa0d5d26c
chore: simplify contacts condition 2020-05-07 19:02:54 +05:30
Chinmay Pai
413ff349ea
chore: get_contacts only if email account is set 2020-05-07 18:54:55 +05:30
Himanshu Warekar
9b4e5c5a14 fix: do not create contacts if unchecked 2020-05-07 15:26:29 +05:30
prssanna
fff07548fd fix: show restricted button to indicate permission restrictions 2020-05-07 14:00:32 +05:30
Chinmay D. Pai
fffa3d5114
fix: sanitize comment content before saving
comments are handled fine while being created from the frontend, but
when comments are made through a POST request, there's a chance of
rendering javascript in the comment, since there's no way to sanitize
the input on the server side.

Signed-off-by: Chinmay D. Pai <chinmaydpai@gmail.com>
2020-05-06 15:47:54 +05:30
Shivam Mishra
0ff51a257d refactor: move dashboard utilities to frappe.utils 2020-05-06 13:18:02 +05:30
Rucha Mahabal
156a00724f feat: add duration options to Duration docfield 2020-05-06 09:39:57 +05:30
gavin
3af2af2f27
Merge pull request #10231 from gavindsouza/broken-site
fix(new-site): broken site if redis is not running
2020-05-05 15:17:11 +05:30
Gavin D'souza
1af58a9c4d fix(new-site): broken site if redis isnt running 2020-05-05 13:17:17 +05:30
mergify[bot]
c59418cadb
Merge pull request #10194 from scmmishra/modulewise-onboarding
feat: modulewise onboarding via new desk
2020-05-04 13:32:52 +00:00
Rucha Mahabal
58b90e72f3 feat: duration control 2020-05-04 13:20:27 +05:30
Suraj Shetty
afe31ac7c0 style: Fix few deepsource issues 2020-05-03 19:31:20 +05:30
Suraj Shetty
a2facbd9d3 Merge branch 'develop' of https://github.com/frappe/frappe into contextual-translation 2020-05-03 16:01:52 +05:30
Chinmay Pai
aacfdeeb10
Merge pull request #9843 from P-Froggy/feat-email-improvements 2020-05-03 15:09:47 +05:30
Shivam Mishra
a50f8c3475 feat: enable or disable onboarding from system settings 2020-05-01 19:31:55 +05:30
Suraj Shetty
4638272475
Merge branch 'develop' into contextual-translation 2020-05-01 15:40:48 +05:30
Faris Ansari
801e9d411b
Merge pull request #10158 from netchampfaris/page-builder-fixes 2020-04-30 14:42:21 +05:30