Rushabh Mehta
742860f56e
Merge pull request #11917 from rmehta/unified-desk
...
feat(routing): New routing style, not using hashes, also /desk -> /app
2020-11-11 17:48:55 +05:30
Rushabh Mehta
06355968f8
fix(routes): move /app#route to /app/route
2020-11-11 16:35:02 +05:30
Rushabh Mehta
75fe8a615a
feat(app): move /desk to /app
2020-11-11 16:31:47 +05:30
prssanna
ccb5b128fe
Merge branch 'rebrand-ui' of https://github.com/frappe/frappe into rebrand-ui
2020-11-10 11:08:11 +05:30
prssanna
76bb9fc608
feat: skeleton loading state for print preview
2020-11-10 11:03:13 +05:30
Suraj Shetty
a88b2ac7d7
Merge branch 'develop' of https://github.com/frappe/frappe into rebrand-ui
2020-11-09 13:11:54 +05:30
Shivam Mishra
9e0d2abc6a
fix: permission not applied on fetching goal chart
2020-11-06 14:04:52 +05:30
Suraj Shetty
b5d9c1e816
Merge branch 'develop' of https://github.com/frappe/frappe into rebrand-ui
2020-11-06 10:42:37 +05:30
ABHISHEK KEDAR
7afb5b0b73
feat: as_raw update to display content inline not always download as attachment ( #11569 )
...
* feat: as_raw update to display content inline not always download as attachment
* fix: string formatting corrected in as_raw()
* fix: missing quotes in filename in as_raw()
2020-10-30 06:58:25 +00:00
Aditya Hase
67276b72f7
Merge pull request #11792 from adityahase/fix-pdf-generation
...
fix(pdf): PDF generation shouldn't fail in background jobs and tests
2020-10-28 11:42:55 +05:30
Aditya Hase
91bfa9aad4
fix(scheduler): get_jobs includes currently running jobs
2020-10-28 10:31:48 +05:30
Aditya Hase
16fc29e48d
fix(pdf): frappe.local.request is not available in backgound jobs and tests
...
Use frappe.utils.get_host_name instead of frappe.local.request.host
2020-10-27 14:18:36 +05:30
Aditya Hase
3f5f6f3b21
fix(pdf): Remove in_test check from get_pdf
2020-10-27 14:18:35 +05:30
Faris Ansari
b2e5472ea3
Merge pull request #11628 from frappe/fix_web_template_type
...
fix: allow empty type for Web Templates that are not sections
2020-10-26 15:29:17 +05:30
Suraj Shetty
d254933a7c
fix: Build cookie jar only if request object is present
2020-10-24 14:12:59 +05:30
Faris Ansari
84c8bf68a8
Merge remote-tracking branch 'upstream/develop' into fix_web_template_type
2020-10-22 18:05:01 +05:30
Faris Ansari
e90faf76b5
fix: Remove unnecessary code
...
- Extra spacing is only applied to templates of type Section
- should be able to call web_block without values
- default type should be Section
- set_query can be set once
2020-10-22 17:43:31 +05:30
Shivam Mishra
9e39a7464a
Merge branch 'develop' of https://github.com/frappe/frappe into rebrand-ui
2020-10-21 11:55:13 +05:30
barredterra
5d3178ed19
fix: disable padding and container by default
2020-10-20 14:53:23 +02:00
Suraj Shetty
9db41ee0e6
Merge branch 'develop' into fix-report-excel-export
2020-10-19 15:53:40 +05:30
Suraj Shetty
f1cb8f4e5c
feat: Pass custom widths for excel columns
2020-10-16 13:42:00 +05:30
mergify[bot]
f7b264afaf
Merge pull request #11670 from gregor-horvath/patch-2
...
fix: py3 AttributeError decode
2020-10-16 05:37:07 +00:00
Marica
1ad3bb76a5
fix: Skip using cookie-jar to set cookies if via tests ( #11700 )
2020-10-13 13:35:42 +05:30
Rucha Mahabal
7c4ce7b6e7
fix: First Response Time not getting set when sender is Administrator
2020-10-12 13:46:24 +05:30
gregor-horvath
603a60e0a4
fix: py3 AttributeError decode
...
str has no attribute decode in python3, use cstr to convert to str
2020-10-08 21:12:09 +02:00
Suraj Shetty
ba29d8d8b4
Merge branch 'develop' of https://github.com/frappe/frappe into rebrand-ui
2020-10-01 13:10:37 +05:30
Gavin D'souza
45ec8ed485
fix: Sider
2020-09-28 19:18:14 +05:30
Gavin D'souza
95ab58fa3d
chore: Optimized imports
2020-09-28 19:13:57 +05:30
Gavin D'souza
a94db8a5ce
fix: Added human readable file size func
2020-09-28 19:13:31 +05:30
Gavin D'souza
26be4a2604
fix: Verbosity. Show Backup summary, always
2020-09-28 19:12:19 +05:30
Gavin D'souza
be2d41915a
fix: Make dirs if dont exist
2020-09-25 15:24:03 +05:30
Gavin D'souza
a098cd0055
fix: Folder creation failures, click.(s)echo
2020-09-25 14:07:14 +05:30
Gavin D'souza
5361464468
Merge branch 'develop' of github.com:frappe/frappe into compress-files
2020-09-25 14:00:40 +05:30
Faris Ansari
0db383499e
Merge pull request #11555 from netchampfaris/website_theme_hook
2020-09-24 14:13:16 +05:30
Faris Ansari
45e461a10a
Merge pull request #11527 from netchampfaris/override-doctype-class
2020-09-24 14:11:57 +05:30
Rucha Mahabal
175c2fdb65
Merge branch 'develop' into fix-duration-control-import-export
2020-09-23 09:39:32 +05:30
gavin
e8ee4bd867
Merge branch 'develop' into compress-files
2020-09-22 10:56:17 +05:30
barredterra
f06807daab
Merge branch 'develop' into website_theme_hook
2020-09-21 14:02:50 +02:00
Gavin D'souza
ab3b574e53
Merge branch 'develop' of github.com:frappe/frappe into compress-files
2020-09-21 11:11:52 +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
f2a6f3dd21
fix: Add example in boilerplate
2020-09-18 17:12:26 +05:30
barredterra
7fe2b356ec
Merge branch 'develop' into website_theme_hook
2020-09-18 13:30:07 +02:00
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
Gavin D'souza
bbdb05378b
fix: Deprecate site_config_backup_path in favour of backup_path_conf
2020-09-15 17:30:26 +05:30
Afshan
5377d65cad
fix: removed print statements
2020-09-15 16:40:24 +05:30
Afshan
772153da11
fix: setting "self.setting site_config_backup_path"
2020-09-15 16:20:58 +05:30
gavin
f710ad095f
Merge pull request #11436 from gavindsouza/build-assets
...
feat: Ship built assets
2020-09-15 13:01:38 +05:30
Faris Ansari
8f0f17eb7e
fix: Render web blocks using web_template.render
...
- web_block object need not be a WebPageBlock instance
2020-09-14 15:23:14 +00:00
