Suraj Shetty
|
9027edbef4
|
Merge branch 'develop' into esbuild
|
пре 4 година |
mtraeber
|
48374eef3c
|
Merge branch 'develop' of https://github.com/frappe/frappe into develop
|
пре 4 година |
Nabin Hait
|
9933d0baa0
|
Merge branch 'version-13' into develop
|
пре 4 година |
Nabin Hait
|
2dc74f6740
|
Merge branch 'version-13-pre-release' into version-13
|
пре 4 година |
Nabin Hait
|
69e790b01c
|
fix: merge conflict
|
пре 4 година |
mtraeber
|
8c7a6c7b06
|
Merge branch 'develop' of https://github.com/frappe/frappe into develop
|
пре 4 година |
Faris Ansari
|
d5a64924cf
|
Merge remote-tracking branch 'upstream/develop' into esbuild
|
пре 4 година |
Nabin Hait
|
27a425778a
|
fix: Fixed merge conflict
|
пре 4 година |
Faris Ansari
|
bd4d08c788
|
fix: Asset URLs
Helpers to get asset path
Python: frappe.utils.jinja_globals.bundled_asset
JS: frappe.assets.bundled_asset
|
пре 4 година |
Faris Ansari
|
06974dc29f
|
Merge remote-tracking branch 'upstream/develop' into esbuild
|
пре 4 година |
Frappe Bot
|
1d164e4b85
|
refactor: Delete Qunit test files
Since it is no longer used
(cherry picked from commit f78b990486 )
|
пре 4 година |
Frappe Bot
|
1d45cd8f64
|
refactor: Delete Qunit test files
Since it is no longer used
(cherry picked from commit f78b990486 )
|
пре 4 година |
Frappe Bot
|
f78b990486
|
refactor: Delete Qunit test files
Since it is no longer used
|
пре 4 година |
Faris Ansari
|
4773c1ec62
|
fix: Update all /assets urls with new urls
|
пре 4 година |
Nabin Hait
|
3034022d80
|
Merge branch 'version-13-pre-release' into version-13
|
пре 4 година |
Manuel
|
cfddaff347
|
Merge pull request #1 from frappe/develop
merge frappe/develop into LIS-Engineering/develop
|
пре 4 година |
Nabin Hait
|
bc432c86b4
|
fix: Resolved merge conflict
|
пре 4 година |
Mohammad Hasnain Mohsin Rajan
|
ade29ece7c
|
fix: Webform checkout (#12756)
Co-authored-by: Suraj Shetty <13928957+surajshetty3416@users.noreply.github.com>
|
пре 4 година |
Saurabh
|
8b0c7c5122
|
Merge branch 'version-13-pre-release' into version-13
|
пре 4 година |
Suraj Shetty
|
8b0d5dc165
|
Merge branch 'develop' of https://github.com/frappe/frappe into version-13-pre-release
|
пре 4 година |
Shariq Ansari
|
6a1adede4e
|
Merge pull request #1 from frappe/develop
Updating my forked repository with the latest one.
|
пре 4 година |
Suraj Shetty
|
cf1ce3e3da
|
Merge pull request #12277 from frappe/rebrand-ui
|
пре 4 година |
Rushabh Mehta
|
5372351238
|
feat(app): move /desk to /app
|
пре 4 година |
Suraj Shetty
|
54aee8e907
|
Merge branch 'develop' of https://github.com/frappe/frappe into version-13-beta-pre-release
|
пре 4 година |
Shivam Mishra
|
656d1a72d7
|
refactor: don't attach secret to self (#11428)
|
пре 4 година |
Shivam Mishra
|
49b1f12027
|
feat: add init client API
|
пре 4 година |
Saurabh
|
1929247af5
|
Merge branch 'version-13-beta-pre-release' into version-13-beta
|
пре 4 година |
Mangesh-Khairnar
|
b530c04cee
|
Merge pull request #11106 from Mangesh-Khairnar/paytm-integrations
|
пре 4 година |
Mangesh-Khairnar
|
b75528e762
|
fix: minor changes
|
пре 4 година |
Mangesh-Khairnar
|
6b76559d0c
|
fix(paytm-integration): simplify code and remove additional loop
|
пре 4 година |
Mangesh-Khairnar
|
a7b3ae3bc2
|
fix: make the checkout page responsive for mobile view
|
пре 4 година |
Mangesh-Khairnar
|
e636ce9c24
|
fix(paytm-integration): use checksum library to generate/verify checksum
|
пре 4 година |
Mangesh-Khairnar
|
7fc4702bcd
|
fix: update the checksum logic
|
пре 5 година |
Mangesh-Khairnar
|
e46ba0a1b4
|
Merge branch 'develop' of https://github.com/frappe/frappe into paytm-integration
|
пре 5 година |
Mangesh-Khairnar
|
a31cd3a964
|
fix: add docs link to the settings page dashboard
|
пре 5 година |
Shivam Mishra
|
7e70ad4cc4
|
feat: make verification function python 3 only
|
пре 5 година |
Shivam Mishra
|
e00a7284a5
|
style: linting fixes
|
пре 5 година |
Shivam Mishra
|
4bc6899fa0
|
refactor: use six instead of sys.version_info
|
пре 5 година |
Shivam Mishra
|
e98b30ea36
|
feat: added webhook hmac verification
|
пре 5 година |
Mangesh-Khairnar
|
e5834ba5b3
|
chore: remove initial validation check
|
пре 5 година |
Mangesh-Khairnar
|
9cf9839b10
|
fix: add finalize request to complete the transaction
|
пре 5 година |
Mangesh-Khairnar
|
62e182319c
|
fix: change status of integration request on completion
|
пре 5 година |
Mangesh-Khairnar
|
bab8edd5b6
|
fix: check for transaction success in the final stage
|
пре 5 година |
Mangesh-Khairnar
|
3809d5be97
|
feat: add paytm config, transaction status
|
пре 5 година |
Mangesh-Khairnar
|
a4f54c9ea5
|
fix: initiate payment via standard checkout
|
пре 5 година |
Mangesh-Khairnar
|
b9c311f361
|
fix: paytm integration
|
пре 5 година |
Mangesh-Khairnar
|
3d2c2a583b
|
feat: create transaction token
|
пре 5 година |
Mangesh-Khairnar
|
692c54bf3c
|
feat: blink checkout
|
пре 5 година |
Mangesh-Khairnar
|
5c616eb27d
|
feat: paytm integration
|
пре 5 година |
Mangesh-Khairnar
|
8a4169fd0b
|
fix: stripe api payment receipt email
|
пре 5 година |