Commit graph

1395 commits

Author SHA1 Message Date
Himanshu Warekar
12ca630c52 fix: merge code 2020-05-14 17:22:51 +05:30
Himanshu Warekar
aa98d6ffb6 fix: sider changes 2020-05-14 16:37:14 +05:30
Himanshu Warekar
c14b6c592a fix: move code to meta.py 2020-05-14 16:27:34 +05:30
Himanshu Warekar
9bbcaf49a8 Merge branch 'develop' of https://github.com/frappe/frappe into custom_frm_dashboard 2020-05-13 11:54:12 +05:30
Suraj Shetty
d53b88a72f
perf: Make tests faster (#10307)
* feat: Ignore versions for test

* test: Do not ignore version where needed

* perf: Use frappe.db.get_single_value to leverage caching

- frappe.get_cached_value does not support single value caching

* style: Fix sider issue
2020-05-12 22:34:10 +05:30
Shivam Mishra
48382fdca0 refactor: rename onboarding to module onboarding 2020-05-12 16:23:26 +05:30
prssanna
4508c6be99 fix: fix error when group is set in link 2020-05-08 15:43:56 +05:30
Prssanna Desai
25884d2370
fix: Linking of doctype from links table (#10267)
* fix: fix linking of doctype from links table

* fix: use frappe._dict

Co-authored-by: Suraj Shetty <13928957+surajshetty3416@users.noreply.github.com>
2020-05-08 09:59:29 +00:00
Suraj Shetty
38c840a07f
Merge branch 'develop' into fix-link-grouping 2020-05-08 14:19:05 +05:30
Rushabh Mehta
9724cc273a fix(minor): In add_doctype_links, use frappe._dict 2020-05-08 12:33:25 +05:30
Shivam Mishra
961fbf6594 feat: sync number cards 2020-05-06 17:26:28 +05:30
Shivam Mishra
db152b28de feat: sync dashboards after setup and migrate 2020-05-06 14:45:07 +05:30
mergify[bot]
c59418cadb
Merge pull request #10194 from scmmishra/modulewise-onboarding
feat: modulewise onboarding via new desk
2020-05-04 13:32:52 +00:00
Shivam Mishra
b6478bf8e9 style: linting fixes for deepsource 2020-05-01 12:12:56 +05:30
Shivam Mishra
65e9040062 Merge branch 'develop' of github.com:frappe/frappe into modulewise-onboarding 2020-04-30 19:23:04 +05:30
Shivam Mishra
f9c9505305 feat: sync onboarding permissions 2020-04-30 18:47:33 +05:30
Suraj Shetty
9274c6c7eb
Merge branch 'develop' into event_streaming_mapping_fix 2020-04-30 17:20:49 +05:30
Shivam Mishra
1732f5b4cf feat: import onboarding step along with onboarding 2020-04-28 22:17:02 +05:30
Suraj Shetty
689b68341e fix: Add __unsaved flag for newly created doc 2020-04-28 14:07:29 +05:30
Shivam Mishra
3714b8b79e feat: added onboarding and onboarding step to sync 2020-04-26 12:56:40 +05:30
Faris Ansari
f7109d6294 Merge branch 'develop' of https://github.com/frappe/frappe into page-builder-tailwind-blurred-images 2020-04-25 19:52:17 +05:30
Suraj Shetty
1c3077b259
fix: Clear __unsaved flag in insert method (#10094) 2020-04-25 11:56:55 +05:30
rohitwaghchaure
9c78c5b564
fix: don't reset the child doc fields value for new record (#10090) 2020-04-25 10:47:13 +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
mergify[bot]
4e3706763a
Merge pull request #10040 from Thunderbottom/data-validation-fix
fix: skip validation if oldfieldtype is not set to data
2020-04-24 17:26:11 +00:00
Shivam Mishra
daed4ff49d feat: remove onboarding slide completely 2020-04-24 14:08:42 +05:30
Suraj Shetty
d678fc62ab
fix: Clear __unsaved flag after document save (#10082) 2020-04-24 11:25:36 +05:30
Suraj Shetty
9122866c62
fix: Consider __unsaved flag while getting doc as_dict (#10067)
Co-authored-by: Prssanna Desai <prssud@gmail.com>

Co-authored-by: Prssanna Desai <prssud@gmail.com>
2020-04-23 20:38:33 +05:30
mergify[bot]
b18f7866d9
Merge pull request #10046 from rohitwaghchaure/fixed-user-permissions-issue-develop
fix: ignore user permissions not working from the JS side
2020-04-22 08:41:53 +00:00
mergify[bot]
7fb8dac072
Merge pull request #10030 from Thunderbottom/validate-name-data-options
feat: Add name validation to data fieldtype
2020-04-22 07:43:25 +00:00
Rohit Waghchaure
02b3ccc935 fix: ignore user permissions not working from the JS side 2020-04-22 12:49:24 +05:30
Chinmay D. Pai
27b5819e34
fix: skip validation if oldfieldtype is not set to data
Signed-off-by: Chinmay D. Pai <chinmaydpai@gmail.com>
2020-04-22 11:55:46 +05:30
Faris Ansari
ff0fa956a9 fix: Add Web Template to sync list
So that json files are synced when app is installed
2020-04-21 19:24:22 +05:30
Chinmay D. Pai
108fa0f42e
fix: sanitize all html input
use beautifulsoup to parse if string contains html and then sanitize the
input html

Signed-off-by: Chinmay D. Pai <chinmaydpai@gmail.com>
2020-04-21 17:22:44 +05:30
Chinmay D. Pai
1dfa8ccbc4
feat: add name validation to data fieldtype
Signed-off-by: Chinmay D. Pai <chinmaydpai@gmail.com>
2020-04-21 15:49:55 +05:30
Rucha Mahabal
c28ad1eed5 fix: conflicts 2020-04-21 00:06:11 +05:30
Rucha Mahabal
11015a8dd9
Merge branch 'develop' into event_streaming_mapping_fix 2020-04-20 23:59:59 +05:30
Aditya Hase
6f1caf101f fix: Check if Event Consumer exists before checking for consumers
the logic for event streaming has been hardcoded into `document.py`

Scenario:
a site (say, v12) backup needs to be restored on a v13 bench and then updated

Solution:
use `bench migrate`; works flawlessly.

However, if this site has an app installed that isn't available on the v13 bench,
then bench migrate fails.

Also, `bench remove-from-installed-apps` fails,
because of the absence of "Event Consumer"
2020-04-20 12:54:30 +05:30
Rushabh Mehta
9f26548b31 fix(minor): update web page test and allow dashboards for custom doctype 2020-04-19 18:01:06 +05:30
Suraj Shetty
3e43886e1d
Merge branch 'develop' into event_streaming_mapping_fix 2020-04-17 12:10:32 +05:30
Suraj Shetty
6e58c84770
Merge branch 'develop' into delete-mes 2020-04-16 14:11:44 +05:30
Himanshu
5bb489c637
Update frappe/model/delete_doc.py 2020-04-16 10:06:41 +05:30
Prssanna Desai
a5daf8ffa1
fix: check if field is a default field before getting df (#9953) 2020-04-15 19:34:12 +05:30
Shivam Mishra
7651df7bed Merge branch 'develop' of github.com:frappe/frappe into field-strip-html 2020-04-13 14:04:22 +05:30
Kenneth Sequeira
24a8b03639 chore: improve error message on delete 2020-04-08 20:27:38 +05:30
Himanshu Warekar
e61a5f0ea3 Merge branch 'develop' of https://github.com/frappe/frappe into custom_frm_dashboard 2020-04-08 18:47:42 +05:30
Himanshu Warekar
9e139171f4 feat: custom form dashboards 2020-04-08 18:35:49 +05:30
Suraj Shetty
284c70809b fix: Translatable strings with trailing spaces 2020-04-08 14:20:52 +05:30
prssanna
5b5d8031ce fix: use .get() to set fieldtype 2020-04-07 18:11:39 +05:30
mergify[bot]
7a35f70d89
Merge pull request #9833 from marination/change-workflow-status-title
fix: Changed 'Errored' to 'Failed' Transactions in Bulk Workflow Status prompt
2020-04-02 11:56:13 +00:00