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

22599 commits

This branch
This branch
All branches
Author SHA1 Message Date
gavin
87fec89e97
Merge branch 'develop' into updated-requirements 2019-11-27 14:48:40 +05:30
Aditya Hase
653c89b739
fix(patch): Handle failures in while making Prepared Report att… (#8899) 
fix(patch): Handle failures in while making Prepared Report attachments private
 2019-11-26 19:48:02 +05:30
Aditya Hase
333ea79d2d
fix(patch): Handle failures in while making Prepared Report attachments private 2019-11-26 18:33:54 +05:30
sahil28297
5ba9dba7e9
Merge pull request #8882 from frappe/version-12 
Merge Version-12 to develop
 2019-11-26 16:01:28 +05:30
Sahil Khan
94a211edb0 Merge branch 'v12-pre-release' into version-12 2019-11-26 15:23:01 +05:30
Sahil Khan
747fab0003 bumped to version 12.0.20 2019-11-26 15:43:01 +05:50
sahil28297
75d1aec6fc
Merge pull request #8891 from surajshetty3416/fix-list-view-render-p 
fix: Escape HTML for the value of field with HTML Editor fieldtype
 2019-11-26 15:16:15 +05:30
Suraj Shetty
130b0f6cfd fix: Escape HTML for the value of field with fieldtype HTML Editor 2019-11-26 15:15:32 +05:30
Suraj Shetty
83124d8eee fix: Suppress unwanted quill warnings 2019-11-26 14:31:28 +05:30
Suraj Shetty
2cb9f22e53 Revert "fix(List): standard filters with default value are saved when changed" 2019-11-26 14:21:06 +05:30
Aditya Hase
54f2da5a52 fix(security): Make all Prepared Report file attachments private 2019-11-26 14:20:16 +05:30
sahil28297
885d447f7b
Merge pull request #8892 from frappe/revert-8847-std-filter 
revert: "fix(List): standard filters with default value are saved when changed"
 2019-11-26 14:17:11 +05:30
Suraj Shetty
88fbf22619
Revert "fix(List): standard filters with default value are saved when changed" 2019-11-26 14:05:07 +05:30
Suraj Shetty
fdd698dc30
fix: don't save if not validated (#8890) 
fix: don't save if not validated
 2019-11-26 12:50:23 +05:30
mergify[bot]
d1cf393cec
Merge pull request #8884 from adityahase/fix-prepared-report-private-12 
fix(security): Make all Prepared Report file attachments private
 2019-11-26 06:38:02 +00:00
Suraj Shetty
121656d579 fix: Module view page issue (#8879) 
-  Filter link based on the name of the link config,
because label can be different if user switches the language.
- Return the value instead of label while updating links for module
- Show Customize option in DeskModuleBox
 even if there are no links selected by the user.
 2019-11-26 12:07:45 +05:30
mergify[bot]
4b122f90d3
Merge pull request #8817 from Alchez/dev-tags-filter 
fix: update sidebar tags on changing list filters (develop)
 2019-11-26 06:34:39 +00:00
Shivam Mishra
1c1b5aa4e7 style: linting fix 2019-11-26 12:00:37 +05:30
Shivam Mishra
1e9de53483 fix: don't save if not validated 2019-11-26 12:00:04 +05:30
Suraj Shetty
f618356748
chore(deps): [security] bump tar from 2.2.1 to 2.2.2 (#8803) 
chore(deps): [security] bump tar from 2.2.1 to 2.2.2
 2019-11-26 11:44:19 +05:30
mergify[bot]
e1b9a13384
Merge pull request #8886 from benknowles/patch-2 
fix: parameterize link name when clearing timeline references
 2019-11-26 06:11:09 +00:00
Suraj Shetty
046c43e0b5
fix: Parameterize link_doctype 2019-11-26 11:29:30 +05:30
mergify[bot]
3318b308a5
Merge pull request #8811 from frappe/dependabot/pip/markdown2-2.3.6 
chore(deps): [security] bump markdown2 from 2.3.5 to 2.3.6
 2019-11-26 05:41:10 +00:00
Suraj Shetty
8552019be9 fix: Escape HTML for the value of field with fieldtype HTML Editor 2019-11-26 10:56:49 +05:30
Suraj Shetty
1ed335d427
Merge pull request #8881 from surajshetty3416/fix-console 
fix: Suppress quill warnings
 2019-11-26 10:46:42 +05:30
mergify[bot]
edf35838c8
Merge pull request #8851 from netchampfaris/new-data-import-fixes 
fix: Data Import fixes
 2019-11-26 04:48:41 +00:00
Ben Knowles
2c16a86e86
fix: parameterize link name when clearing timeline references 
link_name could potentially include an apostrophe and cause:

`"mysql.err.ProgrammingError: (1064, "You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax"`

Adjusted the query to parameterize it
 2019-11-25 16:20:33 -06:00
Aditya Hase
17161976c6
fix(security): Make all Prepared Report file attachments private 2019-11-25 19:35:18 +05:30
Nabin Hait
3948a438a9 Fixed merge conflict 2019-11-25 14:59:43 +05:30
Nabin Hait
fd39f2ac70 bumped to version 12.0.19 2019-11-25 15:18:22 +05:50
Suraj Shetty
0a49a54e17 fix: Suppress unwanted quill warnings 2019-11-25 14:49:05 +05:30
Nabin Hait
9557701815
fix: Actions in msgprint (#8877) 2019-11-25 13:31:06 +05:30
Nabin Hait
d9a1bfadc8
fix: Actions in msgprint (#8878) 2019-11-25 13:02:34 +05:30
Shivam Mishra
c789bfa69f
Merge pull request #8808 from scmmishra/razorpay-orders 
feat: New order API for client side checkout handling
 2019-11-25 12:10:15 +05:30
gavin
f5ed267125
Merge pull request #8859 from gavindsouza/address-web-from-v12pre 
fix(web-forms): view addresses only by session user
 2019-11-25 12:08:08 +05:30
gavin
2f9055fa04
Merge pull request #8853 from gavindsouza/address-web-from 
fix(web-forms): view addresses only by session user
 2019-11-25 12:01:59 +05:30
Nabin Hait
3a73cf6e7d
feat: Handle server and client side primary action in msgprint (#8870) 
* feat: Handle server and client side primary action in msgprint

- Added provision to pass primary action from server side msgprint
- msgprint on client side handles server side and client side methods as primary actions

* chore: Code cleanup

* fix: Codacy

* fix: patch
 2019-11-22 15:13:19 +05:30
Faris Ansari
5da2a5b4e4
feat: Handle server and client side primary action in msgprint (#8835) 
feat: Handle server and client side primary action in msgprint
 2019-11-22 15:02:33 +05:30
Nabin Hait
2759689ea9
fix: reload notification subscribed document (#8868) 2019-11-22 11:34:20 +05:30
rohitwaghchaure
bf7abb257e
Merge pull request #8866 from rohitwaghchaure/fixed_patch_create_notification_settings_for_user 
fix: patch
 2019-11-22 10:38:34 +05:30
Rohit Waghchaure
c3fcbce168 fix: patch 2019-11-21 19:36:04 +05:30
Suraj Shetty
01d517f815 Merge branch 'develop' of https://github.com/frappe/frappe into v12-pre-release 2019-11-21 17:38:01 +05:30
mergify[bot]
f3363ac241
Merge pull request #8798 from nick9822/nick9822-fixes 
fix: Web form edit and new doc creation
 2019-11-21 12:02:12 +00:00
mergify[bot]
0058fd4e51
Merge pull request #8790 from ruchamahabal/fix_report_builder 
fix(Report): do not validate Script Manager role for Report Builder type
 2019-11-21 11:48:05 +00:00
Jack
7e6f5ea07e Misspelt, when selecting ALL emails it was being set to UNSEEN. This rectifies the issue. 2019-11-21 17:07:15 +05:30
Suraj Shetty
3d15be73fa style: Remove trailing tabs 2019-11-21 17:05:49 +05:30
prssanna
fdf37115aa fix: check for __default, __global default values 2019-11-21 17:05:49 +05:30
prssanna
3505e68081 fix: standard filters with default value are saved when changed 2019-11-21 17:05:49 +05:30
Suraj Shetty
81b5084eb1 Merge branch 'v12-pre-release' of https://github.com/frappe/frappe into v12-pre-release 2019-11-21 17:01:39 +05:30
Suraj Shetty
cbde464319 fix: Add Notification Settings 2019-11-21 17:01:33 +05:30