Saurabh
52d1e7300b
[fix] generate token while initiating razorpay payment and accept payment against the token. do not pass payment arguments in url, user can modify payment parameters ( #4269 )
2017-10-06 17:23:12 +05:30
Aditya Hase
769338f136
Replaced all instances of basestring with six.string_types
2017-08-11 00:10:11 +05:30
Rushabh Mehta
b6ac024576
[style] make payment pages standard ( #3655 )
2017-07-11 10:56:01 +05:30
Nabin Hait
d6654f4fe3
Fixed merge conflict
2017-05-18 14:03:14 +05:30
Alchez
47321e4821
[Minor] Fixed unclosed h2 tag ( #3267 )
2017-05-11 15:39:25 +05:30
Saurabh
286b79bd90
Stripe payment integration ( #2867 )
...
* [fix] setting page for stripe
* checkout flow for stripe payment
* controller to handle stripe checkout and authorization
2017-04-06 17:27:23 +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
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
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
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
7101066f1f
[fixes] for razorpay
2016-10-04 16:11:16 +05:30
Saurabh
25015aba96
[minor][fix] erpnext-logo on rzorpay dialogue
2016-09-30 18:23:33 +05:30
Saurabh
18c62f0470
Integration broker ( #1968 )
...
* [enhancement] integration borker and controller
* [minor][fix] parameter naming changes
* [fix] common scheduler for integration service
* [fix] integrations
* [patch] patch to move payment gateway in Integration Service
* [fix] add payment success, cancel and failuer handling pages
* [enhancment] dropbox integration merged in integration services
* provision to add custom parameters
* [fixes] patch fix to setup dropbox settings
* [fixes] removed dropbox backup, api usage note for paypal and razorpay
* [minor][fix] deprecate service events
* [fix] return type fix for checkout urls
* [fix] add custom settings via patch for dropbox backup frequency
* [fix] remove gride editting
* [enhance] ldap based login
* [enhance] login via ldap credentails
* [commit] remove parameter table, save params as json dict
2016-09-09 11:15:18 +05:30
Anand Doshi
87da8abd6a
[feature] robots.txt - uses Website Settings or frappe.local.conf.robots_txt (file path)
2016-06-29 13:25:43 +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
f81632b9d9
[redesign] removed website statics, www served like templates/pages
2016-06-23 10:54:31 +05:30
Rushabh Mehta
9d8812e15b
[minor] send standard print format if the name is old
2016-06-22 11:21:43 +05:30
Anand Doshi
8d18bc484e
[fix] show password strenght indicator in update password page
2016-06-16 17:42:07 +05:30
Anand Doshi
831c3021f3
[fix] letterhead and background-image url in pdf
2016-06-13 18:50:41 +05:30
Rushabh Mehta
6824df7ac9
[cleanup] rename functions in website and router for cleaner meaning
2016-05-29 14:25:49 +05:30
Rushabh Mehta
4808df2a1f
[am] set __unedited only if added via grid
2016-05-23 11:28:55 +05:30
Rushabh Mehta
3eb8634904
[cleanup] website / portal css
2016-05-20 16:36:38 +05:30
Rushabh Mehta
701732b687
[fix] block module fix and quick entry for name
2016-05-13 17:32:00 +05:30
Kanchan Chauhan
eeb7da7c05
Blog webpages cleanup
2016-05-04 23:13:22 +05:30
Kanchan Chauhan
6b366d9ab9
Website makeover
2016-05-02 12:03:29 +05:30
Kanchan Chauhan
f5f6c36e12
[Minor] Social Logins fixed
2016-04-27 12:35:10 +05:30
Anand Doshi
9c5e1199de
[css] cleanup + moved products and homepage to erpnext + [fix] get_js
2016-04-22 18:52:47 +05:30
Kanchan Chauhan
0e0789ae00
Website Changes
2016-04-22 17:46:48 +05:30
Anand Doshi
bc4ab6bb71
[feature] Redirect to message page with a detailed message
2016-04-21 20:42:11 +05:30
Rushabh Mehta
ba8416054c
[fix] full width for pages with sidebar
2016-04-21 14:17:55 +05:30
Rushabh Mehta
e9847476d1
[cleanup] [web] styles
2016-04-21 13:10:33 +05:30
Kanchan Chauhan
1e7ddf4404
Changes 3
2016-04-20 16:23:09 +05:30
Kanchan Chauhan
b1b3c17b2d
Changes 2
2016-04-20 16:23:09 +05:30
Kanchan Chauhan
ca4c64fd8a
Changes
2016-04-20 16:23:09 +05:30
Kanchan Chauhan
110ec335b8
[WIP] Do not merge
2016-04-20 16:23:09 +05:30
rohit waghchaure
5c2e978b4a
[Fixes] User Image not displaying in top right section
2016-04-06 18:02:54 +05:30
Rushabh Mehta
91d93fef48
Merge pull request #1663 from rohitwaghchaure/new_rfq
...
[Fix] If first time login then create customer
2016-04-01 11:09:57 +05:30
Rushabh Mehta
9b0431e715
[fix] list quotes
2016-03-31 13:04:27 +05:30
rohitwaghchaure
76f312a478
[Fix] If first time login then create customer
2016-03-30 18:10:17 +05:30
Rushabh Mehta
123842ffda
[enhancement] edit-profile in frappe
2016-03-30 17:15:03 +05:30
Rushabh Mehta
ca3c143e5b
[fix] portal menu items for links
2016-03-30 15:05:20 +05:30
Rushabh Mehta
171f5070c3
[fix] doc for webform list view
2016-03-30 14:54:30 +05:30
Rushabh Mehta
dacaa7ab0c
[enhancement] portal settings for portal menu
2016-03-30 12:28:55 +05:30
Anand Doshi
e5718e372b
[fix] load google fonts over https. Fixes frappe/erpnext#5049
2016-03-23 19:46:14 +05:30
Rushabh Mehta
b3d942e3d5
[fixes] cleanup pull requests, allow printing of drafts by default
2016-03-23 13:18:25 +05:30
Anand Doshi
8655194362
[fix] report pdf always in landscape
2016-03-07 19:16:43 +05:30
Rushabh Mehta
d0c2e57e1f
[translation] moved Translation DocType from erpnext
2016-03-02 14:50:11 +05:30
Javier Wong
1743d1c5e5
Merge pull request #3 from frappe/develop
...
1/3/2016 Merge
2016-03-01 16:00:23 +08:00
kardmode
f41e48c669
Multi Doc PDF
...
Compile all html into one html
2016-02-28 16:13:29 +04:00
