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

16983 commits

This branch
This branch
All branches
Author SHA1 Message Date
Ameya Shenoy
321e45925a
Merge branch 'staging-fixes' into staging 2018-11-05 11:43:04 +00:00
Ameya Shenoy
889f0a2744 bumped to version 11.0.3-beta.21 2018-11-05 11:43:04 +00:00
Ameya Shenoy
e289f5041e
Merge pull request #6403 from netchampfaris/quill-fixes-returns 
fix(Quill): Add all quill attributes that are required to render it
 2018-11-05 17:10:25 +05:30
Faris Ansari
fe334d2c92 fix(Quill): Add all quill attributes that are required to render it 2018-11-05 17:07:21 +05:30
Ranjith Kurungadam
a34eab2140 Add Bcc in Notification (#6392) 
* Notification - add Bcc

* remove Bcc from email header

* feat: Bcc in Notification
 2018-11-05 12:27:21 +05:30
Ameya Shenoy
266a23c65c
Merge branch 'staging-fixes' into staging 2018-11-05 06:46:35 +00:00
Ameya Shenoy
2009918efa bumped to version 11.0.3-beta.20 2018-11-05 06:46:35 +00:00
Ameya Shenoy
5a791cd099
Merge branch 'master' into staging-fixes 2018-11-05 06:37:49 +00:00
Ameya Shenoy
5821163d61
Merge branch 'hotfix' 2018-11-05 06:37:45 +00:00
Ameya Shenoy
54baae96f9 bumped to version 10.1.59 2018-11-05 06:37:45 +00:00
Aditya Hase
e6b070e611 refactor: Deduplication (#6347) 
* refactor: Deduplicate setup_perms_for

`setup_perms_for` has two identical definitions in

frappe/utils/reset_doc.py and
frappe/patches/v7_2/setup_custom_perms.py

Remove definition from setup_custom_perms.py, use import instead

* refactor: Deduplicate get_parent_doc and set_timeline_doc

`get_parent_doc` and `set_timeline_doc` are accidentally defined twice in

frappe/core/utils.py and
frappe/core/doctype/communication/communication.py

Remove definition from communication.py, use import instead

* fix(python3): Replace urlopen import with six.moves.urllib.request.urlopen
 2018-11-05 11:01:59 +05:30
rohitwaghchaure
2521e306a4 [Fix] Not able to export sales analytics report (#6369) 2018-11-05 11:01:24 +05:30
Saif
8d8154b0d7 Allow selecting page orientation for print view of report (#6393) 2018-11-05 11:00:55 +05:30
Saurabh
856a721073 [fix] sql injection fix (#6390) 2018-11-05 10:51:57 +05:30
Ameya Shenoy
2ead222090 fix(email): Email status changes to Read (#6396) 
The email recieved template was in unsubscribe email. Hence it
didn't used to function in case the emails were sent from DocTypes
like Issue, wherein the unsubscribe email template is not used.
Moved it to email_footer template.

Signed-off-by: Ameya Shenoy <shenoy.ameya@gmail.com>
 2018-11-05 10:49:18 +05:30
Faris Ansari
e4d83fbc97
Merge pull request #6398 from frappe/security-fixes 
fix an issue with whitelisted get_list method
 2018-11-05 10:32:38 +05:30
Suraj Shetty
15d3f4660e fix(security): pop ignore_permissions arg from whitelisted method 2018-11-05 10:29:50 +05:30
Faris Ansari
6bbb84f9c3
XSS fixes (#6386) 
* fix(XSS): Sanitise page name before routing

* fix(XSS): Sanitise tag value before saving it
 2018-11-03 11:52:09 +05:30
rohitwaghchaure
f185cfded1
Merge pull request #6387 from rohitwaghchaure/fix_bredcrumb_issue_in_file 
Bredcrumb issue in the file
 2018-11-02 15:19:50 +05:30
Rohit Waghchaure
731d12238e Bredcrumb issue in the file 2018-11-02 15:18:47 +05:30
Faris Ansari
8fe67e17c3
Merge pull request #6382 from netchampfaris/update-profile-image-fix 
fix: Only allow images in Attach Image
 2018-11-02 13:44:14 +05:30
Faris Ansari
f470d3e427
Merge pull request #6372 from rmehta/no-filter-validate 
fix(filters): dont validate email in filters
 2018-11-02 13:43:46 +05:30
Suraj Shetty
0aee7afb87 Fix permission error while import (#6385) 
Custom permission should apply while import
or else import of doctype with custom roles fails
 2018-11-02 12:19:25 +05:30
Faris Ansari
ab8767833d
Merge pull request #6381 from netchampfaris/quill-fixes-4 
fix(Quill): Add data-row attr to whitelist
 2018-11-02 10:47:21 +05:30
Faris Ansari
10c2e8f262 fix: Only allow images in Attach Image 2018-11-01 19:38:07 +05:30
Faris Ansari
e0cf3f367b fix(Quill): Add data-row attr to whitelist 
- data-row attribute is added by Quill for retaining table structure
 2018-11-01 19:06:30 +05:30
Faris Ansari
86e5201384 Misc fixes (#6379) 
* fix(Quill): Set value using simple innerHTML assignment

- earlier it used to focus the editor

* fix(Event Emitter): Make EventEmitterMixin

* fix(EmailComposer): Delete draft mail when email is sent

* fix: Override comment area value in Email Composer

* fix(Quill): Enable attaching GIF to editor

* fix: Missing semicolon
 2018-11-01 18:33:16 +05:30
Ameya Shenoy
ae558c6d52
Merge branch 'staging-fixes' into staging 2018-10-31 13:48:40 +00:00
Ameya Shenoy
8944f94169 bumped to version 11.0.3-beta.19 2018-10-31 13:48:40 +00:00
Nabin Hait
6bf1fad37e Update database.py 2018-10-31 18:43:06 +05:30
Nabin Hait
f4db502ab8 feat(success action): configurable timeout on success action 2018-10-31 18:43:06 +05:30
Nabin Hait
6bbd23f2cd fix(debug): Print query if debug true 2018-10-31 18:43:06 +05:30
Nabin Hait
5ee61a0578 fix(fetch-from): ignore updating based on fetch-from if single doctype 2018-10-31 18:43:06 +05:30
Nabin Hait
8a1c762a7c fix(bulk-update): Rollback on exceptions 2018-10-31 18:43:06 +05:30
Rushabh Mehta
96f88cf46b fix(filters): dont validate email in filters 2018-10-31 16:49:03 +05:30
Ameya Shenoy
ca72c772f1
Merge branch 'staging-fixes' into staging 2018-10-31 10:46:24 +00:00
Ameya Shenoy
0fb1df0964 bumped to version 11.0.3-beta.18 2018-10-31 10:46:24 +00:00
Ameya Shenoy
55fbf7ad99
Merge branch 'master' into staging-fixes 2018-10-31 10:40:55 +00:00
Ameya Shenoy
a26dd436f5
Merge branch 'hotfix' 2018-10-31 10:36:54 +00:00
Ameya Shenoy
977b5a118e bumped to version 10.1.58 2018-10-31 10:36:54 +00:00
Ameya Shenoy
9807341146
Merge pull request #6370 from saurabh6790/sql_injection_fix_3110 
[fix] potential sql injection by sanitizing fields parameter
 2018-10-31 16:04:29 +05:30
Saurabh
a1e68b6fd5 [fix] potential sql injection by sanitizing fields parameter 2018-10-31 14:26:22 +05:30
Ameya Shenoy
334859a334
Merge branch 'staging-fixes' into staging 2018-10-31 07:29:05 +00:00
Ameya Shenoy
24bdcd05cc bumped to version 11.0.3-beta.17 2018-10-31 07:29:05 +00:00
rohitwaghchaure
000c61ab87
Merge pull request #6365 from rohitwaghchaure/conflicts_issues 
Fixed conflicts
 2018-10-31 12:23:51 +05:30
Rohit Waghchaure
44441d8ce7 Fixed conflicts 2018-10-31 12:09:31 +05:30
Ameya Shenoy
26099e8b0b
Merge pull request #6362 from shreyashah115/fix-delete 
Revert series count after doc deletion
 2018-10-31 11:30:04 +05:30
Faris Ansari
9d29139c25 fix: Dont refresh list if filters are being edited (#6354) 2018-10-31 11:16:14 +05:30
Faris Ansari
755bb6b63f fix(chat): Separate setup code from constructor (#6363) 
- to avoid class transpilation issue
 2018-10-31 11:15:09 +05:30
Ameya Shenoy
0e0c103a32
Merge branch 'staging-fixes' into staging 2018-10-30 12:50:41 +00:00