Shridhar Patil
0301ef6d61
fix: Missing save doc.
3 лет назад
gavin
2ae251ba79
Merge pull request #14112 from gavindsouza/license-fixes
chore: License fixes
3 лет назад
Gavin D'souza
791264a96e
chore: Update header: license.txt => LICENSE
The license.txt file has been replaced with LICENSE for quite a while
now. INAL but it didn't seem accurate to say "hey, checkout license.txt
although there's no such file". Apart from this, there were
inconsistencies in the headers altogether...this change brings
consistency.
3 лет назад
Gavin D'souza
e8f55d9eb8
chore: Update module license header
These modules were imported from the ERPNext codebase into Frappe.
License header was overlooked at that point. These were contributed
initially by Frappe Technologies Pvt Ltd under GPLv3 (ERPNext's license) and now
we, as Frappe Technologies Pvt Ltd converting them to MIT to comply with
Frappe's license.
3 лет назад
conncampbell
8855a75606
Merge branch 'develop' of https://github.com/frappe/frappe into 12928-OTPLoginFix
Conflicts:
frappe/__init__.py
4 лет назад
conncampbell
b8bfbbb61c
Merge remote-tracking branch 'upstream/version-13-hotfix' into 12928-OTPLoginFix
# Conflicts:
# frappe/__init__.py
4 лет назад
gavin
9620ce8e83
Merge pull request #13344 from gavindsouza/drop-py2-code
chore: Dead dependencies and code cleanup
4 лет назад
Gavin D'souza
025f47c7f9
chore: Drop dead and deprecated code
* Remove six for PY2 compatability since our dependencies are not, PY2
is legacy.
* Removed usages of utils from future/past libraries since they are
deprecated. This includes 'from __future__ ...' and 'from past...'
statements.
* Removed compatibility imports for PY2, switched from six imports to
standard library imports.
* Removed utils code blocks that handle operations depending on PY2/3
versions.
* Removed 'from __future__ ...' lines from templates/code generators
* Used PY3 syntaxes in place of PY2 compatible blocks. eg: metaclass
4 лет назад
Suraj Shetty
9027edbef4
Merge branch 'develop' into esbuild
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 лет назад
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 лет назад
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 лет назад