Commit graph

403 commits

Author SHA1 Message Date
Saurabh
20fff6e874 Merge branch 'master' into develop 2017-11-22 18:02:53 +05:30
Revant Nandgaonkar
387a3ad9e3 [Fix] Breadcrumbs for Help Article (#4515) 2017-11-21 16:01:06 +05:30
paurosello
b8723e72da Allow label and description translation in web forms (#4481) 2017-11-14 10:48:03 +05:30
Britlog
529ae92d1e Encoding error on web form rendering (#4418) 2017-11-03 09:41:43 +05:30
Rushabh Mehta
69e08f8e97 [minor] web form (#4302) 2017-10-17 12:24:06 +05:30
Makarand Bauskar
91a6c5b246 [minor] create __init__ file, passed create_init=True explicitly (#4265) 2017-10-09 13:17:03 +05:30
Makarand Bauskar
36a0782564 [minor] moved the Website Name field to top (#4258) 2017-10-06 11:48:13 +05:30
Aditya Hase
1a0eaa4aaa Convert rendered html to unicode before substring matching 2017-09-27 01:08:07 +05:30
Rushabh Mehta
adc7ad69cd [fix] desktop notifications 2017-09-25 11:06:54 +05:30
Rushabh Mehta
cef8c6be38 [minor] web_page, allow any tags 2017-09-24 20:59:11 +05:30
Rushabh Mehta
1ee6ff1009 [fix] for blog 2017-09-24 20:54:28 +05:30
Rushabh Mehta
a52d927e28 [fix] for blog 2017-09-24 20:51:29 +05:30
Rushabh Mehta
52936f724e [fix] cleanup style for blog listings 2017-09-24 12:05:23 +05:30
mbauskar
9d2985e38c [minor] images attached to website slideshow should be public 2017-09-18 11:57:44 +05:30
Saurabh
287d7dc2c6 Merge branch 'master' into develop 2017-09-16 11:54:28 +05:30
Saurabh
607806e74f [fix] set default role specified in Portal Settings while signup as website user 2017-09-14 17:12:47 +05:30
Manas Solanki
f9988fafe9 don't route to success message for the website user 2017-09-13 18:59:52 +05:30
Rushabh Mehta
a5b74ba3bc [fix] add phone, email, skype in contact us, fixes frappe/erpnext#1226 2017-09-04 21:46:37 +05:30
Rushabh Mehta
664adb470c [fix] add phone, email, skype in contact us, fixes frappe/erpnext#1226 2017-09-04 21:46:28 +05:30
Rushabh Mehta
1c75167f65 [fix] refactor website_settings, fixes frappe/erpnet#8949 2017-08-31 13:39:09 +05:30
Aditya Hase
e324406c8a Import six.moves.urllib.parse.urlencode instead of urllib.urlencode 2017-08-11 00:38:26 +05:30
Aditya Hase
9d7d384a63 Replaced urllib.quote imports with six.moves.urllib.parse.quote (#3837) 2017-08-02 17:09:16 +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
Britlog
6d1c652cfe Blog breadcrumbs (#3646)
* Blog breadcrumbs

* Update blog_post.py

* Update blog_post.py
2017-07-10 12:59:04 +05:30
Nabin Hait
d366bde7c1 Escape success message (#3644) 2017-07-08 19:33:58 +05:30
Nabin Hait
698e2d8c69 Escaped success msg in web form. Fixes frappe/erpnext#9729 (#3643) 2017-07-08 13:53:00 +05:30
Rushabh Mehta
a9a33434b6 [minor] website_sidebar will pull sidebar for any website page 2017-07-07 10:45:47 +05:30
Britlog
242317c8d4 Breadcrumbs management (#3588) 2017-07-03 12:31:55 +05:30
Alex Ford
78c03b90c3 lgtm minor fixes (#3580)
* Replace a typeof test against undefined with comparison against a string

* Add rel='noopener noreferrer' attributes to target='_blank' links

* Remove a duplicate object property definition

* Remove superfluous argument to function call

* Remove some variable declarations for which the assigned value is never read

* Remove an assignment to a variable that is never read
2017-07-03 12:25:07 +05:30
tundebabzy
bbde2ec4cf rewrite use of dict.iteritems (#3498)
* dict.iteritems to six.iteritems(dict) for python3 compatibility

* dict.iteritems to six.iteritems(dict) for python3 compatibility

* dict.iteritems to six.iteritems(dict) for python3 compatibility

* dict.iteritems to six.iteritems(dict) for python3 compatibility

* dict.iteritems to six.iteritems(dict) for python3 compatibility

* dict.iteritems to six.iteritems(dict) for python3 compatibility

* dict.iteritems to six.iteritems(dict) for python3 compatibility

* dict.iteritems to six.iteritems(dict) for python3 compatibility

* dict.iteritems to six.iteritems(dict) for python3 compatibility

* dict.iteritems to six.iteritems(dict) for python3 compatibility

* dict.iteritems to six.iteritems(dict) for python3 compatibility

* dict.iteritems to six.iteritems(dict) for python3 compatibility

* dict.iteritems to six.iteritems(dict) for python3 compatibility

* dict.iteritems to six.iteritems(dict) for python3 compatibility

* dict.iteritems to six.iteritems(dict) for python3 compatibility

* dict.iteritems to six.iteritems(dict) for python3 compatibility

* dict.iteritems to six.iteritems(dict) for python3 compatibility

* dict.iteritems to six.iteritems(dict) for python3 compatibility

* dict.iteritems to six.iteritems(dict) for python3 compatibility

* dict.iteritems to six.iteritems(dict) for python3 compatibility

* dict.iteritems to six.iteritems(dict) for python3 compatibility

* dict.iteritems to six.iteritems(dict) for python3 compatibility
2017-06-19 09:10:21 +05:30
tundebabzy
702e52e665 Change raise syntax to python 3 compatible style (#3497)
* python 3 compatible raise statement

* python 3 compatible raise statement

* python 3 compatible raise statement

* python 3 compatible raise statement

* python 3 compatible raise statement

* python 3 compatible raise statement

* python 3 compatible raise statement

* python 3 compatible raise statement

* python 3 compatible raise statement

* python 3 compatible raise statement

* python 3 compatible raise statement

* python 3 compatible raise statement
2017-06-19 09:07:19 +05:30
Charles-Henri Decultot
21d720923e Make 'By' translatable in blog posts (#3450) 2017-06-09 17:01:08 +05:30
Faris Ansari
e1b243996a Added files in .eslintignore, updated globals 2017-06-02 15:00:15 +05:30
Faris Ansari
2a3b34822b Remove all implicit global variables 2017-06-02 15:00:14 +05:30
Faris Ansari
760bfc1260 Cascade bootstrap css instead of replacing 2017-05-31 15:26:36 +05:30
Rushabh Mehta
0fbaf93f89 [fix] set title_prefix if set in website settings, fixes frappe/erpnext#4848 (#3294)
* [fix] set title_prefix if set in website settings, fixes frappe/erpnext#4848

* Update context.py
2017-05-18 12:21:03 +05:30
Neil Trini Lasrado
c4e8ac47f6 Changed Introduction feild type to text editor (#3297) 2017-05-18 12:12:28 +05:30
Rushabh Mehta
62f0480117 [rename] frappe.www.print to frappe.www.printview 2017-05-03 15:59:24 +05:30
tundebabzy
7b41d7e5eb Python 3 compatible print statements (#3199)
* changes print statements in file to python 3 compatible style using `__future__`

* adds python 3 style for print statements

* adds python 3 style for print statements

* adds python 3 style for print statements

* adds python 3 style for print statements

* adds python 3 style for print statements

* adds python 3 style for print statements

* adds python 3 style for print statements

* adds python 3 style for print statements

* adds python 3 style for print statements

* adds python 3 style for print statements

* adds python 3 style for print statements

* adds python 3 style for print statements

* adds python 3 style for print statements

* adds python 3 style for print statements

* adds python 3 style for print statements

* adds python 3 style for print statements

* adds python 3 style for print statements

* adds python 3 style for print statements

* adds python 3 style for print statements

* adds python 3 style for print statements

* adds python 3 style for print statements

* adds python 3 style for print statements

* adds python 3 style for print statements

* adds python 3 style for print statements

* adds python 3 style for print statements

* adds python 3 style for print statements

* adds python 3 style for print statements

* adds python 3 style for print statements

* adds python 3 style for print statements

* adds python 3 style for print statements

* adds python 3 style for print statements

* adds python 3 style for print statements

* changes deprecated md5 module to hashlib

* adds python 3 style for print statements

* adds python 3 style for print statements

* adds python 3 style for print statements

* adds python 3 style for print statements

* adds python 3 style for print statements

* adds python 3 style for print statements

* adds python 3 style for print statements

* adds python 3 style for print statements

* adds python 3 style for print statements

* adds python 3 style for print statements

* adds python 3 style for print statements

* adds python 3 style for print statements

* adds python 3 style for print statements

* adds python 3 style for print statements

* adds python 3 style for print statements
2017-05-01 12:34:29 +05:30
Makarand Bauskar
3e1a794289 [minor] fixed blog list issue and filter blogs by blogger (#3090) 2017-04-13 18:59:01 +05:30
Makarand Bauskar
8cf45d2bb3 [minor] added _ method to safe evel for edit profile page (#3069) 2017-04-12 10:14:03 +05:30
Rushabh Mehta
517374720f [library] frappe.safe_eval, https://github.com/frappe/erpnext/issues/8313 2017-04-06 18:24:05 +05:30
Neil Trini Lasrado
8f89bbc34d Allowed web pages to be imported via data import tool (#2920) 2017-03-27 14:54:42 +05:30
KanchanChauhan
e572768fb8 [Minor] Default label Pay in web form (#2911) 2017-03-23 16:25:30 +05:30
Faris Ansari
cf2211328b show banner image in blog post list (#2905) 2017-03-23 15:01:11 +05:30
robulik
d0a35cd7da [Minor] fix of translatable strings ("No Tags", "Profile") (#2892)
* Slovak translations

* New strings pulled

* Slovak translations for Desktop terms

* Slovak translations'

* Slovak translations

* Slovak translations

* Slovak translations

* Slovak translations

* Quick entry window now with translatable footer notes

* Slovak translation waits for bulk pull request

* Slovak translations

* Slovak translations

* Slovak translations

* Slovak translations

* Button Make a new {0} in list view - which is already translated string

* Translatable strings 'No Tags' and 'Profile'

* Minor fix of translatable strings (No Tags, Profile)

* [fix] translations for strings in templates
2017-03-23 14:52:18 +05:30
Saurabh
7620bb3789 Deprecate Integration Broker (#2831)
* [fix] remove razorpay from integration service

* [fix] clean-up js side integration service dependancies

* [fix] remove integration service, .py cleanup, move integration request to integration

* [fix] move oauth to integrations and deprecate integration broker

* [fix] mark services enabled and update integrations listing

* [fix] V7.1 and V7.2 integration service related pathch fixes and move payment gateway dotype to core module

* [fix] create payment gateway records if not exists

* [fix] module page for integrations

* [minor][fix] minor checks

* [fix] remove integration broker module only if not allocated to any doctype
2017-03-14 11:24:26 +05:30
Rushabh Mehta
27312e2129 [minor] allow float in amount 2017-03-08 11:16:04 +05:30
Rushabh Mehta
1e7229c45f [enhance] global search in website (#2810)
* [enhance] global search in website

* [fix] create table query

* [website] navbar search in header if set

* [minor] navbar_search in website settings
2017-03-07 16:37:50 +05:30
Rushabh Mehta
6962962211 [fix] contact us to create communication and blog list 2017-03-02 13:06:45 +05:30