Commit graph

1776 commits

Author SHA1 Message Date
Suraj Shetty
38efba692d fix: Conditionally set css variables 2021-05-28 08:44:41 +05:30
Gavin D'souza
f94ee120c2 Merge branch 'develop' into website-theme-fixes 2021-05-25 15:24:22 +05:30
prssanna
c551338c0d fix: ensure website theme is applied correctly 2021-05-18 15:41:31 +05:30
Faris Ansari
f8ca990a83 Merge remote-tracking branch 'upstream/develop' into esbuild 2021-05-16 11:26:43 +05:30
Gavin D'souza
e0be2cc535 Merge branch 'develop' into misc-fixes-py3-1 2021-05-12 21:02:26 +05:30
Suraj Shetty
cb6f263001
Merge branch 'develop' into python-distributed-testing 2021-05-12 12:18:50 +05:30
Faris Ansari
d4b0be789f
Merge branch 'develop' into esbuild 2021-05-11 17:33:31 +05:30
Faris Ansari
17928f2d28 fix: Clear web page cache after web template is updated 2021-05-11 15:30:55 +05:30
Gavin D'souza
e7d089d1cb Merge branch 'develop' of github.com:frappe/frappe into misc-fixes-py3-1 2021-05-11 13:03:56 +05:30
Suraj Shetty
be9b18191b refactor: Resolve deprecation warnings 2021-05-11 09:50:58 +05:30
Suraj Shetty
85f6f47edc Merge branch 'develop' of https://github.com/frappe/frappe into python-distributed-testing 2021-05-08 11:27:42 +05:30
Gavin D'souza
d43046a4cb fix: any takes an iterable not multi args 2021-05-07 13:24:48 +05:30
Faris Ansari
add84065ad Merge remote-tracking branch 'upstream/develop' into esbuild 2021-05-07 12:55:04 +05:30
Faris Ansari
55995a9708 test: website theme 2021-05-07 12:53:41 +05:30
Gavin D'souza
1752e5b0e5 feat(cli): Show progress bar for website search index building 2021-05-07 12:14:00 +05:30
Ankush Menat
7933b9c825
chore: replace assertNotEquals with assertNotEqual 2021-05-06 21:23:04 +05:30
gavin
e9d6378e5c
Merge pull request #13129 from gavindsouza/misc-fixes-py3
fix: Misc fixes
2021-05-06 16:54:24 +05:30
Suraj Shetty
b64ca5eb2f test: Fix dependency 2021-05-06 14:52:51 +05:30
Suraj Shetty
ba88b2cdb9 fix: Handle exception 2021-05-06 14:52:32 +05:30
Gavin D'souza
e1c69cecca chore: Update usages of inspect getargspec
Deprecated since version 3.0: Use getfullargspec() for an updated API that is usually a drop-in replacement, but also correctly handles function annotations and keyword-only parameters.

