Commit graph

206 commits

Author SHA1 Message Date
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
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
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
Suraj Shetty
ad95fbf519 fix: Handle invalid date parsing 2020-04-10 10:17:01 +05:30
Shridhar
efa740efba regular expression fixed 2020-02-18 10:58:47 +05:30
Shridhar
a68766261a workaround for wkhtmltopdf 2020-02-18 10:58:40 +05:30
Shridhar
690611f6f8 scrub urls should only replace relative urls 2020-02-18 10:58:28 +05:30
Andrew McLeod
07cedc581d feat: Optionally remove seconds from datetime (#8531)
* fix: Add updated datepicker; fixed seconds formatting bug.
Seconds between 0 and 9 were not zero-padded.

* feat: Add framework for time format

* feat: datetime server-side formatters.

* tests: Added server-side datetime formatter tests

* feat: Update client-side datetime formatters

* tests: Add Cypress client-side formatting tests.

* fix: JSON errors

* fix: Update to not hard-code admin password

* fix: Change to using bulk_update rather than the REST API

* tests: Use Custom doctype for testing, not Standard

* fix: Codacy style fixes

* fix: Commonify update_datetime_picker in date.js, datetime.js, time.js
Fix order of time_format in System Settings
Restore get_user_fmt in utils/datetime.js

* feat: Drastically reduce scale of Cypress testing (to make tests faster)
Full testing is possible by setting 'fast_mode' to false in the spec file.

* fix: Fix issues with datepicker/timepicker expansion

* fix: typo

* style: Various style fixes as requested by DeppSource: Python

* fix: Timepicker not hiding on 'now' button. Force hiding on click.

* style: Codacy style fixes.

* fix: Use datepicker from node_modules

* test: Refactor Datetime UI tests

- cy.get_field
- cy.set_value
- cy.insert_doc with ignore_duplicate
- Nominal datetime tests to cover most formats
- Formatting with prettier

* test: Datetime UI tests; wait for cur_frm.doc.datetime to update

* tests: Add whitespace to typed input

- Clear input only for Time field

* test: Wait timeout 200

* test: Fix form test

Co-authored-by: Faris Ansari <netchampfaris@users.noreply.github.com>
2019-12-25 14:54:28 +05:30
Anurag Mishra
5aad587a4a
fix: Showing quotes in string (#8904) 2019-12-02 16:33:58 +05:30
Rohan Bansal
47caf1e9ad fix: singular-plural format 2019-11-11 14:05:43 +05:30
Rohit Waghchaure
7494328106 fix: disable smart shrinking for version 0.12.5 2019-10-25 18:36:26 +05:30
Faris Ansari
c33f7f1e45 fix: Pick sitemap host from request (#8071) 2019-08-02 12:42:00 +05:30
Aditya Hase
8b64879d5a fix: Rounding behavior in Python 3 (#7730) 2019-06-20 11:30:02 +05:30
Suraj Shetty
2b85f4996c feat: Add get_first_day_of_week utillity method 2019-06-11 21:25:32 +05:30
Suraj Shetty
d9c682f34d feat: Add get_weekday utility function 2019-06-07 12:33:48 +05:30
Nabin Hait
1a787984f4
fix: get month diff between 2 dates (#7474) (#7500) 2019-05-16 10:16:06 +05:30
Anurag Mishra
a9d85c3222 fix: add seconds parameter seconds
* fix: add seconds parameter seconds

* fix: added paramater for minutes
2019-05-08 17:39:54 +05:30
Rushabh Mehta
41e1b6ab3b fix: dashboard charts with empty ranges and tests 2019-04-15 10:16:56 +05:30
Anurag Mishra
cd191439fd feat: Document subscription (#6745) 2019-03-07 14:06:22 +05:30
Rushabh Mehta
08d5d9ae2c fix: default None to empty string for markdown conversions 2019-02-26 15:07:08 +05:30
Suraj Shetty
ce18b5ab2f
Fix minor formatting 2019-02-21 12:10:49 +05:30
Himanshu Warekar
121ffc0cf7 renamed function to get_weekdays 2019-02-21 11:17:52 +05:30
Himanshu Warekar
a6ce45240d add function to get weekdays 2019-02-21 11:11:38 +05:30
Sagar Vora
89efa968d8 Merge branch 'master' into develop 2019-02-05 18:39:43 +05:30
Chinmay Pai
6377bdf6db fix(data_import): use absolute url (#6875)
there is no need to prepend the sitename to the url, since browsers/html are/is smart enough to handle absolute urls.

Signed-off-by: Chinmay Pai <chinmaydpai@gmail.com>
2019-02-05 10:53:31 +05:30
Sagar Vora
ef82f39f99 Merge branch 'staging' into develop 2019-01-29 18:24:11 +05:30
Faris Ansari
5ffdeb19fc feat: New filter type "Is Set", "Is Not Set" 2019-01-24 14:26:27 +05:30