Commit graph

2430 commits

Author SHA1 Message Date
Gavin D'souza
de2bcb08b4 fix!: Drop six PY2 compatibility package 2022-01-27 18:28:04 +05:30
Gavin D'souza
5503e18817 chore(typing): Add typing, style fixes
This was going to be a fix at first. Until I realised it couldn't...so I
removed the changes and kept the things back that helped me debug the
issue
2022-01-27 18:27:35 +05:30
Shariq Ansari
e10068e7fc
Merge branch 'develop' into wspace-new-design 2022-01-25 12:14:45 +05:30
hrwx
b550096161 feat: time field in webform 2022-01-24 20:51:55 +00:00
Gavin D'souza
9dbaf252f0 fix: Check if binary file in Page Renderers
* Check if binary before rendering using StaticPage resolver
* Check if not binary before rendering using TemplatePage resolver
2022-01-19 19:30:45 +05:30
Shariq Ansari
178ec8e687
Merge branch 'develop' into wspace-new-design 2022-01-17 16:04:15 +05:30
barredterra
b1383df15a refactor: use is None instead of == None 2022-01-17 10:37:51 +01:00
Gavin D'souza
227dc26707 Merge branch 'develop' of github.com:frappe/frappe into set_value-refactor 2022-01-17 14:04:13 +05:30
Shariq Ansari
94869e8e69 fix: updated standard workspace json files 2022-01-13 18:40:36 +05:30
Suraj Shetty
0c23852287
Merge branch 'develop' into cleanup-portal 2022-01-11 17:44:01 +05:30
Gavin D'souza
3052808048 fix: Don't cast to str if None or Falsy
* refactor: use get_single_value instead of set_value(blah, None, blah1)
* User.reload in test_home_page to combat what happens locally
2022-01-10 15:05:57 +05:30
Gavin D'souza
981564e544 Merge branch 'develop' into frappe-postgres-changes 2022-01-07 11:37:28 +05:30
Conor
40ba1ac9ba fix: Postgres Compatibility
* Handle inconsistencies in type handling in DatabaseQuery & Database
  APIs
* Update incompatible queries with frappe.qb notation
* Fixed use cases discovered by failing ERPNext CI tests

fix: db independent syntax for user_type

fix: handle postgres datetime values

feat: add ability to auto commit on db inserts

feat: add ability to escape underscore in postgres

fix: handle missing data in test runner bootstrapping

fix: db independent syntax for queries

fix: refactor to use qb

fix: update cache for language

fix: use pluck in email_queue

Co-authored-by: gavin <gavin18d@gmail.com>

fix: don't auto insert on tests for make_property_setter

fix: remove auto_commit in custom_field insertion

fix: remove auto_commit functionality

fix: review comments

fix: revert link validation

fix: style suggestion for readability

Co-authored-by: gavin <gavin18d@gmail.com>

fix: revert .lower() in link validation

fix: add rollback for setup_wizard

Revert "fix: add rollback for setup_wizard"

This reverts commit 83b3b0913db17718ccd5edae01858cff15603829.

Revert "feat: add ability to escape underscore in postgres"

This reverts commit 8ed9c2aa3306438e94bb813f60e65b416d0b947b.

fix: more concise representation of order fields