ref: https://docs.python.org/3/library/inspect.html#inspect.getargspec
2021-05-05 18:31:26 +05:30
gavin
7ad99349d9
Merge pull request #13120 from gavindsouza/pddr-levy
perf(PDDR): Replace filter_by like with full text filter
2021-05-05 17:38:54 +05:30
Suraj Shetty
d0a8f9d01f fix: Handle exception 2021-05-05 17:26:32 +05:30
Suraj Shetty
d58191346e test: Fix exception & remove unnecessary test 2021-05-05 16:17:50 +05:30
Suraj Shetty
57166b9964 test: Fix test dependencies 2021-05-05 13:15:52 +05:30
Gavin D'souza
86d6eb51a6 perf: Replace filter_by like with full text filter
* Remove like %email%  in where clause
* Add fallback for all dict getattrs to owner
2021-05-05 11:38:15 +05:30
mergify[bot]
c3f473c451
Merge pull request #12965 from resilient-tech/allow-scroll
fix(UI): dont disable dialog scroll on focusing a Link/Autocomplete field
2021-05-05 05:31:43 +00:00
Faris Ansari
6347d3e6f1 Merge remote-tracking branch 'upstream/develop' into esbuild 2021-05-04 07:13:30 +05:30
Suraj Shetty
5901c77d4e
Merge branch 'develop' into password-field-in-web-form 2021-05-03 13:47:30 +05:30
gavin
42d020683a
Merge pull request #12996 from gavindsouza/pddr-enhancements
feat: Deletion Steps in Data Deletion Tool
2021-05-03 12:23:23 +05:30
Sagar Vora
d6a3621650 fix: remove scrollable behavior 2021-05-03 12:19:30 +05:30
Suraj Shetty
16a8b6f279
Merge branch 'develop' into password-field-in-web-form 2021-05-03 12:12:43 +05:30
Gavin D'souza
c6356b12c0 fix(PDDR): Translation String 2021-05-03 11:42:05 +05:30
codescientist703
9c5ac3a1a4 fix: Added conditional rendering for content field in split section with image template 2021-05-01 19:43:38 +05:30
pateljannat
2f6e722934 fix: added password field in web form 2021-04-30 12:29:02 +05:30
Faris Ansari
e72bb135e1 fix: Asset URLs
Helpers to get asset path
Python: frappe.utils.jinja_globals.bundled_asset
JS: frappe.assets.bundled_asset
2021-04-29 14:47:52 +05:30
Faris Ansari
aac5423600 Merge remote-tracking branch 'upstream/develop' into esbuild 2021-04-29 13:58:27 +05:30
Gavin D'souza
7953896ab5 feat: Deletion Steps in Data Deletion Tool
* Track deletion steps in PDDR
* Option to commit via pddr._anonymize_data
2021-04-29 11:39:31 +05:30
Faris Ansari
3b1cb347ef fix: Include website.bundle.scss when compiling Website Theme 2021-04-29 11:36:18 +05:30
Frappe Bot
d30596b15e refactor: Delete Qunit test files
Since it is no longer used
2021-04-27 21:37:15 +05:30
Faris Ansari
2f10daf562 Merge remote-tracking branch 'upstream/develop' into esbuild 2021-04-24 16:43:06 +05:30
Faris Ansari
34c6d099b1 fix: Update all /assets urls with new urls 2021-04-24 16:24:08 +05:30
Faris Ansari
c119f9ab3c fix: libs.bundle.js
- Separate file to import jquery and bootstrap
- Remove separate jquery bundle from app as well as web
- Load jquery from node_modules
2021-04-24 14:42:43 +05:30
Faris Ansari
c3b087643b fix: Use node.string to extract style and script
- node.text stopped working in beautifulsoup 4.9.x
2021-04-22 23:31:51 +05:30
Faris Ansari
226ad1d91a feat: New Build System based on esbuild
- Deprecate use of build.json
- *.bundle.js files placed anywhere in the public folder are bundled
- Built files are created in public/build folder which is gitignored

WIP
2021-04-22 07:01:36 +05:30
Rohan Bansal
a7794d9f6c Merge remote-tracking branch 'upstream/develop' into feat-py3-dependencies 2021-04-19 12:51:50 +05:30
Rushabh Mehta
0d87ad2133 fix(minor): Add a delete trigger in grid, and use it to refresh labels in Website Settings 2021-04-18 11:58:20 +05:30
Rushabh Mehta
27ed3dd373 fix(minor): linting 2021-04-15 14:31:42 +05:30
Rushabh Mehta
6d20983eb2 fix(minor): Make language select optional and fix breakpoint issues in website 2021-04-15 14:15:40 +05:30
mergify[bot]
c7c2362f9c
fix: Redirect Web Form user directly to success URL, if no amount is due (backport #12661) (#12856)
If there is no amount due when using WebForms which accept payments, redirect the user directly to the success URL. This is useful for free items.

(cherry picked from commit f8f1301b796180bca6b860bde5e01fa85a632c1f)

Co-authored-by: ci2014 <christoph.isik@wpci.de>
2021-04-15 12:44:36 +05:30
Rohan Bansal
86851028ea feat: manage Python 3 compatiblity with dependencies 2021-04-14 14:40:58 +05:30