Commit graph

230 commits

Author SHA1 Message Date
Rushabh Mehta
9eb9030381 fix(minor): move get_source_value to data_migration_mapper 2020-09-03 08:42:42 +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
gavin
d902699695
fix: handle invalid date parsing (#10273)
* fix: handle invalid date parsing

* chore: combine invalid date strings function

* chore: rename api to conform with convention
2020-05-11 10:37:57 +00:00
Himanshu Warekar
0f1eaee1be feat: add manual import 2020-04-29 10:31:28 +05:30
Himanshu Warekar
1901650514 fix: add utils for converting to string 2020-04-29 10:31:28 +05:30
Chinmay D. Pai
b5a5365bfe
chore: add missing return value
Signed-off-by: Chinmay D. Pai <chinmaydpai@gmail.com>
2020-04-27 23:07:36 +05:30
Chinmay D. Pai
c8550120e4
chore: return if no string_type is found
Signed-off-by: Chinmay D. Pai <chinmaydpai@gmail.com>
2020-04-27 23:06:19 +05:30
Faris Ansari
c676174908 fix: Unused variable name 2020-04-25 20:50:43 +05:30
Faris Ansari
dbf180f368 fix: Handle empty image 2020-04-25 15:48:05 +05:30
Faris Ansari
e8e64012e6 tests: Fix exporter tests 2020-04-25 15:22:35 +05:30
Faris Ansari
280e7d982e feat: Blur-up images before loading 2020-04-25 14:48:43 +05:30
Faris Ansari
caa068932c Merge branch 'develop' of https://github.com/frappe/frappe into page-builder-tailwind 2020-04-24 23:48:29 +05:30
Faris Ansari
2431767fdf feat: Page Builder based on Tailwind
- Website Theme based on: Bootstrap 4, Tailwind
- Web Page: Page Builder
- Web Template: Create templates for web pages
- Added some common Web Templates
- Components: Standard components directly usable in Jinja
- Purge Tailwind Classes in Production
- PostCSS Config to support tailwind
2020-04-18 15:02:56 +05:30