barredterra
745297a49d
refactor: a not in b
...
Search: if not ([\w\d]*?) in ([\w\d]*?)
Replace: if $1 not in $2
2022-02-21 19:54:34 +01:00
Gavin D'souza
0482f1362a
Merge branch 'develop' of github.com:frappe/frappe into dynamic-docfields
2022-02-08 16:50:58 +05:30
phot0n
266e1f95ed
chore: adding back idx column
...
This is needed for ordering in display of links as it keeps
track of the clicks on a particular link item
2022-02-07 16:40:01 +05:30
phot0n
b31f3c24f6
refactor: remove parent, parenttype, parentfield, idx columns from non-child table doctypes
...
* feat: add parent, parenttype, idx, parentfield columns to doctypes when transitioning from normal -> child table
* fix: remove parent, parenttype, parentfield, idx from DocType DocType
2022-02-07 15:12:37 +05:30
Suraj Shetty
8efb100222
Merge pull request #15831 from marination/moment-missing-in-datetime-web
2022-02-03 12:22:24 +05:30
marination
ab5f45a96f
chore: Add moment to bundle instead of injection via script tag
...
- Wherever moment is imported in html, use dependent bundle to import it instead for consistency
- Remove moment import from `base.html` since it uses `frappe-web.bundle.js` anyway
2022-02-03 11:31:18 +05:30
Gavin D'souza
001075f88a
fix: Use lru_cache instead of cache
...
* Mainly because it was introduced in PY39
* Making this change beacuse I'd like to evict cold caches too
2022-02-02 13:03:38 +05:30
Ankush Menat
5c17f9ad79
Merge pull request #15661 from gavindsouza/thumbnail-for-images
...
fix: Thumbnail for external images (from URL)
2022-02-02 12:21:06 +05:30
Gavin D'souza
bd89a9de86
Merge branch 'develop' of github.com:frappe/frappe into dynamic-docfields
2022-02-01 18:14:58 +05:30
Gavin D'souza
b9395a4d71
fix: Handle Virtual DocFields in Desk
...
* Show as "Read Only" in forms/controls/webforms etc
* Exclude from filtering options in views
* Exclude from quick entry
2022-02-01 17:49:21 +05:30
Gavin D'souza
885c86bedb
Merge branch 'develop' of github.com:frappe/frappe into set_value-refactor
2022-01-31 11:53:59 +05:30
Gavin D'souza
c56b5a4899
Merge branch 'develop' of github.com:frappe/frappe into thumbnail-for-images
2022-01-31 11:26:31 +05:30
mergify[bot]
7d5465b2e3
Merge pull request #15771 from OneiricIT/OneiricIT-webform-signaturefield
...
feat: signature field in webform
2022-01-30 07:27:58 +00:00
Gavin D'souza
5b6ceb5543
Merge branch 'develop' of github.com:frappe/frappe into set_value-refactor
2022-01-28 18:39:12 +05:30
Oneiric
4e5c748fb8
feat: siganture field in webform
2022-01-28 10:42:11 +11:00
Gavin D'souza
51fa09c4ab
Merge branch 'develop' of github.com:frappe/frappe into thumbnail-for-images
2022-01-27 18:56:58 +05:30
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
