Commit graph

691 commits

Author SHA1 Message Date
Rushabh Mehta
683bafef6b Merge pull request #4053 from rmehta/contact-us-settings
Contact Us Settings
2017-09-06 10:47:19 +05:30
Rushabh Mehta
faee27f773 [fix] [translation] switch to desk, #3328 2017-09-04 22:26:12 +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
Rushabh Mehta
2ab07f4275 [feature] autoname prompt, refactor control.js, fixes frappe/erpnext#8940 2017-08-24 18:35:07 +05:30
Rushabh Mehta
19e9834850 [added] print style 2017-08-17 18:34:14 +05:30
mbauskar
8c5656b99d Merge branch 'master' into develop 2017-08-14 12:31:52 +05:30
Faris Ansari
4f61e875f2 [hotfix] Website theme 2017-08-14 11:08:16 +05:30
Aditya Hase
e324406c8a Import six.moves.urllib.parse.urlencode instead of urllib.urlencode 2017-08-11 00:38:26 +05:30
mbauskar
81c75602f2 Merge branch 'master' into develop 2017-08-09 11:16:16 +05:30
Makarand Bauskar
6298446be8 [hotfix] encode title and content field for global search (#3881) 2017-08-09 11:01:07 +05:30
Rushabh Mehta
bc4d46a362 [fix] style and move setup to system settings 2017-08-08 14:29:22 +05:30
Aditya Hase
62bb03ef6e Replaced Python 2 print syntax with Python 3 syntax (#3838)
* Replaced Python 2 print syntax with Python 3 syntax

* Update utils.py
2017-08-02 17:10:40 +05:30
Aditya Hase
9d7d384a63 Replaced urllib.quote imports with six.moves.urllib.parse.quote (#3837) 2017-08-02 17:09:16 +05:30
Aditya Hase
e6bd1e4995 Replaced all instances of 'unicode' with 'six.text_type' (#3825) 2017-08-02 16:57:39 +05:30
Rushabh Mehta
8f2b001bd0 [docs] add headings 2017-07-31 16:21:13 +05:30
Rushabh Mehta
df66dfe941 [fix] render.py for home 2017-07-28 15:16:24 +05:30
Rushabh Mehta
50d06d1202 [minor] sitemap.xml is also programmable 2017-07-28 14:42:14 +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
Rushabh Mehta
f5b975305d [regional] ability to load country-wise js for forms 2017-06-27 17:30:50 +05:30
Manas Solanki
bb7cfda345 Success message and redirect url should also work for 'login require' types webforms
fixes https://github.com/frappe/erpnext/issues/9073
2017-06-21 18:37:52 +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
rohitwaghchaure
0a12f631ef [fix] User not able to access the print format from the browser view (#3339) 2017-05-19 11:09:43 +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
Makarand Bauskar
f26fa3816a [minor] fixed UnicodeEncode error for item name (#3321)
* [minor] fixed UnicodeEncode error for item name

* Update router.py
2017-05-18 12:05:22 +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
974559cef1 [minor] start file watcher only in developer mode 2017-05-09 18:04:12 +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
Rushabh Mehta
89895718b2 [fix] invalid login, #3060 2017-04-12 12:21:13 +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
Rushabh Mehta
3076b2cc7a [fix] frappe.ready 2017-03-31 16:36:33 +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