vassili/seitime-frappe
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 1
27839 commits 1 branch 0 tags 587 MiB
Commit graph

27839 commits

This branch
This branch
All branches
Author SHA1 Message Date
Suraj Shetty
f1cb8f4e5c feat: Pass custom widths for excel columns 2020-10-16 13:42:00 +05:30
Suraj Shetty
5173b21bdb refactor: Make export_query code more readable 2020-10-16 13:40:32 +05:30
Suraj Shetty
c0494aac5a fix: Handle empty row 2020-10-16 10:46:56 +05:30
Suraj Shetty
ab368994b0 fix: Use get to avoid key error 2020-10-13 16:09:29 +05:30
Suraj Shetty
5dea5e227c test: Add tests to validate custom report data 2020-10-13 16:08:59 +05:30
Suraj Shetty
50d2f6bb08 test: Use .get to avoid KeyError 2020-10-10 09:54:17 +05:30
Suraj Shetty
fbb0a0264e
Merge branch 'develop' into fix-report-excel-export 2020-10-09 19:37:30 +05:30
Shivam Mishra
82dca893ba
Merge pull request #11674 from scmmishra/fix-customizations-saved-twice 2020-10-09 17:08:44 +05:30
Shivam Mishra
7edf72b9b0 chore: formatting fixes 2020-10-09 12:35:38 +05:30
Shivam Mishra
9511fcc002 fix: freeze DOM on call 2020-10-09 12:35:29 +05:30
mergify[bot]
f4aa4bb9ae
Merge pull request #11665 from scmmishra/feat-hide-public-stack-traces 
feat: hide public stack traces
 2020-10-09 07:05:26 +00:00