Co-authored-by: gavin <gavin18d@gmail.com>
2022-01-07 10:44:57 +05:30
Suraj Shetty
f930fd0fe1
Merge branch 'develop' into multistep_webforms 2022-01-06 18:31:37 +05:30
harshpwctech
997c0e25cb
Updating the get_payment_gateway_url method (#15423)
This change is proposed as on_payment_authorized method defined in any doctype for which the payment is made isn't getting triggered.

https://github.com/frappe/frappe/pull/12756
2022-01-06 05:54:58 +00:00
mergify[bot]
9c8a3003b9
Merge pull request #15468 from pateljannat/time-zone-info-in-web-form
fix: Time zone info in web form
2022-01-06 05:52:16 +00:00
Suraj Shetty
a051f796cc
Merge branch 'develop' into multistep_webforms 2022-01-06 11:06:28 +05:30
Faris Ansari
c1995226d7
Merge pull request #15526 from netchampfaris/blog-category-load-more
fix(blog): Load more with category filter
2022-01-04 17:34:23 +05:30
Faris Ansari
22dd06101b fix(blog): Load more with category filter
When you click "Load more" on a blog category page, it will now fetch blog posts for that category
2022-01-04 17:19:10 +05:30
Gavin D'souza
6f2125fca6 Merge branch 'develop' of github.com:frappe/frappe into owner-unchange 2022-01-04 15:06:37 +05:30
Gavin D'souza
bb004fc33b fix: Remove redundant owner fields in Email Template, Help Article 2022-01-04 13:32:44 +05:30
Faris Ansari
b73ed8ffbc test: UI test for blog category dropdown 2022-01-03 16:19:11 +05:30
Faris Ansari
84be09f93a fix: convert raw sql to frappe.qb 2022-01-03 16:19:11 +05:30
Faris Ansari
3064b61385 feat(blog): Browse by category
Add option to filter blogs by category on blog list
2022-01-03 16:19:11 +05:30
Rushabh Mehta
66a8e125d4 fix(ux): add "Show Dashboard" check for tab breaks 2022-01-03 13:57:36 +05:30
Summayya
20c5366596 refactor(UI): web form data table 2021-12-31 12:11:24 +05:30
Summayya
cf2e783e0e test: change h2 to h3 for form title 2021-12-30 18:53:09 +05:30
Summayya
738a8d81d5 refactor: web forms 2021-12-30 18:35:30 +05:30
Gavin D'souza
568d9b94ed test: Use db_set to change creation, status 2021-12-30 10:33:00 +05:30
Jannat Patel
688829efa5 fix: time zone info in web form 2021-12-28 15:51:17 +05:30
hrwx
ae363d9df2 feat: multistep webforms 2021-12-19 00:59:54 +00:00
Jannat Patel
d0c570ae02 fix: function name and comment 2021-12-17 15:00:56 +05:30
Jannat Patel
2c397e4270 fix: on hold status button 2021-12-16 11:12:26 +05:30
Jannat Patel
c5c439ff03 fix: on hold status for data deletion 2021-12-16 10:02:07 +05:30
Jannat Patel
e57d2d0aa2 fix: removed sla and added auto deletion 2021-12-15 19:36:36 +05:30
Suraj Shetty
dfebbe9529
Merge branch 'develop' into data-deletion-enhancements 2021-12-12 10:14:44 +05:30
Suraj Shetty
9ad5593b24 style: Fix indentation 2021-12-12 10:14:22 +05:30
Jannat Patel
a97c71f3b5 fix: sider 2021-12-08 19:29:58 +05:30
Jannat Patel
7585a26d43 fix: translation for sla description 2021-12-08 18:12:09 +05:30
Jannat Patel
3caa93c2c4 chore: sla tracking 2021-12-07 11:14:11 +05:30
mergify[bot]
ba094e76d1
fix: Add xcall to Frappe's web bundle (backport #15146) (#15152)
Co-authored-by: Omar Younis <oimyounis@gmail.com>
2021-12-02 10:58:36 +05:30
Jannat Patel
d268996629 fix: test and semicolon 2021-12-01 21:18:52 +05:30
Jannat Patel
abd6eafbad fix: email content 2021-12-01 19:44:19 +05:30
Jannat Patel
121333874a fix: send email immediately 2021-12-01 18:54:01 +05:30
Jannat Patel
d622b96e64 fix: request for account deletion flow 2021-12-01 10:54:15 +05:30
Shariq Ansari
7db461ad6d
chore: description updated 2021-11-23 11:03:04 +05:30
Shariq Ansari
98da4b9388 chore: Added description on email notification field 2021-11-23 10:46:54 +05:30
Shariq Ansari
a6cd8e0d8e fix: Added checkbox to enable disable email notification for blog comment and feedback 2021-11-16 16:45:22 +05:30
Shariq Ansari
9466b35344 fix: Fixed position of feedback(like, comment) 2021-11-16 13:06:42 +05:30
Rushabh Mehta
f4eff6f7c4
Merge pull request #14614 from shariquerik/new-feedback-comment
refactor: New Feedback & Comment Design for Blog Post
2021-11-16 12:40:35 +05:30