vassili/seitime-frappe
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 4
24065 commits 1 branch 0 tags 587 MiB
Commit graph

24065 commits

This branch
This branch
All branches
Author SHA1 Message Date
Suraj Shetty
7ea493d9b7
Merge branch 'develop' into logout-message 2020-04-01 22:20:22 +05:30
Suraj Shetty
d73f8d85db
style: Fix formatting & remove unnecessary comment 2020-04-01 22:18:23 +05:30
Kenneth Sequeira
1413505422 fix syntax 2020-04-01 20:57:24 +05:30
Kenneth Sequeira
abbd920320 add comments for separation logic 2020-04-01 20:37:00 +05:30
Kenneth Sequeira
27074e95da improve error message for logged out user 2020-04-01 18:56:30 +05:30
gavin
0177c03139
Merge pull request #9784 from gavindsouza/data-options 
feat: Validate Data options and Data values
 2020-04-01 14:00:48 +05:30
Suraj Shetty
a8af9e91bc style: Fix indentation 2020-04-01 12:48:00 +05:30
Gavin D'souza
b5a9250574 tests: simplifying test_data_field_options 
Co-authored-by: Suraj Shetty <13928957+surajshetty3416@users.noreply.github.com>
 2020-04-01 12:00:03 +05:30
mergify[bot]
843469d268
Merge pull request #9789 from prssanna/dashboard-permissions 
refactor(Dashboard): Refactor dashboard permissions
 2020-04-01 05:35:42 +00:00
Gavin D'souza
9393c05b13 tests: updated tests to cover more data field options 2020-04-01 10:47:43 +05:30
rohitwaghchaure
62c5c0e6f9
Merge pull request #9822 from rohitwaghchaure/fixed_roles_not_refreshing_in_role_profiles_develop 
fix: navigate between role profiles not changes the roles
 2020-03-31 16:50:09 +05:30
Rohit Waghchaure
1d4a14802e fix: navigate between role profiles not changes the roles 2020-03-31 16:47:45 +05:30
prssanna
d0aa01367b fix: show message if there are no permitted charts on a dashboard 2020-03-31 16:28:08 +05:30
prssanna
d9f1a85d00 fix: only encode if type is not str 2020-03-31 16:23:12 +05:30
prssanna
5600d84d3c fix: don't show dashboard chart if not permitted 2020-03-31 16:01:57 +05:30
mergify[bot]
b0af57cbce
Merge pull request #9610 from Alchez/dev-webform-custom-js-css 
feat: include custom JS and CSS files in web form
 2020-03-31 08:58:04 +00:00
Suraj Shetty
391f3da184
Merge pull request #9773 from surajshetty3416/fix-workflow-action-eval 
refactor: Commonify transition condition evaluation
 2020-03-31 14:24:05 +05:30
