Commit graph

622 commits

Author SHA1 Message Date
Faris Ansari
dd0dfe1231 Allow Page break inside tables 2016-12-27 11:50:17 +05:30
Rushabh Mehta
e82e22640a [fix] web form fixes for job opening 2016-12-19 17:05:30 +05:30
khatrijitendra
d31aa1f41c Make Translation of Options in select field of web form (#2447) 2016-12-13 13:00:30 +05:30
Rushabh Mehta
ca97204bdb [fix] tests + add google analytics id in docs 2016-12-09 16:39:38 +05:30
Rushabh Mehta
2bf66a6bcb [fix] blog links inside blog post 2016-12-09 16:14:36 +05:30
Rushabh Mehta
889079504c Blog fixes (#2437)
* [minor] update fetch field only if null

* [fix] blog filtering, titles etc
2016-12-09 15:59:05 +05:30
Rushabh Mehta
3eb4266aae [minor] cleanup style of comments (#2425) 2016-12-07 11:31:22 +05:30
khatrijitendra
9a44a83117 Make Translation for introduction in web form (#2420) 2016-12-07 11:30:19 +05:30
Rushabh Mehta
14586e7450 [minor] fontawesome icons 2016-12-07 11:09:23 +05:30
Nabin Hait
9af61bbe79 Merge pull request #2388 from rmehta/merge-kb
[feature] merge knowledge base in Frappe, fixes frappe/erpnext#6030
2016-12-05 14:42:31 +05:30
Rushabh Mehta
7bc7e3bc63 Upgrade Font Awesome (#2410)
* Font-Awesome V3.x to V4.x

Font-Awesome V3.x to V4.x

* Font Tidy

Font Tidy

* FA4 Upgrade - Html Js & Json

FA4 Upgrade - Html Js & Json

* Minor

Minor
2016-12-05 13:07:03 +05:30
Rushabh Mehta
2a8902326d [feature] merge knowledge base in Frappe, fixes frappe/erpnext#6030" 2016-11-28 17:26:53 +05:30
Saurabh
3952338b73 [urgent][fix] convert use_sandbox param to integer to avoid false data sandboxing (#2384) 2016-11-28 12:37:33 +05:30
Rushabh Mehta
7c8652fbf2 [docs] added some style and some fixes (#2352) 2016-11-22 10:55:32 +05:30
Rushabh Mehta
3c7c17215d [fix] fix toc for docs, url for local and other fixes #2293 (#2346) 2016-11-21 16:43:16 +05:30
Rushabh Mehta
819983a7b6 Merge branch 'master' into develop 2016-11-16 11:20:42 +05:30
Rushabh Mehta
cf81fe25b0 [fix] ux for web forms that dont require login, fixes #2266 (#2322) 2016-11-16 11:08:09 +05:30
shubhamgupta123
b4859162f3 [Fix] Footer Address not showing in website (#2287)
* Fix for Footer Address not showing in website

This is a probable fix for https://github.com/frappe/frappe/issues/2267
Due to earlier condition, only either copyright or the footer address was showing.
This is my first pull request. Kindly merge if everything seems right.

* [Fix] Formatting for the footer address
2016-11-11 17:05:26 +05:30
Saurabh
9ff094d8de [fix] paypal sandboxing to test dummy payments (#2281)
* [fix] paypal sandboxing to test dummy payments

* [fix] sandbox testing for razorpay
2016-11-10 09:58:56 +05:30
pratu16x7
edf4fcb522 Reorganise footer links 2016-11-05 15:48:50 +05:30
KanchanChauhan
267b3bb0cc [WIP] Option to align field in Print Format Builder (#2109) 2016-10-25 11:26:04 +05:30
Revant Nandgaonkar
d48b270bf5 OAuth 2 Provider for frappe (#2167)
* OAuth 2.0 Classes Added

Added oauthlib in requirement.txt
Added class WebApplicationServer for Authorization code grant and Bearer tokens.
Added class OAuthWebRequestValidator for Validating Oauth Request for Web Application

* copied code from mnt_oauth needs review

* [New] OAuth2 Doctypes and endpoints added

Integrations > OAuth Provider Settings
Integration Broker > OAuth Bearer Token
Integration Broker > OAuth Authorization Code
Integration Broker > OAuth Client
endpoints for authorize, approve, get_token, revoke_token and test_resource

* oauth2.py: renamed skipauth to skip_auth

* [Fix] Parse URL instead of storing it in settings

* [Fix] get skip_auth from OAuth Provider Settings

* Success URL format. Failure URL added. Confirmation dialog layout changed.

* Validate access token if passed during use of REST API

* OAuth Confirmation colours fixed

* Multiple Changes

Added links for OAuth under Integrations in Module list.
Updated permissions on OAuth doctypes.
Updated layout of OAuth Client doctype.

* [Docs] Integrations > How to setup OAuth

* [Docs] Integration > Using OAuth

* [Fix] get_token endpoint must to handle POST request

* [Fix] http verbs and responses for OAuth 2.0 Endpoints

* [Fix] accept oauth2 access_token from headers

* Removed unused imports from api.py
2016-10-25 10:28:32 +05:30
Rushabh Mehta
b8b2811aa6 [minor] 2016-10-18 14:23:06 +05:30
Rushabh Mehta
ecfb630246 [minor] print format in web form 2016-10-12 14:12:41 +05:30
Rushabh Mehta
a9b1139040 [fix] [web-form] 2016-10-11 15:07:21 +05:30
Rushabh Mehta
538d8e3d2d [web-form] validate in server before saving 2016-10-11 14:26:22 +05:30
Rushabh Mehta
d2db71f8c4 [fixes] serverside validation in web form 2016-10-11 11:44:22 +05:30
Saurabh
205ae26751 [fix] refactor integration services (#2087)
* [fix] refactor integration services

* [fix] patch fix

* [fix] added redirect url.

* [fix] custom redirect to and reditect message for paypal and service setup information

* [minor][fix] remove ldap dependancy from requirements
2016-10-10 17:16:21 +05:30
Rushabh Mehta
87b3816cf4 [fixes] print format cleanup, options for alignment and print from web form (#2159)
* [fixes] print format cleanup, options for alignment and print from web form

* [print-format] select module for export
2016-10-10 16:16:52 +05:30
Rushabh Mehta
9d7ee83c5e [refactor] scheduler log is now error log and as MyISAM (commit not required) (#2152)
* [refactor] scheduler log is now error log

* [minor] new naming series

* [fix] engine

* [fix] saved by tests
2016-10-06 17:17:55 +05:30
Rushabh Mehta
290897f849 [minor] wait for razorpay to complete the payment 2016-10-06 11:07:06 +05:30
Rushabh Mehta
4db2561a8b [fix] web form attachments 2016-10-05 17:49:28 +05:30
Rushabh Mehta
4dc37d216f [style] for web forms 2016-10-05 17:25:48 +05:30
Rushabh Mehta
930fc9a803 [fix] web form mandatory attachment before payment 2016-10-04 23:44:36 +05:30
Nabin Hait
41c3e7bb25 Fixed version conflict 2016-10-04 17:43:50 +05:30
Rushabh Mehta
7101066f1f [fixes] for razorpay 2016-10-04 16:11:16 +05:30
Faris Ansari
7bf3e4857e [fix] image size in print format 2016-10-04 13:15:19 +05:30
Rushabh Mehta
796f7b0214 [fix] web form and ctrl+enter in quick entry 2016-10-04 12:22:06 +05:30
Nabin Hait
7801912638 Fixed version conflict 2016-10-03 18:07:14 +05:30
Rushabh Mehta
e2778c350c [web-sidebar] fixes to permissions 2016-10-03 17:29:08 +05:30
Faris Ansari
78f5008f09 [fix] modern print format 2016-10-03 17:13:05 +05:30
Rushabh Mehta
9353303be6 Exporting Customizations docs and other minor fixes (#2136)
* [fix] email alert in sync

* [fixes] web form mandatory and docs for exporting customizations
2016-10-03 12:18:57 +05:30
Saurabh
25015aba96 [minor][fix] erpnext-logo on rzorpay dialogue 2016-09-30 18:23:33 +05:30
Rushabh Mehta
f0b691156a [web-form] [fixes] mandatory fixes and max attachment size 2016-09-30 18:16:20 +05:30
Nabin Hait
b2ca70a779 Fixed version conflict 2016-09-29 14:08:05 +05:30
gaurav-naik
7e57005894 Allow control over loading scripts in base.
Some control over how base scripts are loaded would be helpful. Faced issue while integrating summernote within web page.
https://github.com/summernote/summernote/issues/138

For now, we have overridden base.html in custom app.
2016-09-29 13:21:06 +05:30
Rushabh Mehta
04aaa92a75 [web-forms] style fixes 2016-09-29 12:53:40 +05:30
Rushabh Mehta
f1dd0c0bb8 [fix] web forms remove attachment 2016-09-29 12:38:46 +05:30
Rushabh Mehta
5c110bd48f [fix] date parsing and formatting in web form 2016-09-28 18:19:19 +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