Commit graph

24146 commits

Author SHA1 Message Date
Suraj Shetty
7b4e2ce728 fix: KeyError while session start 2020-04-07 12:34:23 +05:30
Faris Ansari
5b95bee018
Merge branch 'develop' into contextual-translation 2020-04-03 18:16:20 +05:30
mergify[bot]
245ef7d383
Merge pull request #9830 from prssanna/save-dashboard-filters
feat(Dashboard): Save dashboard chart config for user
2020-04-03 12:18:19 +00:00
mergify[bot]
9a7f55c68a
Merge pull request #9799 from Thunderbottom/global-search-sqli
fix: avoid sqli inside global web search
2020-04-03 07:14:54 +00:00
mergify[bot]
02b256b089
Merge pull request #9743 from Thunderbottom/ldap-password-reset
feat(ldap): allow resetting ldap password from user settings
2020-04-03 05:41:17 +00:00
Chinmay D. Pai
1f3f8b9246
chore: fix codacy issues
Signed-off-by: Chinmay D. Pai <chinmaydpai@gmail.com>
2020-04-03 09:57:44 +05:30
Chinmay D. Pai
5a4251bce8
chore: add test to check null result
Signed-off-by: Chinmay D. Pai <chinmaydpai@gmail.com>
2020-04-03 09:54:34 +05:30
Suraj Shetty
85fe41ae95
Merge pull request #9846 from surajshetty3416/timeline-fix
fix: Variable undefined issue in timeline
2020-04-03 09:21:38 +05:30
Suraj Shetty
746096617a
Merge branch 'develop' into timeline-fix 2020-04-03 08:35:00 +05:30
Suraj Shetty
a16159b67f chore: Move CODEOWNERS file to root folder 2020-04-03 08:33:42 +05:30
Suraj Shetty
12c16ff518 fix: Variable undefined issue in timeline 2020-04-03 00:51:48 +05:30
Suraj Shetty
4b8567170c
Merge pull request #9841 from surajshetty3416/codeowners-file
chore: Add CODEOWNERS file
2020-04-02 21:02:10 +05:30
Suraj Shetty
277de227e5 chore: Add CODEOWNERS file
- To automate reviewer assignment
2020-04-02 20:49:13 +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
Suraj Shetty
1c8d945b33 fix: Translation map str 2020-04-02 12:45:10 +05:30
prssanna
ae8dd80dc0 fix: code formatting 2020-04-02 12:14:31 +05:30
prssanna
40d8947ddf fix: set from date and do date as null when timespan is select date range 2020-04-02 12:12:40 +05:30
prssanna
a50492eae4 feat: add button to reset default chart config 2020-04-02 12:12:40 +05:30
prssanna
f79a43d5f3 feat: save dashboard chart config for user 2020-04-02 12:12:40 +05:30
mergify[bot]
c1533cfb95
Merge pull request #9777 from prssanna/report-export-columns
fix(Report): Export custom columns in Excel
2020-04-02 06:16:48 +00:00
mergify[bot]
22dc36faba
Merge pull request #9828 from MorezMartin/redis_wrapper_error
fix(redis): Explicitly pass parameter values
2020-04-01 17:53:51 +00:00
Suraj Shetty
ac464f2b99
Merge branch 'develop' into redis_wrapper_error 2020-04-01 23:10:07 +05:30
mergify[bot]
7c7e5c6eca
Merge pull request #9838 from kennethsequeira/logout-message
fix: Improve error message for logged-out user
2020-04-01 17:10:14 +00:00
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
Suraj Shetty
fc3b47f610 fix: Translator UI
- Fix scroll css
- Re-organize additional info
- Restructure translator tool dom
2020-04-01 19:49:10 +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
Suraj Shetty
fe54fb67c9 refactor: generate_report_result method
- to fix codacy complexity issue
2020-04-01 12:34:18 +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
marination
ea52e51766 fix: Change 'Errored' to 'Failed' Transactions in Bulk Workflow Status prompt 2020-04-01 11:55:42 +05:30
Suraj Shetty
a1ecb4320e
Merge branch 'develop' into redis_wrapper_error 2020-04-01 11:15:43 +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
Suraj Shetty
3d6916631d Merge branch 'develop' of https://github.com/frappe/frappe into contextual-translation 2020-04-01 00:11:32 +05:30
Faris Ansari
17f3050422 fix: Translation Tool
- Show edited translations in table
- Show contributed translations in form

Co-authored-by: Suraj Shetty <surajshetty3416@gmail.com>
2020-04-01 00:04:44 +05:30
Faris Ansari
4bb688462e style: Formatting
Co-authored-by: Suraj Shetty <surajshetty3416@gmail.com>
2020-04-01 00:04:37 +05:30
Frappe Bot
a240ed3bf3 chore: Add updated translations 2020-03-31 23:45:41 +05:30
Suraj Shetty
c7f462c370
Merge branch 'develop' into redis_wrapper_error 2020-03-31 21:18:47 +05:30
marty
256428572f resolve error redis_wrapper 2020-03-31 12:54:30 +00:00
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