Commit graph

24165 commits

Author SHA1 Message Date
Suraj Shetty
953d0f273e
chore(CODEOWNERS): Update owners 2020-04-09 11:45:03 +05:30
Suraj Shetty
2978d1cc0b
Merge pull request #9867 from prssanna/notifications-settings-list
feat: Allow System Managers to view Notification Settings list
2020-04-09 11:43:17 +05:30
Suraj Shetty
bb87ce2b11
chore(CODEOWNERS): Remove comma 2020-04-09 11:10:33 +05:30
prssanna
ab383b5bee style: fix indent 2020-04-09 10:59:27 +05:30
mergify[bot]
afdcd5b355
Merge pull request #9873 from prssanna/chart-type-fix
fix: allow dashboard chart type to be set only once
2020-04-09 04:32:01 +00:00
Suraj Shetty
029b8f0a35
fix: Remove Admin role from check 2020-04-09 09:40:42 +05:30
Prssanna Desai
1fc2f0d27c
fix: bread word if too long in link preview popover (#9869) 2020-04-09 04:01:36 +00:00
mergify[bot]
a8b4dd3911
Merge pull request #9865 from gavindsouza/update-data-options
fix: enable validations for email and phone data fields
2020-04-08 13:56:12 +00:00
mergify[bot]
53e627e479
Merge pull request #9871 from Alchez/dev-update-gender-salutation
fix: update gender and update salutations (v12)
2020-04-08 13:36:55 +00:00
prssanna
3713a53a96 fix: allow dashboard chart type to be set only once 2020-04-08 18:55:51 +05:30
PriyankaGangar
65abe3d734 fix: update gender and update salutations 2020-04-08 17:49:14 +05:30
prssanna
58fe724428 refactor: allow system managers to view notification settings list for all users 2020-04-08 14:42:43 +05:30
Gavin D'souza
24e0174fcf fix: enable validations for email and phone data fields 2020-04-08 12:35:33 +05:30
mergify[bot]
08cf80124d
Merge pull request #9860 from scmmishra/wiggle-wiggle-wiggle
feat: wiggle animation for invalid login
2020-04-07 09:12:14 +00:00
Shivam Mishra
1741816658 feat: added wiggle effect for invalid login 2020-04-07 12:20:17 +05:30
Saurabh
1bc97e8f8a
feat: Offsite backup (#8241)
* feat: utility to get file size

* feat: if backup file is greater than 1gb then consider latest backup site instead of taking new

* fix: remove unwanted import

* chore: fix condition inside offsite backup utils

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

* chore: change email field to notify_email

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

* chore: fix deepsource issues

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

* feat: add offsite_backup support for google drive

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

* chore: get recipients from within send_email

pass email_field to send_email instead of calling two functions

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

* chore: set flag within validate_file_size

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

* feat: get latest file backup when specified

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

* chore: fix deepsource issues

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

* chore: fix incorrectly spelled dropbox settings

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

* chore: implement file backup logic for aws s3

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

* chore: fix deepsource issues

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

* chore: fix deepsource issues

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

Co-authored-by: Chinmay D. Pai <chinmaydpai@gmail.com>
Co-authored-by: Suraj Shetty <13928957+surajshetty3416@users.noreply.github.com>
2020-04-07 00:06:27 +05:30
Shivam Mishra
446c0636ac
Merge pull request #9834 from prssanna/report-group-by-fix
fix(Report): Fix report group by for existing reports
2020-04-06 17:01:44 +05:30
mergify[bot]
c41d10e553
Merge pull request #9853 from forellana-digithinkit/patch-1
fix(boilerplate): Adds missing escape characters.
2020-04-06 03:42:38 +00:00
Felipe Orellana
4479405872
fix: hooks.py boilerplate escape chars
Creating new app currently breaks due to comments in hooks.py do not properly escape sample configuration on webform hooks.
2020-04-05 21:27:32 -04:00
mergify[bot]
5fabf8ce00
Merge pull request #9641 from scmmishra/report-perm-fix
fix: Prepared Report permissions
2020-04-05 14:32:22 +00:00
mergify[bot]
6e898f6aa7
Merge pull request #9840 from prssanna/energy-points-summary
fix: Send EP summary only if email notifications are enabled
2020-04-05 11:01:10 +00:00
mergify[bot]
0425c934b1
Merge pull request #9850 from fumin/patch-1
fix: HTTP headers should be URI escaped
2020-04-04 13:52:44 +00:00
Suraj Shetty
f51c975759 refactor: Remove unnecessary code in query_report
get_user_settings is useless after following refactor
https://github.com/frappe/frappe/pull/5473
https://github.com/frappe/frappe/pull/5834

53193d3130
2020-04-04 19:09:06 +05:30
mergify[bot]
85a5b863a2
Merge pull request #9794 from Alchez/dev-web-form-redirect
fix: redirect to defined success URL (develop)
2020-04-04 05:53:11 +00:00
mergify[bot]
f5a1b560d7
Merge pull request #9603 from Mangesh-Khairnar/news-letter
feat: newsletter and email group changes
2020-04-03 16:46:50 +00:00
Fumin
ab6d6f3f65
HTTP headers should be URI escaped
This is needed for reports containing Chinese characters.
2020-04-04 00:17:46 +08:00
Himanshu
a649a95c0e
Merge pull request #9411 from Mangesh-Khairnar/api-indexing
feat(Integrations): Google API Indexing
2020-04-03 20:44:49 +05:30
Mangesh-Khairnar
4381850b61 test: schedule_send 2020-04-03 18:17:55 +05:30
Mangesh-Khairnar
0e087cf1b4 fix: handle case in which email account does not exists 2020-04-03 18:06:32 +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
prssanna
379ecf5952 fix: don't send energy points summary if email notifications for energy points are disabled 2020-04-03 13:03:55 +05:30
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
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