Commit graph

1207 commits

Author SHA1 Message Date
Gavin D'souza
3446026555 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.
2021-09-03 12:02:59 +05:30
Gavin D'souza
65864c027f 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.
2021-09-03 11:51:01 +05:30
mergify[bot]
4cbf2c40e6
Merge pull request #13958 from ankush/pw_reset
fix: broken template in password reset
2021-08-19 12:46:29 +00:00
Shariq Ansari
3baa33d5da
fix: Use IP Address instead of Email field (#13553) 2021-08-18 13:21:10 +05:30
Ankush Menat
d41121643e
fix: broken template in password reset 2021-08-17 15:59:12 +05:30
Suraj Shetty
0b3402236c fix: Add layout direction to pdf template 2021-07-05 14:44:04 +05:30
Suraj Shetty
4363e51c6d test: Fix improper tests for website rendering 2021-07-01 22:10:02 +05:30
gavin
117a729c8d
refactor(minor): login-content template
Co-authored-by: Suraj Shetty <13928957+surajshetty3416@users.noreply.github.com>
2021-06-30 10:51:44 +05:30
conncampbell
4983206774 fix: missing otp form template html in prior commit. 2021-06-26 12:27:23 -06:00
Gavin D'souza
58859d9804 style: Improve readability for request_otp 2021-06-24 12:12:53 +05:30
Suraj Shetty
1b99ef2c19
Merge branch 'develop' into 12928-OTPLoginFix 2021-06-22 15:44:39 +05:30
Suraj Shetty
7dfced5047 Merge branch 'develop' of https://github.com/frappe/frappe into refactor-website 2021-06-17 09:48:50 +05:30
mergify[bot]
9866aab28c
Merge pull request #13466 from shariquerik/allow_comment_for_guest
fix: Allow guest to comment on Web Page & Blog Post
2021-06-16 07:43:36 +00:00
mergify[bot]
107de3e4c5
Merge pull request #13491 from shariquerik/blog_feedback
feat: Feedback feature for Blog Post
2021-06-16 07:42:13 +00:00
shariquerik
e9a83f2764 fix: minor fix 2021-06-16 12:49:30 +05:30
shariquerik
622001396f fix: server-side validation 2021-06-16 12:44:06 +05:30
shariquerik
5dfe65f8f9 fix: sider fix 2021-06-15 21:23:38 +05:30
shariquerik
e7fc63271e test: Added test case 2021-06-15 21:21:13 +05:30
shariquerik
d08e0f6605 fix: server-side validation 2021-06-15 20:27:55 +05:30
shariquerik
09c7d66ae2 fix: New 1-10 rating design 2021-06-15 10:54:04 +05:30
shariquerik
1f83d3d54f feat: Feedback feature for Blog Post 2021-06-14 15:28:44 +05:30
Gavin D'souza
3f428e20b6 Merge branch 'develop' into 12928-OTPLoginFix 2021-06-10 16:28:14 +05:30
Gavin D'souza
df6c5cd3e2 Revert "fix: changed translate entries to javascript rather than python to resolve semgrep linter translate checks"
This reverts commit 2b51641799.
2021-06-10 16:27:59 +05:30
shariquerik
1fbb22d36f fix: Allow guest to comment on Web Page & Blog Post 2021-06-10 15:45:22 +05:30
Suraj Shetty
eba4c24503
Merge branch 'develop' into refactor-website 2021-06-04 11:15:12 +05:30
Ankush Menat
327b9669e3
Merge branch 'develop' into sgrep_microtemplate 2021-06-03 12:09:19 +05:30
Suraj Shetty
2d8c6c1710 Merge branch 'develop' of https://github.com/frappe/frappe into refactor-website 2021-06-03 11:43:28 +05:30
Suraj Shetty
9ec451b28e test: Add test case to check breadcrumbs 2021-05-27 12:57:55 +05:30
Gavin D'souza
e407b78506 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
2021-05-26 15:31:29 +05:30
Suraj Shetty
646612be09 fix: Colocated asset load 2021-05-26 10:40:16 +05:30
Ankush Menat
faa347461d
chore: fix all findings flaged by ux rule 2021-05-25 13:04:20 +05:30
Suraj Shetty
86897c1808 refactor: Remove render.py and move all utility functions to utils.py
- Replace or remove all render imports
2021-05-25 10:53:35 +05:30
conncampbell
2b51641799 fix: changed translate entries to javascript rather than python to resolve semgrep linter translate checks 2021-05-10 16:14:51 -06:00
conncampbell
e12a6c24f2 fix: OTP login verification fails 2021-05-08 21:32:18 -06:00
Faris Ansari
474dc5b47a fix: Fallback for show_language_picker 2021-05-02 15:05:22 +05:30
Faris Ansari
dd69f1ab43 fix: Hash based file naming
- For better HTTP caching and cache busting
- assets.json is created under [app]/dist folder which contains the map
of input file and output file name, this is used to get the correct path for
bundled assets
2021-04-29 13:30:07 +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
mergify[bot]
92366d59aa
fix: Invalid HTML generated by the base template (backport #12953) (#12954)
Closes #12952

(cherry picked from commit 1a30e11b5f)

Co-authored-by: Anand Chitipothu <anandology@gmail.com>
2021-04-22 09:06:37 +05:30
Anand Chitipothu
1a30e11b5f
fix: Invalid HTML generated by the base template (#12953)
Closes #12952
2021-04-22 09:01:59 +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
mergify[bot]
496445aac3
fix(website): Make language select optional and fix breakpoint issues (backport #12860) (#12909)
Co-authored-by: Rushabh Mehta <rmehta@gmail.com>
2021-04-19 17:25:52 +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
Suraj Shetty
dcd98fb80e
fix: Select correct language
Fixes a bug in the language selection
2021-04-08 17:50:03 +05:30
Suraj Shetty
66720e0069
Merge pull request #12813 from surajshetty3416/website-language-switcher 2021-04-08 13:01:51 +05:30
Suraj Shetty
b41c5b59d3 feat: Use navigator.language for initial guess 2021-04-08 12:39:23 +05:30
Mohammad Hasnain Mohsin Rajan
3a7823ef76
fix: Webform checkout (#12756)
Co-authored-by: Suraj Shetty <13928957+surajshetty3416@users.noreply.github.com>
2021-04-08 10:16:47 +05:30
Suraj Shetty
7e1638ef60 fix: Only use cookie to remember lang preference 2021-04-08 09:46:07 +05:30
Suraj Shetty
fe6b427fb2 fix: Set lang attribute of document 2021-04-07 18:49:55 +05:30