Suraj Shetty
948ace900b
style: Use tab instead of spaces 2020-10-09 10:42:10 +05:30
Snyk bot
f004b0592d
chore: Security upgrade rsa from 4.0 to 4.1 (#11671) 
The following vulnerabilities are fixed by pinning transitive dependencies:
- https://snyk.io/vuln/SNYK-PYTHON-RSA-570831
 2020-10-09 10:26:33 +05:30
Faris Ansari
0bf1c61356
Merge pull request #11663 from netchampfaris/regenerate-theme-on-migrate 
fix: Regenerate active theme on migrate
 2020-10-08 23:51:52 +05:30
Shivam Mishra
035df47fba feat: show traceback by default for dev server 2020-10-08 14:53:57 +05:30
Shivam Mishra
0a082e2add feat: don't show traceback to users 2020-10-08 14:50:09 +05:30
Snyk bot
b720726207
chore: Update passlib to fix security issue (#11664) 
The following vulnerabilities are fixed by pinning transitive dependencies:
- https://snyk.io/vuln/SNYK-PYTHON-PASSLIB-569603

Co-authored-by: Suraj Shetty <13928957+surajshetty3416@users.noreply.github.com>
 2020-10-08 09:59:20 +05:30
Prssanna Desai
9546b58183
fix(Query Report): set df options for custom column (#11612) 2020-10-08 09:57:05 +05:30
Faris Ansari
594abc941d fix: Regenerate active theme on migrate 2020-10-07 21:51:46 +05:30
mergify[bot]
194ac4420e
Merge pull request #11658 from marination/db-query 
fix: Provision for 'distinct' keyword in prepare_args
 2020-10-07 11:26:27 +00:00
marination
22b013364e fix: Test for 'distinct' keyword 2020-10-07 16:04:29 +05:30
marination
d39216b273 fix: Select only last 3 args 2020-10-07 15:46:39 +05:30
Gavin D'souza
25e8d8f8cc fix(restore): Add option help 2020-10-07 13:31:30 +05:30
Suraj Shetty
ab4f5c4105
Merge branch 'develop' into fix-report-excel-export 2020-10-07 10:52:25 +05:30
Michelle Alva
00ee7f27b0
fix: Allow creation of Energy Point Log (#11651) 
* fix: Enable in_create for Energy Point Log

* fix: enable in_create

* fix: remove in_create
 2020-10-06 16:16:08 +00:00
mergify[bot]
30eb9f15b1
Merge pull request #11652 from adityahase/fix-pluck 
fix(db_query): Allow plucking a field without having to add it to the fields list
 2020-10-06 13:20:22 +00:00
Aditya Hase
e6c16f3184
fix(db_query): Allow plucking a field without having to add it to the fields list 
e.g.

frappe.get_all("ToDo", pluck="owner")

Didn't work before, instead

frappe.get_all("ToDo", fields=["owner"], pluck="owner")

was needed
 2020-10-06 18:32:43 +05:30
Aditya Hase
fa2c320c49
test(db_query): Test for pluck syntax 2020-10-06 18:27:19 +05:30
mergify[bot]
ed69130c9c
Merge pull request #11646 from netchampfaris/context-enhancments 
fix: Website context enhancements
 2020-10-06 11:41:20 +00:00
Faris Ansari
2f11272308
Merge pull request #11649 from netchampfaris/web-template-empty-value-fix 
fix(web-template): handle None values
 2020-10-06 15:49:10 +05:30
Faris Ansari
566cceb397 fix(web-template): handle None values 2020-10-06 15:48:30 +05:30
mergify[bot]
c2f780e26e
Merge pull request #11647 from deepeshgarg007/test_fix 
fix: Ignore hash collision count limit in tests
 2020-10-06 07:47:05 +00:00
Deepesh Garg
7b404a835b fix: Ignore hash collosion count limit in tests 2020-10-06 12:55:09 +05:30
mergify[bot]
d9ea359c02
Merge pull request #11639 from scmmishra/fix-patch-reload 
fix: web template field doctype not reloaded
 2020-10-06 06:07:21 +00:00
Suraj Shetty
a60b70ee54 Merge branch 'develop' of https://github.com/frappe/frappe into fix-report-excel-export 2020-10-06 09:11:40 +05:30
Suraj Shetty
51f5bb4811 fix: Preserve column order 2020-10-05 23:11:10 +05:30
Suraj Shetty
f8afe32ea4 fix: Scrub fieldname [wip] 2020-10-05 22:20:59 +05:30
Faris Ansari
2d1592f244 fix: Apply context from hooks at the end 
Applying context from hooks at the end ensures that any context values
that are set from hooks are not overridden by the framework.
 2020-10-05 19:46:35 +05:30
Faris Ansari
b9123593d8 fix: Set default twitter:card value to summary 2020-10-05 19:44:13 +05:30
Faris Ansari
f9ae45441c fix: Better metatags fallback 
- Set metatag title from context.title
 2020-10-05 19:43:22 +05:30
Suraj Shetty
4f82ebcef7 refactor: Fix excel export 
- Remove unnecessary code
 2020-10-05 15:32:03 +05:30
mergify[bot]
ba2440bbc4
Merge pull request #11395 from gavindsouza/compress-files 
feat: Compress private and public files during backup
 2020-10-05 09:05:09 +00:00
Gavin D'souza
dc21722935 Merge branch 'develop' of github.com:frappe/frappe into compress-files 2020-10-05 14:08:48 +05:30
Gavin D'souza
076ba11111 fix: Update documentation helper 2020-10-05 14:06:58 +05:30
Gavin D'souza
efaed4b953 Merge branch 'develop' of github.com:frappe/frappe into compress-files 2020-10-05 13:37:46 +05:30
Shivam Mishra
0af4b18b0a chore: add comment to rerun patch 2020-10-05 12:38:32 +05:30
Shivam Mishra
47b920506a fix: web tempalte field doctype not reloaded 2020-10-05 12:33:56 +05:30
Prssanna Desai
82fa78c946
Merge pull request #11638 from frappe/mergify/bp/develop/pr-11633 
fix(Query Report): typo in method name (bp #11633)
 2020-10-05 12:22:01 +05:30
prssanna
5176dfdde3 fix: typo in method name 
(cherry picked from commit 04b10e8126c205c45272b29e9909e73a17162d9d)
 2020-10-05 11:07:26 +05:30
mergify[bot]
b652382834
Merge pull request #11608 from kevingdc/fix/prepared-report-error 
fix: Prepared report's data encoding issue
 2020-10-05 04:12:48 +00:00