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

24350 commits

This branch
This branch
All branches
Author SHA1 Message Date
mergify[bot]
82a6715cb3
Merge pull request #9851 from fumin/patch-1 
fix: web form not submitting data in grid views
 2020-04-13 11:23:54 +00:00
mergify[bot]
9258d6aa53
Merge pull request #9914 from scmmishra/desk-custom-nonetype-fix 
feat: handle empty config
 2020-04-13 11:11:02 +00:00
mergify[bot]
bcef06840e
Merge pull request #9766 from prssanna/field-strip-html 
fix: Strip html for required field types
 2020-04-13 10:58:44 +00:00
mergify[bot]
95e0280f7b
Merge pull request #9925 from Thunderbottom/rename_doc-fix 
fix: pop cmd from rename_doc
 2020-04-13 10:46:37 +00:00
mergify[bot]
5baa07db57
Merge pull request #9913 from kasgel/kasgel/frappe-request-cmd-header 
feat: Add frappe cmd to request headers on website for analytics purposes
 2020-04-13 09:40:39 +00:00
Kenneth Sequeira
ff9f57417e
feat: Add option to disable comments for Blog Post (#9864) 
* add condition to disable comments

* update description

Co-authored-by: Suraj Shetty <13928957+surajshetty3416@users.noreply.github.com>
 2020-04-13 15:09:33 +05:30
Suraj Shetty
245e8399e3
Merge branch 'develop' into desk-custom-nonetype-fix 2020-04-13 14:58:18 +05:30
Shivam Mishra
7651df7bed Merge branch 'develop' of github.com:frappe/frappe into field-strip-html 2020-04-13 14:04:22 +05:30
Chinmay D. Pai
46c3bffbdc
fix: pop cmd from rename_doc 
fixes issue wherein rename_doc is called through an api call and is
passed the entire unrolled frappe.form_dict, which causes the following
error:

Traceback (most recent call last):
  File "/home/frappe/frappe-bench/apps/frappe/frappe/app.py", line 60, in application
    response = frappe.api.handle()
  File "/home/frappe/frappe-bench/apps/frappe/frappe/api.py", line 58, in handle
    return frappe.handler.handle()
  File "/home/frappe/frappe-bench/apps/frappe/frappe/handler.py", line 24, in handle
    data = execute_cmd(cmd)
  File "/home/frappe/frappe-bench/apps/frappe/frappe/handler.py", line 63, in execute_cmd
    return frappe.call(method, **frappe.form_dict)
  File "/home/frappe/frappe-bench/apps/frappe/frappe/__init__.py", line 1068, in call
    return fn(*args, **newargs)
  File "/home/frappe/frappe-bench/apps/frappe/frappe/__init__.py", line 832, in rename_doc
    return rename_doc(*args, **kwargs)
TypeError: rename_doc() got an unexpected keyword argument 'cmd'

Signed-off-by: Chinmay D. Pai <chinmaydpai@gmail.com>
 2020-04-13 13:57:52 +05:30
Shivam Mishra
c76edbe311 Merge branch 'develop' of github.com:frappe/frappe into patch-1 2020-04-13 13:55:29 +05:30
Suraj Shetty
8e86768848
Merge pull request #9918 from surajshetty3416/cleaner-bench-console 
chore: Cleaner bench console
 2020-04-13 09:13:41 +05:30
Suraj Shetty
3343533f8c
Merge branch 'develop' into cleaner-bench-console 2020-04-13 00:57:00 +05:30
Suraj Shetty
b1cadbf018 fix: Limit retries 2020-04-12 20:03:24 +05:30
Suraj Shetty
033c183e53 style: Fix formatting and eslint issues 2020-04-12 19:39:52 +05:30
Suraj Shetty
5c8effe7a1 fix: Retry to join chat room till server starts 2020-04-12 19:30:43 +05:30
mergify[bot]
cf10a32320
Merge pull request #9917 from fumin/patch-3 
fix: i18n for the Cancel button in web_form
 2020-04-12 13:02:23 +00:00
Fumin
94d21e568c
fix: i18n for the Cancel button in web_form 2020-04-12 20:05:48 +08:00
Suraj Shetty
e26064436b chore: Do not print traceback in console 
- Instead print class of error and the site name
 2020-04-12 15:05:28 +05:30
Suraj Shetty
772e1efd14
Merge pull request #9915 from frappe/readme-docs-link 
chore: Add documentation link in readme
 2020-04-11 19:45:06 +05:30
Faris Ansari
6b61a27b5d
chore: Add documentation link in readme 2020-04-11 19:41:11 +05:30
Shivam Mishra
c534f9b0b6 feat: handle empty config 2020-04-11 19:31:24 +05:30
mergify[bot]
b0452becc8
Merge pull request #9885 from gavindsouza/feat-frontmatter 
feat: handle YAML frontmatter via internal API
 2020-04-11 13:45:51 +00:00
Kasper Oikarinen
ca3609328a Add frappe cmd to request headers in website for analytics 2020-04-11 15:43:09 +02:00
Shivam Mishra
7d51655327
fix: disable desk customization on mobile (#9912) 
* fix: disable customization on mobile

* fix (style): tabs and spaces
 2020-04-11 18:52:03 +05:30
mergify[bot]
106e4b7d78
Merge pull request #9854 from scmmishra/better-cache-policy 
refactor: Caching for document counts
 2020-04-11 05:11:11 +00:00
prafful1234
e19b712e23
fix(api): Fix api for user oauth validations (#9676) 
* fix(api): Fix api for user oauth validations

* fix: add auth exceptions + format functions

* fix: Moved exceptions and a validation check

* Fix: Reqested changes

Co-authored-by: prafful1234 <prafful@mntechnique.com>
Co-authored-by: Rohan Bansal <rohan@digithinkit.com>
Co-authored-by: Suraj Shetty <13928957+surajshetty3416@users.noreply.github.com>
 2020-04-11 10:27:00 +05:30
mergify[bot]
2856d31984
Merge pull request #9906 from Thunderbottom/sanitize-xss-error-page 
fix: sanitize html before rendering error
 2020-04-11 04:40:01 +00:00
Suraj Shetty
d93f8d8f3f
style: Remove unused import 2020-04-10 22:07:03 +05:30
Suraj Shetty
9a3c8aaee5
Merge branch 'develop' into feat-frontmatter 2020-04-10 22:03:09 +05:30
Chinmay D. Pai
fd88d324dc
fix: sanitize html before rendering error 
Signed-off-by: Chinmay D. Pai <chinmaydpai@gmail.com>
 2020-04-10 21:26:08 +05:30
Suraj Shetty
a3dda3b8ff
Merge pull request #9899 from Thunderbottom/email-group-fix 
fix: set welcome_email to None if template not found
 2020-04-10 20:50:32 +05:30
Fumin
fa6f05282b
add semi-colon to end of line 
Codacy demands that we add this semi-colon https://app.codacy.com/gh/frappe/frappe/pullRequest?prid=5305922 .
 2020-04-10 22:53:24 +08:00
Suraj Shetty
a02e940aac
Merge pull request #9896 from scmmishra/schema-breadcrumb 
feat: use schema.org specs for breadcrumb meta
 2020-04-10 20:20:32 +05:30
Suraj Shetty
ba8294ac4f
Merge branch 'develop' into schema-breadcrumb 2020-04-10 18:50:28 +05:30
Suraj Shetty
07bdf24e2e
Merge branch 'develop' into schema-breadcrumb 2020-04-10 18:49:54 +05:30
Shivam Mishra
46d1704f68
Merge pull request #9817 from scmmishra/desk-user-custom 
feat: allow users to customize desk
 2020-04-10 18:49:00 +05:30
Suraj Shetty
c8cdbf8a36
chore: Remove Backport Github Action 
Because it does not work
 2020-04-10 18:47:26 +05:30
Shivam Mishra
c03e11d254 fix: shortcut routing for new reports 2020-04-10 18:14:58 +05:30
Suraj Shetty
52b8a6b27b
Merge branch 'develop' into better-cache-policy 2020-04-10 18:03:07 +05:30
Shivam Mishra
f927ad0ba9 Merge branch 'better-cache-policy' of github.com:scmmishra/frappe into better-cache-policy 2020-04-10 16:45:35 +05:30
Shivam Mishra
c412fde953 feat: don't rebuild cache on delete 2020-04-10 16:42:03 +05:30
Shivam Mishra
d4e6b89863 Merge branch 'develop' of github.com:frappe/frappe into desk-user-custom 2020-04-10 15:48:53 +05:30
Chinmay D. Pai
9df69d214c
fix: set welcome_email to None if template not found 
fixes UnboundLocalError: welcome_email referenced before assignment

Signed-off-by: Chinmay D. Pai <chinmaydpai@gmail.com>
 2020-04-10 15:42:58 +05:30
Abhishek Kedar
5d92e7cf9f
fix: checking value of send_welcome_email (#9888) 
* checking value of send_welcome_email

If send_welcome_email is set to 0 still it is triggering send_welcome_mail_to_user(). Need to check if send_welcome_email=1.
This is required.

* fix: cint(self.send_welcome_email) in user.py

Instead of checking self.send_welcome_email==1 used cint(self.send_welcome_email

Co-Authored-By: Chinmay Pai <chinmaydpai@gmail.com>

* chore: remove list from kwargs

Co-authored-by: Chinmay Pai <chinmaydpai@gmail.com>
 2020-04-10 15:30:09 +05:30
Shivam Mishra
7a47659360 feat: use schema.org specs for breadcrumb meta 2020-04-10 15:24:42 +05:30
Shivam Mishra
a0f545bfa3 feat: add label field to options 2020-04-10 15:00:26 +05:30
Shivam Mishra
fae6ade6ae fix: section label for shortcuts 2020-04-10 14:51:29 +05:30
Shivam Mishra
bd070fd35e fix: remove unused variable 2020-04-10 14:47:33 +05:30
Shivam Mishra
0888424506 style: fix mixed spaces and tabs 2020-04-10 14:28:42 +05:30
Shivam Mishra
aa489186c6 feat: use eslint version 9 2020-04-10 14:25:12 +05:30