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

1399 commits

Author SHA1 Message Date
Suraj Shetty
b968c207d1 Merge branch 'develop' of https://github.com/frappe/frappe into energy_point_new 2019-03-28 19:54:36 +05:30
Sahil Khan
f085765abd Merge branch 'master' into develop 2019-03-28 13:44:14 +05:30
Suraj Shetty
73c1f531e8 fix: Set default only if the dependent field is set (#7130) 
Client side fix
https://github.com/frappe/frappe/pull/7004
 2019-03-28 11:46:51 +05:30
Suraj Shetty
0084108e86 Merge branch 'develop' of https://github.com/frappe/frappe into energy_point_new 2019-03-23 13:05:47 +05:30
Frappe Bot
bd2e410a02 Merge branch 'master' into develop 2019-03-23 07:23:54 +00:00
Shivam Mishra
efa8263d2b
Merge pull request #7102 from scmmishra/hotfix 
fix: Proxied `validate_email_add`
 2019-03-22 15:18:56 +05:30
scmmishra
349132f392 fix: Proxied validate_email_add 2019-03-22 15:00:16 +05:30
Faris Ansari
f724cd84a1 fix: Remove usage of script_type 2019-03-22 00:32:50 +05:30
Suraj Shetty
aee7c67f8b refactor: Move get_users_with_role to utils.user 2019-03-21 21:06:54 +05:30
Himanshu Mishra
d0eb066fa4
Variable bleed in response 2019-03-21 16:49:35 +05:30
Suraj Shetty
00ed1a0f1a Merge branch 'develop' of https://github.com/frappe/frappe into energy_point_new 2019-03-21 15:38:09 +05:30
Saurabh
6d9fa54f0b Merge branch 'master' into develop 2019-03-20 14:30:48 +05:30
Faris Ansari
467bd8a8ad fix: Remove no_sitemap flag 2019-03-19 20:34:19 +05:30
Saurabh
4ae92edfb9 fix: do not check password strength while creating system manager 2019-03-19 14:40:29 +05:30
Suraj Shetty
3402166943 chore: Rename update_log method 
- Add a field which was accidently removed
 2019-03-19 14:17:06 +05:30
Suraj Shetty
56b28d0a0a feat: Init energy points 2019-03-19 14:08:35 +05:30
Suraj Shetty
26197ee29e
Merge pull request #6878 from Mangesh-Khairnar/privacy-data 
Feature: Personal data download and deletion
 2019-03-15 18:36:10 +05:30
Faris Ansari
eeb8fe98eb fix: Don't escape traceback 
Traceback breaks when there is a python object <frappe.model.Document>.
This is occasional, and other tracebacks are not clean, so reverting.
 2019-03-14 13:20:11 +05:30
Rushabh Mehta
a9d9b0b3ea
Merge pull request #7074 from pratu16x7/xml-file-browser-handling 
feat(response): force download html or xml private files
 2019-03-14 11:27:29 +05:30
Prateeksha Singh
14693b4327 feat(response): force download html or xml files 2019-03-14 08:47:02 +05:30
Suraj Shetty
fbf67b78b1 Move get_safe_filters to frappe.utils 2019-03-11 19:41:50 +05:30
Mangesh-Khairnar
e2e9f4213b
Merge branch 'develop' into privacy-data 2019-03-08 20:56:00 +05:30
Faris Ansari
b61a37a233 fix: Notification test in Postgres (#7044) 2019-03-08 20:47:21 +05:30
Frappe Bot
94ea028db3 Merge branch 'master' into develop 2019-03-08 09:38:18 +00:00
Mangesh-Khairnar
d47ef3a17a refactor: change validate_email_add to validate_email_address 2019-03-07 19:06:27 +05:30
Anurag Mishra
cd191439fd feat: Document subscription (#6745) 2019-03-07 14:06:22 +05:30
FinByz Tech Pvt. Ltd
245a8186af fix: Allowed guest to attach files to web forms (#7017) 
Created the fix for the issue [#6774](https://github.com/frappe/frappe/issues/6774), in which guest can attach files in web forms like job application.
 2019-03-06 22:48:11 +05:30
Rushabh Mehta
9df07891ff fix(xmlx): handle unparseable HTML 2019-03-06 16:11:06 +05:30
Faris Ansari
5d1ecb2e47 fix: Global Search fixes 
- Update title, route and published in sync_value
- Update search_template for BS4
 2019-03-03 00:27:13 +05:30
Faris Ansari
fadedb0062 Merge branch 'develop' of https://github.com/frappe/frappe into website-bootstrap-4 2019-03-02 15:15:22 +05:30
Frappe Bot
497a14046e Merge branch 'master' into develop 2019-03-01 09:10:17 +00:00
Rohit Waghchaure
ae67ced14d fix: errprint not working 2019-02-28 20:23:06 +05:30
Rushabh Mehta
abfb44a047
Merge pull request #6993 from zerodhatech/fixtures 
export fixtures of a specific app
 2019-02-28 13:01:21 +05:30
Shridhar Patil
8aadcdf73e export fixtures of a specific app 2019-02-27 12:18:46 +05:30
Faris Ansari
3258acb5c9 Merge branch 'develop' of https://github.com/frappe/frappe into website-bootstrap-4 2019-02-26 23:24:23 +05:30
Rushabh Mehta
08d5d9ae2c fix: default None to empty string for markdown conversions 2019-02-26 15:07:08 +05:30
Suraj Shetty
ce18b5ab2f
Fix minor formatting 2019-02-21 12:10:49 +05:30
Himanshu Warekar
121ffc0cf7 renamed function to get_weekdays 2019-02-21 11:17:52 +05:30
Himanshu Warekar
a6ce45240d add function to get weekdays 2019-02-21 11:11:38 +05:30
Faris Ansari
5a96fc70de Merge branch 'develop' of https://github.com/frappe/frappe into website-bootstrap-4 2019-02-20 19:25:25 +05:30
Aditya Hase
c08bdd88a8 fix: Jinja template error (#6958) 
https://github.com/frappe/frappe/pull/6957
 2019-02-19 14:22:01 +05:30
Aditya Hase
4b4d59026f fix: Jinja template error (#6957) 
Errors in Custom Print Format are not framework errors and should not have a "Report Issue" button
 2019-02-19 14:19:51 +05:30
Suraj Shetty
c19befeb5b
fix: Don't assume async value == True 
fix: Don't assume async value == True
 2019-02-18 08:45:38 +05:30
Rushabh Mehta
fcaadf78ad
Merge pull request #6891 from rmehta/refactor-comments 
BREAKING CHANGE: Comments are now handled separately from Communication and Version
 2019-02-16 16:54:16 +05:30
Frappe Bot
bfc25ad1e5 Merge branch 'master' into develop 2019-02-15 10:21:47 +00:00
Rushabh Mehta
e850721d05
Merge pull request #6843 from Zlash65/enh-treeview 
feat: Minor additional enhancements to Treeview
 2019-02-15 14:30:38 +05:30
Aditya Hase
683be9e096 feat(error-report): Collect frame locals in error report (#6938) 
* feat(error-report): Collect frame locals in error report

* style: Linting fixes
 2019-02-15 14:24:08 +05:30
Sagar Vora
17b20b22a3 Merge branch 'master' into develop 2019-02-12 16:31:54 +05:30
Nabin Hait
6e659653a9 fix: filter object to list 2019-02-08 12:27:00 +05:30
Rushabh Mehta
ae097e5139 fix: tests, check for spam comments 2019-02-07 16:35:50 +05:30