Gavin D'souza
25d260d5c4 test(DocType): added test_data_field_options 2020-03-31 14:16:01 +05:30
Suraj Shetty
76d19f1567
Merge branch 'develop' into dev-webform-custom-js-css 2020-03-31 10:37:35 +05:30
Prssanna Desai
705758cc01
fix(patch): set parent and parenttype as None for print formats (#9801) 
* fix(patch): set parent and parenttype as None for print formats

* fix: remove empty file

Co-authored-by: Himanshu <himanshuwarekar@yahoo.com>
 2020-03-31 04:45:40 +00:00
mergify[bot]
c5f80a704f
Merge pull request #9814 from nabinhait/duplicate-contact-email 
fix: Duplicate check before inserting in contcat email table
 2020-03-30 16:29:43 +00:00
Nabin Hait
006609f59e fix: Duplicate check before inserting in contcat email table 2020-03-30 19:34:36 +05:30
Suraj Shetty
ba6a73bd34
Merge branch 'develop' into data-options 2020-03-30 13:06:41 +05:30
prafful1234
737ecae59d
feat(website): fetch email comments in issue portal (#9657) 
* feat(website): fetch email comments in issue portal

* fix: deepsource issues

Signed-off-by: Chinmay D. Pai <chinmaydpai@gmail.com>

* chore: remove unnecessary import

not sure how i missed it

Signed-off-by: Chinmay D. Pai <chinmaydpai@gmail.com>

Co-authored-by: prafful1234 <prafful@mntechnique.com>
Co-authored-by: Suraj Shetty <13928957+surajshetty3416@users.noreply.github.com>
Co-authored-by: Chinmay D. Pai <chinmaydpai@gmail.com>
 2020-03-30 12:53:21 +05:30
mergify[bot]
d9ea19d98b
Merge pull request #9810 from nabinhait/doctype-action-reload 
fix: Get valid columns from meta only if table exists
 2020-03-30 07:06:06 +00:00
Nabin Hait
a5fc3d82dd fix: Get valid columns from meta only if table exists (for doctype action) 2020-03-30 11:59:27 +05:30
Gavin D'souza
32982a34c9 Merge branch 'data-options' into data-options 2020-03-30 11:20:59 +05:30
Gavin D'souza
6c350f6c7b chore: update msgprint title 
fix: circular import
 2020-03-30 11:19:15 +05:30
Suraj Shetty
0a65266c1e
Merge branch 'develop' into data-options 2020-03-30 10:44:25 +05:30
Gavin D'souza
a8e1e1c976 style: remove extra spaces for consistency 2020-03-30 10:37:16 +05:30
Gavin D'souza
cf9440439e fix: translatable string for data field options 2020-03-30 10:37:08 +05:30
Gavin D'souza
11aefbd8ed fix: dont validate email if owner and email_data is in STANDARD_USERS 2020-03-30 10:18:30 +05:30
Gavin D'souza
e57a5d347d chore: update .eslintrc globals 
style: updated data.js spacing format
 2020-03-30 10:16:39 +05:30
Suraj Shetty
6dd5d3174e
Merge branch 'develop' into dev-webform-custom-js-css 2020-03-30 10:07:12 +05:30
mergify[bot]
b4323dce9c
Merge pull request #8603 from hrwX/custom_append_to 
feat(Email Account): Allow email append to for other doctypes
 2020-03-29 16:27:45 +00:00
mergify[bot]
8625047847
Merge pull request #9803 from deepeshgarg007/role_permission 
fix(permission-manager): Hide create, write options for DocTypes which cannot be created
 2020-03-29 16:23:43 +00:00
Deepesh Garg
18664430c4 fix: Do not show create, write and delete perm in role permission manager for doctypes with in_create property set 2020-03-28 21:06:56 +05:30
Suraj Shetty
47a19ce6e5
fix(api): Parse data as json only if data is string (#9791) 
* fix: Json load data only if data is string

* refactor: Simplify code
 2020-03-27 22:54:56 +05:30
Himanshu Warekar
5a5fed29d2 Merge branch 'custom_append_to' of https://github.com/hrwx/frappe into custom_append_to 2020-03-27 15:17:08 +05:30
Himanshu Warekar
7b7e4f1aaf fix: move sender field 2020-03-27 15:13:20 +05:30
mergify[bot]
4198fc3b4d
Merge pull request #9798 from rmehta/markdown-wrap-text 
fix(control): Wrap text in markdown editor
 2020-03-27 08:30:20 +00:00
Himanshu Warekar
2374e4da14 Merge branch 'develop' of https://github.com/frappe/frappe into custom_append_to 2020-03-27 13:18:02 +05:30
Suraj Shetty
2f697ef290
Merge pull request #9792 from surajshetty3416/fix-response-message 
fix: Response message style
 2020-03-27 12:51:00 +05:30
Suraj Shetty
d12dd9ad69
Merge branch 'develop' into custom_append_to 2020-03-27 12:34:25 +05:30
mergify[bot]
93f209ba81
Merge pull request #9795 from deepeshgarg007/is_default_perm 
fix: Default value not getting set from user permission
 2020-03-27 06:47:34 +00:00
Rushabh Mehta
dbc7a7eb08 fix(minor): wrap text in markdown editor 2020-03-27 11:40:05 +05:30
Himanshu Warekar
595979eb1f Merge branch 'develop' of https://github.com/frappe/frappe into custom_append_to 2020-03-27 11:16:41 +05:30
mergify[bot]
85f9a7a37d
Merge pull request #9753 from prssanna/sidebar-spacing 
fix: List sidebar style improvements
 2020-03-26 17:55:42 +00:00
Suraj Shetty
5566294594
Merge branch 'develop' into is_default_perm 2020-03-26 23:13:57 +05:30
prssanna
7f3a91946b fix: fix spacing of group by fields on list sidebar 2020-03-26 19:05:02 +05:30