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

88 commits

Author SHA1 Message Date
Frappe Bot
629a5e502a Merge branch 'master' into develop 2019-04-07 09:03:27 +00:00
Faris Ansari
70246946b2 fix: Dont escape tracebacks in errprint 2019-03-28 15:05:23 +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
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
Sagar Vora
89efa968d8 Merge branch 'master' into develop 2019-02-05 18:39:43 +05:30
Saurabh
96bff3cd9e fix: jinja local.conf data leak (#6884) 2019-02-05 10:52:00 +05:30
Aditya Hase
57196a8bbe fix(website): Enable socketio on website (for file upload) (#6866) 2019-01-31 13:54:42 +05:30
Faris Ansari
ac28b0373d feat: Add get_single_value in jinja methods 2019-01-26 13:49:28 +05:30
Ameya Shenoy
ee3ae7abea
Merge branch 'staging' into develop 2018-10-30 12:52:16 +00:00
Ameya Shenoy
25a0b8dba2
Merge branch 'master' into staging-fixes 2018-10-30 12:09:41 +00:00
Ameya Shenoy
dd0e7ba472
fix(help): mitigate security fix for docs 
Signed-off-by: Ameya Shenoy <shenoy.ameya@gmail.com>
 2018-10-30 17:13:00 +05:30
Aditya Hase
3afb9ebcbc
fix(security): Make Jinja tighter 2018-10-30 13:13:42 +05:30
Saif
971e60f0bf Added frappe.get_cached_doc in available jinja methods (#6292) 2018-10-23 11:04:18 +05:30
Rushabh Mehta
3600b55f58
fix(webform grid): click on edit and list view (#5922) 2018-08-04 16:24:38 +05:30
Sharath C
22a2c682c9 Jinja Customization from hooks.py bug fix (#5604) 
* Jinja Customization from hooks.py bug fix

* Condition to check for site initialization added.
 2018-05-24 14:26:18 +05:30
Ameya Shenoy
188c4c87db [fix] global-setup-help (#5603) 
- custom jinja templates are taken if and only if a site is mentioned
- added test in travis as well
 2018-05-24 12:05:25 +05:30
Sharath C
873d3c85e8 Add Custom Jinja methods from hooks.py (#5585) 2018-05-22 10:16:38 +05:30
rohitwaghchaure
922b1237e7 [Fix] Desktop icon page not showing for french language (#4518) 2017-11-21 15:57:49 +05:30
Rushabh Mehta
5338f5c95d [minor] list 2017-09-05 12:09:42 +05:30
Aditya Hase
bab692ff59 Replaced mixed usage of tabs and spaces for indents with tabs only (#3813) 
Python 3 (PEP 8) strictly disallows mixed use of tabs and spaces
for indentation
frappe innstalltion only throws error on frappe/utils/jinja.py as
of now but the rest are almost equally likely to fail, so changed
all of them in one commit
 2017-07-31 10:50:26 +05:30
Rushabh Mehta
c519122929 [docs] Build docs in an app (#3796) 
* [docs] to be rendered in website

* [docs] generating-docs.md

* [fix] codacy

* [docs] minor updates

* [fix] routing
 2017-07-28 11:43:16 +05:30
Faris Ansari
3f93565553 Email designs (#3786) 
* New message email

* Mentioned in a comment

* File backup email

* Feedback email

* Administrator logged in email

* Upcoming events email

* minor

* Add header title and indicator color
 2017-07-27 17:51:20 +05:30
Makarand Bauskar
e86e69b4e7 [minor] return '' if template is none & ignore if _custom_html field has no options (#3664) 2017-07-12 15:51:08 +05:30
Faris Ansari
044ac18cb5 Email (#3625) 
* inline images working, ability to use template name for emails

* Extract header into separate file

* Remove erp-logo

* minor refactor

* [minor] codacy

* fix for test

* Add test case for email body

* remove unused imports

* Add more tests for email body
 2017-07-12 14:02:55 +05:30
Ashwini Save
ae1b456498 Added “POST” method in app.py and updated csrf_token accessible from “frappe.session” (#3302) 2017-05-19 11:14:08 +05:30
tundebabzy
6fbe20caaa Except and raise statement python 3 compatible style (#3216) 
* changes exception and raise statements to python 3 style

* changes except statement to python 3 style

* changes except and raise statement to python 3 compatible style

* changes except and raise statement to python 3 compatible style

* changes except and raise statement to python 3 compatible style

* changes except and raise statement to python 3 compatible style

* changes except and raise statement to python 3 compatible style

* changes except and raise statement to python 3 compatible style

* changes except and raise statement to python 3 compatible style

* changes except and raise statement to python 3 compatible style

* changes except and raise statement to python 3 compatible style

* changes except and raise statement to python 3 compatible style

* changes except and raise statement to python 3 compatible style

* changes except and raise statement to python 3 compatible style

* changes except and raise statement to python 3 compatible style

* changes except and raise statement to python 3 compatible style

* changes except and raise statement to python 3 compatible style

* changes except and raise statement to python 3 compatible style

* changes except and raise statement to python 3 compatible style

* changes except and raise statement to python 3 compatible style

* changes except and raise statement to python 3 compatible style

* changes except and raise statement to python 3 compatible style

* changes except and raise statement to python 3 compatible style

* changes except and raise statement to python 3 compatible style

* changes except and raise statement to python 3 compatible style

* changes except and raise statement to python 3 compatible style

* changes except and raise statement to python 3 compatible style

* changes except and raise statement to python 3 compatible style

* changes except and raise statement to python 3 compatible style

* changes except and raise statement to python 3 compatible style

* changes except and raise statement to python 3 compatible style

* changes except and raise statement to python 3 compatible style

* changes except and raise statement to python 3 compatible style

* changes except and raise statement to python 3 compatible style

* changes except and raise statement to python 3 compatible style

* changes except and raise statement to python 3 compatible style

* changes except and raise statement to python 3 compatible style

* changes except and raise statement to python 3 compatible style

* changes except and raise statement to python 3 compatible style

* changes except and raise statement to python 3 compatible style

* changes except and raise statement to python 3 compatible style

* changes except and raise statement to python 3 compatible style

* changes except and raise statement to python 3 compatible style

* changes except and raise statement to python 3 compatible style

* changes except and raise statement to python 3 compatible style

* changes except and raise statement to python 3 compatible style

* changes except and raise statement to python 3 compatible style

* changes except and raise statement to python 3 compatible style

* changes except and raise statement to python 3 compatible style

* changes except and raise statement to python 3 compatible style

* changes except and raise statement to python 3 compatible style

* changes except and raise statement to python 3 compatible style

* adds six.reraise to fix python 3 style raise statements with traceback

* fixes indentation
 2017-05-11 10:51:59 +05:30
Rushabh Mehta
62f0480117 [rename] frappe.www.print to frappe.www.printview 2017-05-03 15:59:24 +05:30
Rushabh Mehta
6962962211 [fix] contact us to create communication and blog list 2017-03-02 13:06:45 +05:30
Rushabh Mehta
75855de5bb [minor] fixes to web form, listview, add portal items via hooks 2017-02-28 17:49:45 +05:30
Makarand Bauskar
e422e16953 [WIP] Feedback Triggers (#2643) 
* [wip] feedback

* [WIP] Feedback Trigger, Feedback Request, Feedback & Rating Timeline and Form Sidebar

* [minor] minor fixes in feedback trigger

* [Test Cases] Test Cases for Feedback Trigger

* [minor] replaced sql_list by get_all changed the button label

* [minor] removed whitespaces, fixed spelling mistakes
 2017-02-02 15:15:23 +05:30
Rushabh Mehta
bfa938ff17 [web-forms] mandatory fields must updated before payment, customize list for webform and other fixes 2016-09-28 15:08:10 +05:30
Rushabh Mehta
7f77139774 [fix] minor date-format 2016-09-26 17:56:38 +05:30
Rushabh Mehta
541d8be95f [complete] auto email report 2016-09-14 12:00:52 +05:30
Rushabh Mehta
ede3a8ca05 [fix] get_visible_columns in jinja.py 2016-08-24 18:45:29 +05:30
Rushabh Mehta
7ed7245564 [fix] tests 2016-08-24 12:04:30 +05:30
Rushabh Mehta
c034750708 [fix] for building help 2016-08-23 18:10:00 +05:30
Rushabh Mehta
8a32adcaf8 [command] bench setup-help will make the help db 2016-08-23 17:53:38 +05:30
Dony Sukardi
2dedc9a3de Fix for Documentation 
The following issues are addressed in this commit:
- Synchronize CSS with the layout changes in Docs
- Hide 'Shopping Cart' on Docs pages
- Load Frappe context for Jinja
- Fix for 'Improve this page' link
- Get title for ToC from .md files
- Fix for non-pages child routes
 2016-07-12 03:16:05 +08:00
Rushabh Mehta
349a65402f [website] fixes for generating docs 2016-06-23 18:22:03 +05:30
Rushabh Mehta
0cb31006e5 [redesign] website route is evaluated on request, no cold start 2016-06-23 12:23:37 +05:30
Rushabh Mehta
620b2f82b3 [minor] get_gravatar in templates to not query and show 2016-06-08 16:03:56 +05:30
Rushabh Mehta
b902d1e8cc [enhancements] now can {% include %} in page js files and also write jinja like tags in js templates 2016-04-21 19:00:07 +05:30
Rushabh Mehta
b6262c1639 [modules] [redesign] 2016-03-16 11:17:30 +05:30
Rushabh Mehta
eb399f74bd [enhancement] desktop icons, completed modules setup and test cases 2016-03-16 11:17:29 +05:30
Anand Doshi
353e8a9d1f [fix] Sanitize form_dict and doc values to prevent XSS 2016-02-23 12:11:28 +05:30
Anand Doshi
cb7f638255 [hotfix] dev_server = 1 2016-02-08 19:09:55 +05:30
Rushabh Mehta
38ac775bd6 [cleanup] added frappe.utils.jinja.validate_template 2016-02-08 14:50:19 +05:30
Rushabh Mehta
45048ac41a [realtime] ability to get socket working in website, now_datetime should not be timezone aware and web-form properties should take preceedence 2016-01-27 12:26:21 +05:30