Jannat Patel
fa8c62ea0c
fix: formatting
3 年之前
Jannat Patel
2e4f03de3b
fix: pass currency to razorpay checkout
3 年之前
mergify[bot]
af19ecbca4
Merge pull request #16602 from resilient-tech/int-req
refactor: Integration Request
3 年之前
Rucha Mahabal
70d63dcddf
fix: `frappe.log_error` arguments while capturing razorpay payment failures
3 年之前
Sagar Vora
7aefcbd2fa
refactor: Integration Request
3 年之前
Suraj Shetty
dd9c4d4f1e
style: format all python files using black ( #16453 )
Co-authored-by: Frappe Bot <developers@frappe.io>
3 年之前
ChillarAnand
5926b36855
refactor: Clean up whitespace & add CI check
3 年之前
Ritwik Puri
2101a4e98d
fix: revert gateway_settings and gateway_controller as non mandatory fields in payment gateway doctype ( #15729 )
3 年之前
phot0n
792d801972
fix: permissions for payment gateway doctype
3 年之前
Manuel
5b921db107
Merge branch 'frappe:develop' into develop
3 年之前
Shridhar Patil
0301ef6d61
fix: Missing save doc.
3 年之前
Manuel
7923e5e990
Merge branch 'frappe:develop' into develop
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 年之前
Manuel
a2c01fe7cd
Merge branch 'frappe:develop' into develop
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 年之前
Manuel
0b62fb84b1
Merge branch 'frappe:develop' into develop
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 年之前
mtraeber
cb33be2c27
Merge branch 'develop' of https://github.com/frappe/frappe into develop
4 年之前
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 年之前