Commit graph

36088 commits

Author SHA1 Message Date
gavin
50121b0f5b
Merge pull request #14382 from frappe/mergify/bp/develop/pr-14321
fix: include 'Duration' in fieldtype to fetch (fix #13625) (backport #14321)
2021-10-08 11:41:28 +05:30
Ankush Menat
e6bbc698d0
ci: fail CI if asset bundling fails (#14364)
* ci: fail CI if asset bundling fails

* chore: formatting

Co-authored-by: Suraj Shetty <13928957+surajshetty3416@users.noreply.github.com>
2021-10-08 11:40:31 +05:30
gavin
ce3e9244f0
Merge pull request #14371 from mituldavid/comment-imgs
fix: Make images in comments private
2021-10-08 11:39:18 +05:30
Shariq Ansari
f08584c06d fix: Fixed redirect to newly created workspace 2021-10-08 11:04:43 +05:30
gavin
9206635f81
Merge pull request #14393 from gavindsouza/py39
ci: Upgrade PY37 to PY39
2021-10-08 11:04:33 +05:30
Suraj Shetty
3a004d38db test: Fix flaky test
- Due to improper cleanup one of the test of Energy Point was failing
2021-10-08 09:39:31 +05:30
Suraj Shetty
efdd267cd5 Merge branch 'develop' of https://github.com/frappe/frappe into shareable-link-for-comments 2021-10-08 09:00:43 +05:30
Suraj Shetty
59e0501cc7 test: Fix timeline tests 2021-10-08 08:58:52 +05:30
Suraj Shetty
f1c5fc4fe6 feat: Shareable link for comments and communications
- Also, highlight comment/communication that has been shared.
2021-10-07 21:50:08 +05:30
Suraj Shetty
3537316a2a fix: Routing with hash in URL
- Hash in document name should be encoded
2021-10-07 20:40:44 +05:30
Gavin D'souza
42acb7647f ci: Upgrade Py37 to Py39 2021-10-07 20:33:50 +05:30
Shariq Ansari
f7ad01cb64 fix: Update check all checkbox based on checked rows in List View 2021-10-07 19:38:42 +05:30
gavin
a5fab59ab4
Merge pull request #14370 from sunhoww/patch-1
feat: expose frappe.db.exists to Server Script
2021-10-07 18:02:05 +05:30
rohitwaghchaure
5ac02d275a
Merge pull request #14388 from rohitwaghchaure/option-to-set-size-for-multi-select-dialog
feat: option to set the width for the multi-select dialog box
2021-10-07 17:37:42 +05:30
Rohit Waghchaure
6886036002 feat: option to set the width for the multi-select dialog box 2021-10-07 17:32:45 +05:30
rohitwaghchaure
660f187ce5
Merge pull request #14386 from rohitwaghchaure/fixed-dialog-box-not-showing
fix: custom dialog box not working
2021-10-07 16:51:44 +05:30
Rohit Waghchaure
f7a8ee7756 fix: custom dialog box not working 2021-10-07 16:50:12 +05:30
Shariq Ansari
8653b90ec6 fix: Replacing -webkit-grabbing with grabbing 2021-10-07 16:44:20 +05:30
MitulDavid
05cb2c16cd fix: Optional parameter for setting extracted image as private 2021-10-07 16:41:44 +05:30
Shariq Ansari
6c450e9d9d fix: Fixed minimized modal border shadow 2021-10-07 16:18:33 +05:30
Shariq Ansari
7230b7e8e4 fix: sider fix 2021-10-07 16:06:27 +05:30
Sagar Vora
6b91ade73c
fix: convert_dates_to_str converts everything except date objects (#14340)
Co-authored-by: Suraj Shetty <13928957+surajshetty3416@users.noreply.github.com>
2021-10-07 15:58:23 +05:30
Shariq Ansari
1133f62586 fix: Added translation to blocks and sidebar items 2021-10-07 15:55:29 +05:30
Suraj Shetty
0879c35cbc
chore: Only show server side coverage for now 2021-10-07 15:50:34 +05:30
Rémi de Chazelles
0f73909d60 fix: include 'Duration' in fieldtype to fetch
(cherry picked from commit 06ad3b534c3131504dcf481be29cb8e1a78739ae)
2021-10-07 10:08:21 +00:00
Suraj Shetty
0a7500e165
Merge pull request #14277 from leela/fix-date-display 2021-10-07 15:20:50 +05:30
pateljannat
d19864a6a7 fix: sider 2021-10-07 15:18:54 +05:30
Shariq Ansari
75a9b9c836 fix: Redirect to private home if it exist 2021-10-07 14:22:14 +05:30
Suraj Shetty
9761809602
Merge pull request #14376 from anupamvs/network-printer-settings-permission 2021-10-07 12:58:52 +05:30
Suraj Shetty
02091df1c5
Merge branch 'develop' into network-printer-settings-permission 2021-10-07 12:56:19 +05:30
pateljannat
bee2491221 test: ui test for single thread 2021-10-07 12:53:19 +05:30
gavin
b34178a384
docs: Fix links in README 2021-10-07 12:51:44 +05:30
mergify[bot]
31ef7c4b0a
Merge pull request #14360 from pateljannat/frappe-school-link-in-readme
docs: frappe school link in readme
2021-10-07 07:20:27 +00:00
Gavin D'souza
3a5b967bfe docs: Update README
* Fix Table of contents
* Restructure and reword Resources section
* Link code of conduct & security policy to README
2021-10-07 12:45:18 +05:30
Anupam
5387e48a59 fix: network printer settings permission issue 2021-10-07 12:11:29 +05:30
Shariq Ansari
644775a139
Merge branch 'frappe:develop' into primary-navbar-css-fix 2021-10-07 11:54:16 +05:30
Shariq Ansari
6b91d65172
Merge branch 'frappe:develop' into hide-show-filter 2021-10-07 11:53:11 +05:30
Shariq Ansari
8f103e9d92
Merge branch 'frappe:develop' into modal-scrollbar-fix 2021-10-07 11:52:29 +05:30
Suraj Shetty
c8efaf49c5
Merge pull request #14373 from anupamvs/print-issue 2021-10-07 10:44:49 +05:30
Anupam
34ba19a131 fix: browser printing broken 2021-10-07 10:27:47 +05:30
pateljannat
e7ad5f2c29 fix: single thread without refresh 2021-10-07 09:38:40 +05:30
MitulDavid
d254ca2f50 fix: Make images in comments private 2021-10-06 17:37:20 +05:30
Sun Howwrongbum
1d9000fd85
feat: expose frappe.db.exists to Server Script 2021-10-06 14:21:03 +05:30
Shariq Ansari
f0e7605b65
fix: Resolved redefine object issue on webform load (#14367) 2021-10-06 14:18:46 +05:30
Suraj Shetty
db9b3e1313
Merge pull request #14269 from mituldavid/coverage 2021-10-06 13:29:40 +05:30
Aradhya-Tripathi
2a241bd2dc style: formatted code 2021-10-05 18:23:46 +05:30
Aradhya-Tripathi
3b25bde3ac feat: Added tests for SafeQB 2021-10-05 18:14:06 +05:30
Aradhya-Tripathi
6c706ec000 fix: fixed multitenancy in safeqb 2021-10-05 18:13:32 +05:30
Shariq Ansari
90fe1799d6
Merge branch 'develop' into change-drag-icon 2021-10-05 17:28:27 +05:30
Shariq Ansari
dc9f6a58c8 fix: Resolved conflict 2021-10-05 17:26:52 +05:30