Rucha Mahabal
|
175c2fdb65
|
Merge branch 'develop' into fix-duration-control-import-export
|
2020-09-23 09:39:32 +05:30 |
|
Rushabh Mehta
|
70baf49c6e
|
fix(data): dont try casting if doctype is missing
|
2020-09-21 10:28:11 +05:30 |
|
Rushabh Mehta
|
334ae82e52
|
fix(naming): added multiple rules for naming series
|
2020-09-21 10:28:11 +05:30 |
|
Faris Ansari
|
bbdbc0d947
|
Merge remote-tracking branch 'upstream/develop' into aaaa-website-enhancements-for-redesign
|
2020-09-18 16:17:15 +05:30 |
|
Rucha Mahabal
|
29fc0a8c0c
|
fix: validate duration value while converting to seconds
|
2020-09-17 11:47:39 +05:30 |
|
Faris Ansari
|
627aff4bb8
|
fix: Handle jpe files in image_to_base64
|
2020-09-14 15:21:22 +00:00 |
|
Faris Ansari
|
cc9fdd690a
|
fix: Check if file exists before generating base64
|
2020-09-11 19:22:34 +05:30 |
|
Faris Ansari
|
4a58f2224c
|
fix: Ignore SVG images
|
2020-09-10 15:33:57 +05:30 |
|
Aditya Hase
|
3349c9f942
|
fix(minor): Prevent path traversal
|
2020-09-04 16:31:10 +05:30 |
|
Rushabh Mehta
|
8c8f7313f4
|
fix(minor): make utils explicit in safe_globals (#11408)
* fix(minor): make utils explicit in safe_globals
* fix(minor): import subprocess
* fix(minor): fix globals in safe_eval;
* fix(minor): import subprocess
* fix(minor): add test
* fix(minor): webhook.py
* fix(minor): document_type_mapping.py
|
2020-09-03 14:26:01 +05:30 |
|
Rushabh Mehta
|
9eb9030381
|
fix(minor): move get_source_value to data_migration_mapper
|
2020-09-03 08:42:42 +05:30 |
|
Rucha Mahabal
|
c0b4532ea5
|
fix: Handle duration fieldtype for Data Import
|
2020-09-02 15:58:08 +05:30 |
|
Suraj Shetty
|
1ff9bdca9a
|
Merge branch 'develop' into invalid-date-filter
|
2020-08-12 16:47:59 +05:30 |
|
Saqib Ansari
|
2076a81d29
|
fix: catch only expected error
|
2020-08-10 17:52:26 +05:30 |
|
Shivam Mishra
|
34c3d57767
|
feat: validate json when saving desk page (#11095)
Co-authored-by: Suraj Shetty <13928957+surajshetty3416@users.noreply.github.com>
|
2020-08-06 00:01:11 +05:30 |
|
Saqib Ansari
|
af8771d5dc
|
fix: throw message for invalid date filter
|
2020-07-27 15:51:44 +05:30 |
|
Faris Ansari
|
4eb4563de5
|
fix: remove unused variables
|
2020-07-09 13:57:09 +05:30 |
|
Faris Ansari
|
89d2c064a9
|
fix: Guess more date formats
Can guess the following formats now:
- 7 May 2020
- 1 Jan 2020
|
2020-07-09 13:49:49 +05:30 |
|
Suraj Shetty
|
bc728dc857
|
Merge branch 'develop' into currency_precison_fix
|
2020-06-24 08:56:05 +05:30 |
|
Rucha Mahabal
|
39979c0d2d
|
fix: sider issue
|
2020-06-20 20:20:28 +05:30 |
|
Rucha Mahabal
|
32afd414ab
|
fix: check date string is exactly equal to None
|
2020-06-20 20:07:19 +05:30 |
|
Faris Ansari
|
2ec31e3f01
|
Merge branch 'develop' of https://github.com/frappe/frappe into dib-fixes-2020-05-18
|
2020-06-10 21:26:54 +05:30 |
|
Deepesh Garg
|
db5888e2f9
|
fix: Consider fraction units for precision
|
2020-06-10 14:36:31 +05:30 |
|
mergify[bot]
|
6135dece3d
|
Merge pull request #10576 from ruchamahabal/fix-duration-options
fix: Change 'show' to 'hide' in Duration field properties
|
2020-06-10 05:59:59 +00:00 |
|
Suraj Shetty
|
e389dcf6fe
|
Merge branch 'develop' into dib-fixes-2020-05-18
|
2020-06-09 15:26:46 +05:30 |
|
Faris Ansari
|
b7acd312ad
|
Merge pull request #10586 from scmmishra/image-grid
|
2020-06-08 17:01:43 +05:30 |
|
Faris Ansari
|
19660367bd
|
Merge pull request #10571 from frappe/page-builder-2020-05-17
|
2020-06-08 15:49:02 +05:30 |
|
Suraj Shetty
|
60649122db
|
Merge branch 'develop' into fix-duration-options
|
2020-06-07 21:14:54 +05:30 |
|
Suraj Shetty
|
dde11a50e9
|
fix: Handle invalid date parsing (#10614)
|
2020-06-07 20:25:11 +05:30 |
|
Gavin D'souza
|
fc6aeada2b
|
Merge branch develop into page-builder-2020-05-17
|
2020-06-05 18:24:22 +05:30 |
|
Shivam Mishra
|
56019241ac
|
fix: KeyError['JPG']
|
2020-06-04 16:54:38 +05:30 |
|
Deepesh Garg
|
cae267723f
|
fix: Incorrect currency precision
|
2020-06-04 13:40:28 +05:30 |
|
Rucha Mahabal
|
3a0aa88f4b
|
fix: change 'show' duration options to 'hide' for consistency
|
2020-06-02 22:06:37 +05:30 |
|
prssanna
|
b291e0aaa9
|
feat: add timespan option for today
|
2020-06-01 10:52:07 +05:30 |
|
prssanna
|
1b691c799d
|
refactor: refactor get_date_range
|
2020-06-01 10:52:07 +05:30 |
|
prssanna
|
3a55ba0d58
|
fix: missing newline
|
2020-06-01 10:52:06 +05:30 |
|
Prssanna Desai
|
55cdd20fea
|
fix: use map to calculate period value
Co-authored-by: Shivam Mishra <scmmishra@users.noreply.github.com>
|
2020-06-01 10:52:06 +05:30 |
|
prssanna
|
d9e8b7ef4f
|
fix: handle old date filters in query
|
2020-06-01 10:51:38 +05:30 |
|
prssanna
|
2fcd8c2905
|
fix: move timespan function to data.py
|
2020-06-01 10:51:38 +05:30 |
|
prssanna
|
f0d62d4007
|
fix: all periods in timespan filter
|
2020-06-01 10:51:38 +05:30 |
|
prssanna
|
4c16b2a608
|
feat: api to get additional filters
|
2020-06-01 10:51:38 +05:30 |
|
prssanna
|
53e2e60cab
|
feat: filter for current timespan
|
2020-06-01 10:51:38 +05:30 |
|
Faris Ansari
|
429ff2ef87
|
fix: Refactor Data Import
- Break Importer into classes ImportFile, Row, Column, Header
- Show warnings section before import preview
|
2020-05-28 23:16:46 +05:30 |
|
mergify[bot]
|
4a56ae4557
|
Merge pull request #10248 from ruchamahabal/duration-control
feat: Duration Control
|
2020-05-27 06:53:46 +00:00 |
|
Rucha Mahabal
|
1078b0e2da
|
fix(print preview): add formatter for duration fieldtype
|
2020-05-23 21:48:47 +05:30 |
|
Faris Ansari
|
a8720d9554
|
fix: Extract page toc from markdown
|
2020-05-23 15:51:52 +05:30 |
|
mergify[bot]
|
a2550faa0f
|
Merge pull request #10232 from scmmishra/web-analytics-report
feat: Website module enhancements
|
2020-05-22 04:51:25 +00:00 |
|
Saurabh
|
895ffc3fec
|
fix: default return value for flt
|
2020-05-21 18:22:32 +05:30 |
|
Shivam Mishra
|
218e945b26
|
feat: add get_last_day_of_week function
|
2020-05-13 19:56:00 +05:30 |
|
Himanshu Warekar
|
a70bc3dbb6
|
Merge branch 'develop' of https://github.com/frappe/frappe into cust_export
|
2020-05-13 11:41:49 +05:30 |
|