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

17208 commits

This branch
This branch
All branches
Author SHA1 Message Date
Faris Ansari
8f84cc4e2e
Merge pull request #6409 from netchampfaris/email-reply-fix 
fix: Dont append last email's content in reply
 2018-11-06 19:03:28 +05:30
Faris Ansari
58c0a1f75c fix: Dont append last email's content in reply 2018-11-06 19:03:23 +05:30
Ameya Shenoy
78ff13fc6e
Merge branch 'staging' into develop 2018-11-06 11:12:10 +00:00
Ameya Shenoy
93720a911d
Merge branch 'staging-fixes' into staging 2018-11-06 11:05:32 +00:00
Ameya Shenoy
aa26e39da0 bumped to version 11.0.3-beta.22 2018-11-06 11:05:32 +00:00
Ameya Shenoy
60e2090c3b
Merge pull request #6401 from frappe-pr-bot/translations-2018-11-05 
[Translation] Updated Translations
 2018-11-06 16:33:13 +05:30
Faris Ansari
5ce2479753
Merge pull request #6407 from netchampfaris/ace-editor 
Ace Code Editor
 2018-11-06 16:13:50 +05:30
rohitwaghchaure
4232bde0a1
Merge pull request #6408 from rohitwaghchaure/user_list_view_is_not_working 
[Fix] User listview is not working becaause full name field is hidden
 2018-11-06 13:31:04 +05:30
Rohit Waghchaure
6381c84ffd [Fix] User listview is not working becaause full name field is hidden 2018-11-06 12:44:25 +05:30
Faris Ansari
48c5345ce6 fix: Set Code options to JS 
For Custom Script, DocField and Customize Form Field
 2018-11-06 12:30:56 +05:30
Faris Ansari
8ffc753568 style: Linting 2018-11-06 12:03:29 +05:30
Faris Ansari
c69ce9216a fix: Add JS as a valid option 2018-11-06 11:41:56 +05:30
Faris Ansari
c88f05d711 feat(Code Editor): Ace Editor for Code fieldtypes 
- Better editing experience with syntax highlighting and auto-completion
- Support HTML, Javascript and CSS language modes via the Options field
 2018-11-06 00:59:14 +05:30
Faris Ansari
cac173289b
Merge pull request #6399 from deepeshgarg007/datatable-upgrade 
Upgrade Datatable to version 1.5.3
 2018-11-05 20:09:29 +05:30
Faris Ansari
fc7a4a7835
fix(listview): Smart parsing of route options (#6404) 
- Fieldname should also be searched in child tables
 2018-11-05 18:35:44 +05:30
rohitwaghchaure
5aa9dbf6ee fix: Dynamic Link filter in listview (#6405) 2018-11-05 18:35:29 +05:30
Faris Ansari
6beac087db
Merge pull request #6402 from netchampfaris/marketplace-fixes 
Marketplace fixes
 2018-11-05 17:50:49 +05:30
Ameya Shenoy
b9ad9f8fb1
Merge branch 'staging' into develop 2018-11-05 11:43:46 +00:00
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
Faris Ansari
c26f21781f fix(image view): Bulk actions in image view 2018-11-05 15:46:00 +05:30
Faris Ansari
dabbd45c50 fix(router): error handling for use in non-desk environment 2018-11-05 15:45:08 +05:30
frappe-pr-bot
b823dcd1cc [Translation] Updated Translations 2018-11-05 12:13:25 +02:00
deepeshgarg007
c164aac933 Datatable Upgrade 2018-11-05 12:53:34 +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
d0e7690ae2
Merge branch 'staging' into develop 2018-11-05 06:48:46 +00:00
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
Suraj Shetty
ff59b9e7c2 Fix social page reload issue (#6395) 2018-11-05 11:00:02 +05:30
johnhkelley1
e3f2ea8c2c Fix reroute bug (#6384) 
Before, 'window.history.back()' was getting executed for all reroutes,
instead of rerouting to the route specified by
frappe.re_route[window.location.hash].

This fix causes 'window.history.back()' to only execute for the special
case where a document is renamed and then the back button is pressed
(as intended). All other reroutes will forward to the appropriate route
specified in frappe.re_route.
 2018-11-05 10:54:19 +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
Suraj Shetty
4f965c2ea5
Social fixes (#6388) 
* Disable post button on click

* Remove redundant code
 2018-11-02 17:06:56 +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
Suraj Shetty
5d75f95ec9 Social fixes (#6375) 
* Fix post and post comment permissions

- User should be able to edit only his post/comment
- other post should and comment should be readonly

* Separate scroll to section function

* Add a test fix

* Hide activity on mobile view for now

* fix: Return early if no session user

* chore: Remove empty test files

* Add semicolon

* Return if doc.owner is not present
 2018-11-02 14:45:24 +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