Commit graph

104 commits

Author SHA1 Message Date
Shivam Mishra
2328fe5aa3 style: linting fixes from sider 2020-05-20 19:07:05 +05:30
Faris Ansari
2f5ff98240 fix: web_blocks global method to render web blocks 2020-05-20 16:35:23 +05:30
Faris Ansari
7a87be29c4 fix: Remove components
- Use render_template to render web_block and image_with_blur
2020-05-11 16:28:29 +05:30
Faris Ansari
42586041c1 fix: Remove unnecessary error handling 2020-04-25 20:50:57 +05:30
Faris Ansari
77281c6207 fix: tests 2020-04-25 00:43:31 +05:30
Faris Ansari
caa068932c Merge branch 'develop' of https://github.com/frappe/frappe into page-builder-tailwind 2020-04-24 23:48:29 +05:30
Faris Ansari
5ea86c6454 fix: Use Web Page Block for Navbar and Footer
- Add more Web Templates
2020-04-19 16:19:02 +05:30
Faris Ansari
2431767fdf feat: Page Builder based on Tailwind
- Website Theme based on: Bootstrap 4, Tailwind
- Web Page: Page Builder
- Web Template: Create templates for web pages
- Added some common Web Templates
- Components: Standard components directly usable in Jinja
- Purge Tailwind Classes in Production
- PostCSS Config to support tailwind
2020-04-18 15:02:56 +05:30
Rushabh Mehta
e323441c15 feat: Add Web View to compose webpages with components 2020-04-15 23:12:57 +05:30
Sagar Vora
fb02908219 fix: (re)allow custom filters/methods to be used with jinja 2019-12-30 10:57:30 +05:30
Rushabh Mehta
9d615f7f12 fix(security): use restricted python 2019-10-11 14:16:49 +05:30
Rushabh Mehta
6d6f575904 feat(server scripts): add server scripts! 2019-10-11 14:16:49 +05:30
Aditya Hase
472d33f3da fix(security): Make Jinja Tighter 2019-07-30 12:51:45 +05:30
Aditya Hase
fb896a460e Revert "fix(security): Make jinja rendering tighter"
This reverts commit b30199b7f5.
2019-07-26 20:49:56 +05:30
Aditya Hase
b30199b7f5 fix(security): Make jinja rendering tighter 2019-07-24 16:32:35 +05:30
Rushabh Mehta
03b045a5b5 refactor: remove autodocs, no longer used 2019-05-11 10:12:11 +05:30
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