Commit graph

192 commits

Author SHA1 Message Date
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
Aditya Hase
6b72faf44f style: Linting fixes (#6809)
* style: Remove unused imports

* style: Remove unused local variables
2019-01-23 16:39:55 +05:30
Deepesh Garg
2ecd805e0e fix: Router options for multiple values (#6779)
* fix(list_view): Router option support for multiple filters

* fix(utils): fix in get_link_to_report for route options

* fix(Codacy): Added semicolon and fixed indentation

* fix(route_options): Bug fix

* fix(router_options): Added safe encoding for get_link_to_report

* fix(router_options): fixed encoding issue

* Remove encoding

* fix(list_view): fix for find in awesomebar
2019-01-22 14:27:30 +05:30
sahil28297
3644f5f4cd feat: relative timeframe filters (#6792)
* feat: relative timeframe filters

* fix: resolve syntax errors

* fix: Translated options
2019-01-21 16:02:40 +05:30
Deepesh Garg
817d0744f8 feat: Function for linking reports with filters (#6718) 2019-01-08 10:43:27 +05:30
Faris Ansari
ae57e75b0e fix(is_html): Return false if text is not string 2018-12-30 22:43:21 +05:30
Faris Ansari
041e8dd4b2 fix(is_html): Return false if not string 2018-12-30 12:35:08 +05:30
Frappe Bot
0499b4a845 Merge branch 'staging' into develop 2018-12-26 12:03:03 +00:00
rohitwaghchaure
22fe10148a [Fix] Translation not working for the html data (#6647)
* [Fix] Translation not working for the html data

* Test cases

* Fixed codacy

* Fixed is html method

* Fixed test cases
2018-12-24 15:17:38 +05:30
Saurabh
2de5dfdbb3 Merge branch 'staging' into develop 2018-12-18 10:20:24 +05:30
Zarrar
863c54b0fa [Fix] Json data for Report Builder based reports (#6624)
* replace doctype name if already present

* patch to update json data for report builder based reports

* minor fix for auto email
2018-12-18 08:56:10 +05:30
Frappe Bot
b2779c617a Merge branch 'staging' into develop 2018-12-06 09:31:40 +00:00
Ameya Shenoy
79bd1ed9d6 fix: identify production mode for PDF generation (#6559)
In regards to PDF generation, if developer_mode was set to true, the PDF
generated used to lack css styling. This was because the URL to the CSS
assets used to contain the webserver port number, but given the system
was running in production, the URL was invalid, thereby not being able
to load CSS assets. This fix does not rely on the value of
developer_mode to identify if the system is running in production,
rather, it uses the value of restart_superviosor or systemd_on_update,
to check for the same.
2018-11-29 10:31:53 +05:30
Nabin Hait
d37d111f61 Fixed merge conflict 2018-10-15 15:53:26 +05:30
Rushabh Mehta
1f1a1ec810 fix(formatdate): always replace mm by MM for babel.dates 2018-10-15 10:34:17 +05:30