Commit graph

35823 commits

Author SHA1 Message Date
Shariq Ansari
f987c52946
Merge branch 'frappe:develop' into list-check-all-fix 2021-10-19 20:18:17 +05:30
Shariq Ansari
fd8d25c0f5
Merge branch 'frappe:develop' into primary-navbar-css-fix 2021-10-19 20:17:39 +05:30
Shariq Ansari
0dfc5989fd
Merge branch 'frappe:develop' into wspace-code-cleanup 2021-10-19 20:16:33 +05:30
Shariq Ansari
af0166ed06
Merge branch 'frappe:develop' into revert-single-scrollbar-pr 2021-10-19 20:14:29 +05:30
mergify[bot]
bfdc7b43d5
Merge pull request #14503 from shariquerik/cypress-ui-test
test: Cypress UI test fixes
2021-10-19 14:42:41 +00:00
Suraj Shetty
a892925f73
Merge pull request #14504 from surajshetty3416/fix-as-json 2021-10-19 20:01:55 +05:30
Saqib Ansari
4f288db878 refactor: handle exception messages on client side 2021-10-19 20:00:35 +05:30
Shariq Ansari
06c8cbceb9 test: Commenting relative_time_filters.js 2021-10-19 19:46:33 +05:30
Shariq Ansari
9673822e2e
Merge branch 'frappe:develop' into revert-single-scrollbar-pr 2021-10-19 19:28:55 +05:30
Faris Ansari
f86a477aa6 fix: controls styling 2021-10-19 19:22:39 +05:30
Faris Ansari
72e9df5460 fix: section fields orientation
- Option to render fields in a section in left-right orientation
- this is useful in cases where rendering currency values one below the other makes more sense
2021-10-19 19:22:23 +05:30
Faris Ansari
58cfbafc22 fix: add header in default layout 2021-10-19 19:21:05 +05:30
Faris Ansari
a4746483ab fix: print style
- bordered table
- pdf column rendering fix
- document-header class
2021-10-19 19:20:08 +05:30
Faris Ansari
090a5db7f8 feat: Spacer and Divider components 2021-10-19 19:16:54 +05:30
Faris Ansari
d8dfc14bea feat: Configurable font size 2021-10-19 19:15:38 +05:30
Faris Ansari
e830b5e4ac fix: minor ui fixes 2021-10-19 19:13:50 +05:30
Faris Ansari
a90937c865 fix: customize button in print 2021-10-19 19:12:54 +05:30
Faris Ansari
76b5ee8b9e feat: Field Templates
- standard field templates for rendering custom templates for fields for e.g., taxes in invoice
- ability to create user defined reusable templates that show up in print format builder
2021-10-19 19:12:15 +05:30
Suraj Shetty
50e9930ca5
ci: Disable patch status
Can be enabled later
2021-10-19 18:53:43 +05:30
Saqib Ansari
23b8798e2a Merge branch 'develop' of https://github.com/frappe/frappe into mask-sql-errors 2021-10-19 18:48:42 +05:30
Suraj Shetty
7f86137b74 fix: List header alignment 2021-10-19 18:44:01 +05:30
Suraj Shetty
d47f23dd3a fix(Print): Select button alignment issue 2021-10-19 18:43:44 +05:30
Gavin D'souza
67647724e8 refactor(minor): DRY-er human friendly error messages 2021-10-19 18:33:31 +05:30
Shariq Ansari
749e12b544
Merge branch 'develop' into cypress-ui-test 2021-10-19 18:31:28 +05:30
Suraj Shetty
c968712450 fix: Return unsorted json in case of type error 2021-10-19 18:22:09 +05:30
Shariq Ansari
d18852f793 test: timeline.js ui test fix 2021-10-19 18:18:22 +05:30
Saqib Ansari
6cd18711d1 chore: better message 2021-10-19 18:06:32 +05:30
Saqib
b11c99137c
chore: rename exceptions 2021-10-19 18:01:18 +05:30
Mohammad Hasnain
d7b7afeb14 fix: format between for creation/ modified 2021-10-19 16:18:21 +05:30
gavin
429f77be0c
Merge pull request #14434 from deepeshgarg007/report_loader
fix: Loading state for query reports
2021-10-19 15:47:54 +05:30
Faris Ansari
c31bf0aadc fix: Page number
- simpler configuration
- remove arbitrary margin text configuration
2021-10-19 15:45:40 +05:30
Ankush Menat
a39e429005
refactor: move max_writes constant to a class var 2021-10-19 15:38:28 +05:30
mergify[bot]
8e2cf038c4
Merge pull request #14493 from frappe/fix-negative-duration
fix: handle negative duration
2021-10-19 09:34:11 +00:00
Sagar Vora
5c86dc80c7
fix: if_owner constraint being applied wrongly (#14471)
* fix: `if_owner` constraint being applied wrongly

* test: check if owner on `frappe.get_list`

Co-authored-by: Pruthvi Patel <pruthvipatel145@gmail.com>
2021-10-19 15:03:17 +05:30
Suraj Shetty
4f94f19940
ci: Remove Github status for UI coverage 2021-10-19 14:46:01 +05:30
gavin
fbe925b42c
Merge pull request #14238 from resilient-tech/autoreload_on_build
feat: automatically reload web pages whenever JS/CSS assets are rebuilt
2021-10-19 14:13:04 +05:30
Sagar Vora
7649cdff4c fix: minor cleanup 2021-10-19 14:00:19 +05:30
mergify[bot]
a473d1c9b1
Merge pull request #14482 from resilient-tech/fix-whitelist
fix: remove/update older whitelist calls
2021-10-19 08:25:21 +00:00
gavin
a52decf308
Merge pull request #14481 from saxenabhishek/aks-feat-semgrep-sql
ci: semgrep rule for db.sql
2021-10-19 13:50:03 +05:30
Gavin D'souza
4a5bb2873d ci: Ignore sql=>qb rule for test files 2021-10-19 13:25:37 +05:30
Gavin D'souza
a575cff8a7 fix: Retry flaky test_printview_page if errored 2021-10-19 12:35:55 +05:30
mergify[bot]
df9e929482
Merge pull request #14484 from hrwX/add_enabled_field
feat: Add enabled to Language
2021-10-19 04:53:01 +00:00
Raffael Meyer
2e4f5e0796
fix: handle negative duration 2021-10-19 01:41:02 +02:00
Sagar Vora
770bda8cc6 fix: use cint, as os.environ only contains string values 2021-10-19 04:04:00 +05:30
hrwx
586ef77cd7 feat: Add enabled to Language 2021-10-18 20:12:09 +01:00
Ankush Menat
ac1bb636cf
ci: flag new instances of sql_ddl and sql_list 2021-10-18 22:13:50 +05:30
Ankush Menat
059e5441c2
ci: use semgrep pattern instead of regex 2021-10-18 21:33:06 +05:30
Shariq Ansari
1e9056c0ee fix: Multi level custom report fix 2021-10-18 20:21:38 +05:30
mergify[bot]
df76d33893
Merge pull request #14100 from saxenabhishek/aks-query
refactor: convert db.sql calls in core module
2021-10-18 14:24:54 +00:00
Shariq Ansari
04442d1305
Merge branch 'frappe:develop' into primary-navbar-css-fix 2021-10-18 19:24:55 +05:30