Commit graph

23166 commits

Author SHA1 Message Date
Himanshu Warekar
c336424fa4 fix: codacy fixes 2019-12-04 23:13:43 +05:30
Himanshu Warekar
f616a7c814 Merge branch 'develop' of https://github.com/frappe/frappe into pref_global_search 2019-12-04 23:13:27 +05:30
prssanna
cb8ccffb37 fix: add mandatory_depends_on and read_only_depends_on to customize form 2019-12-04 21:35:32 +05:30
prssanna
b95129d34d fix(tests): add ui tests 2019-12-04 21:35:32 +05:30
prssanna
6b07bde29a fix: check if this.frm exists 2019-12-04 21:34:49 +05:30
prssanna
6f87f4e7bc fix: code formatting 2019-12-04 21:34:49 +05:30
prssanna
1026800ee0 feat: add mandatory_depends_on and read_only_depends_on to docfield 2019-12-04 21:34:49 +05:30
Rucha Mahabal
65ac0f3982 fix: resume after reload broken 2019-12-04 19:30:14 +05:30
Rucha Mahabal
e1454c20ec fix: codacy fixes 2019-12-04 18:19:15 +05:30
Rucha Mahabal
0b19bc3790 refactor: simplified calls 2019-12-04 17:56:05 +05:30
Rucha Mahabal
74fe3c71f7 feat: style only onboarding wizard 2019-12-04 17:20:22 +05:30
Rucha Mahabal
a8076cfefe feat: added validation for slide with same order 2019-12-04 17:11:29 +05:30
Rucha Mahabal
36dd074dcc fix: added is_last_slide method in slides 2019-12-04 16:21:18 +05:30
Rucha Mahabal
d9bbd10382 fix: added a 'Continue' type slide 2019-12-04 15:59:38 +05:30
mergify[bot]
af67d81b7b
Merge pull request #8786 from prssanna/child-table-pagination
feat: Child table pagination
2019-12-04 08:09:37 +00:00
Shivam Mishra
71b398c7c6 style: aded semi colon 2019-12-04 13:11:03 +05:30
Shivam Mishra
5414f1897f fix: query report chart options 2019-12-04 12:41:42 +05:30
prssanna
146c4d46cb fix: change function name to go_to_last_page_to_add_row 2019-12-04 11:59:35 +05:30
Rohit Waghchaure
8b74628770 fix: Color not working in the calendar 2019-12-04 11:27:30 +05:30
mergify[bot]
ac7c5837c5
Merge pull request #8861 from alias/frappe_org_dev
fix: Allow to delete custom doctype with custom module
2019-12-03 16:17:45 +00:00
mergify[bot]
e193746a91
Merge pull request #8873 from Mangesh-Khairnar/add-yearly-in-dashboard
feat: Add all time in dashboard charts
2019-12-03 15:59:32 +00:00
DeeMysterio
c06be49f6c feat(tags): accept click to enter tags (#8826)
* feat(tags): accept click to enter tags

* fix: refactor code

* fix: refactor code

* style: Fix Codacy
2019-12-03 16:58:33 +05:30
mergify[bot]
4893ef5c78
Merge pull request #8933 from ruchamahabal/filter_doctypes_for_bulk_update
fix: Restrict DocTypes in Bulk Update Tool
2019-12-03 11:06:16 +00:00
Rucha Mahabal
bc577d5a9f fix: don't set filter for restrict_to_domain in Bulk Update Tool 2019-12-03 16:09:30 +05:30
mergify[bot]
27fcb322d9
Merge pull request #8939 from revant/fix-social-login-develop
fix(integration): Social Login Key
2019-12-03 10:10:53 +00:00
Himanshu Warekar
65402bc2fa tests: fix results being return 2019-12-03 15:27:10 +05:30
Himanshu Warekar
86e1d0367b Merge branch 'develop' of https://github.com/frappe/frappe into pref_global_search 2019-12-03 14:25:04 +05:30
Revant Nandgaonkar
de6ec7985a fix(integration): Social Login Key
add missing field
2019-12-03 12:41:35 +05:30
Shivam Mishra
1898b2fb0e fix: use hasattr to verify links (#8938)
* fix: use hasattr to verify links

* fix: verify length explicitly

* style: remove unnecessary call to len
2019-12-03 07:11:04 +00:00
Ben Knowles
a8914a2cbd fix: REST API utf-8 decoding on creates/updates (#8875)
* fix: REST API utf-8 decoding on creates/updates

Creating or updating a document via the REST API would generate an error of:

`TypeError: the JSON object must be str, not 'bytes'`

Because get_data() returns bytes which must be explicitly converted to a string before parsing as JSON.

Defect introduced by efe94886a and a71a92341e

* fix: switch to safe_decode
2019-12-03 06:44:11 +00:00
Rucha Mahabal
5b16efd1e7 chore: code cleanup for the old doctype Setup Wizard Slide 2019-12-02 17:23:13 +05:30
mergify[bot]
07f3a87f0b
Merge pull request #8863 from scmmishra/null-state
feat: added a null state to list view
2019-12-02 11:49:19 +00:00
Shivam Mishra
3c3c0b2252 Merge branch 'develop' of https://github.com/frappe/frappe into null-state 2019-12-02 16:46:05 +05:30
Anurag Mishra
5aad587a4a
fix: Showing quotes in string (#8904) 2019-12-02 16:33:58 +05:30
Rucha Mahabal
398d5bad6f fix: do not allow bulk update for core, single doctypes and doctypes from inactive domains 2019-12-02 14:58:09 +05:30
Suraj Shetty
7e1834548c fix: Codacy 2019-12-02 14:22:17 +05:30
Suraj Shetty
bd69e8cff3 Merge branch 'develop' of https://github.com/frappe/frappe into child-table-pagination 2019-12-02 14:05:46 +05:30
mergify[bot]
56caf0707a
Merge pull request #8486 from rmehta/refactor-scheduler
refactor(scheduler): created "Scheduler Job Type" and cleaned up scheduler
2019-12-02 08:03:41 +00:00
Suraj Shetty
14fc9dc860
Merge pull request #8910 from netchampfaris/print-format-fixes
fix: Print Format Fixes
2019-12-02 13:29:17 +05:30
Faris Ansari
488c68df96
Merge branch 'develop' into refactor-scheduler 2019-12-02 13:16:45 +05:30
Saqib
1aa7824af5 fix(IntControl): Check for arithmetic expression before eval (#8813)
* fix: int eval_expression only checks for comma

* fix: get_number_format called for int fields
* int control doesn't have get_number_format

* fix(Numeric fields): Only match valid arithmetic expressions
2019-12-02 13:05:46 +05:30
Himanshu Warekar
9c57d80769 fix: rename function to set 2019-12-02 13:05:06 +05:30
Shivam Mishra
d648c4e1b9 refactor (breaking): rename Setup Wizard slide to Onboarding Slide 2019-12-02 13:03:39 +05:30
Shivam Mishra
b6418ca059 style: remove stray code and added semicolon 2019-12-02 13:03:00 +05:30
mergify[bot]
d847233f02
Merge pull request #8921 from netchampfaris/website-route-meta-fixes
fix: Website Route Meta fixes
2019-12-01 16:49:19 +00:00
Suraj Shetty
0a3638d1f1
test: Fix list_view test by removing clear-cache code (#8929)
test: Fix list_view test by removing clear-cache code
2019-12-01 18:56:35 +05:30
Suraj Shetty
7629f07dbf test: Try removing clear-cache 2019-12-01 13:32:28 +05:30
Suraj Shetty
d41ca958ab test: Move wait to list_view.js 2019-12-01 12:36:21 +05:30
Suraj Shetty
9f3b0b59fc test: Fix listview test by waiting for clear-cache 2019-12-01 11:41:11 +05:30
Himanshu Warekar
4aec95809f fix: ignore args if Tag Link 2019-11-30 19:07:27 +05:30