Commit graph

23938 commits

Author SHA1 Message Date
Suraj Shetty
34d854e9c0 fix: Response message style 2020-03-26 17:52:34 +05:30
mergify[bot]
bce278f43e
Merge pull request #9776 from prssanna/report-filters-depends-on
feat(Reports): Enable depends on for script report filters
2020-03-25 04:49:54 +00:00
Suraj Shetty
3375614ad0
Merge branch 'develop' into report-filters-depends-on 2020-03-25 10:05:16 +05:30
dependabot[bot]
bdb77ba521
chore(deps): bump bleach from 2.1.4 to 3.1.2 (#9779)
* chore(deps): bump bleach from 2.1.4 to 3.1.2

Bumps [bleach](https://github.com/mozilla/bleach) from 2.1.4 to 3.1.2.
- [Release notes](https://github.com/mozilla/bleach/releases)
- [Changelog](https://github.com/mozilla/bleach/blob/master/CHANGES)
- [Commits](https://github.com/mozilla/bleach/compare/v2.1.4...v3.1.2)

Signed-off-by: dependabot[bot] <support@github.com>

* chore: use html.parser instead of html5lib

bleach no longer ships html5lib as a requirement and instead has
included it in the system. we can switch to using html.parser instead;
which is not an external dependency unlike html5lib.

source: https://github.com/mozilla/bleach/blob/master/CHANGES#L206

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

* chore: use html5lib from bleach

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

* chore: import html5lib from bleach._vendor

fixes issue where bs4 is unable to find html5lib in the tree:

bs4.FeatureNotFound: Couldn't find a tree builder with the features you requested: bleach._vendor.html5lib. Do you need to install a parser library?

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

* chore: just give up and install html5lib as a dependency

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

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: Chinmay D. Pai <chinmaydpai@gmail.com>
2020-03-25 00:20:57 +05:30
Chinmay Pai
4f22a58331
feat: add system override to logout sessions on password reset (#9653)
* feat: add system override to logout sessions on password reset

add a system settings override to logout current user from all existing
sessions on password reset

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

* fix: do not override settings if user has opted to logout

do not override the current value if the user has checked "logout of all
sessions".

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

* chore: fix variable name

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

Co-authored-by: Suraj Shetty <13928957+surajshetty3416@users.noreply.github.com>
2020-03-24 14:13:13 +00:00
Deepesh Garg
4157a000f9 fix: Use filters as variable name instead of doc 2020-03-24 17:31:59 +05:30
prssanna
723ce0c0e5 fix: code formatting 2020-03-24 16:43:11 +05:30
mergify[bot]
d3e8cad270
Merge pull request #9774 from prssanna/group-by-check
fix(list-sidebar): Show Yes or No label for check fieldtype instead of 1 or 0
2020-03-24 10:57:31 +00:00
prssanna
bd9d0cfb6f feat(Reports): enable depends on for script report filters 2020-03-24 16:15:53 +05:30
prssanna
3a30c27a7c refactor: set check type field labels as Yes and No 2020-03-24 14:12:45 +05:30
Suraj Shetty
d515e8a7be
Merge pull request #9772 from Thunderbottom/sidebar-typeof
fix: use typeof instead of instanceof
2020-03-24 13:41:36 +05:30
Chinmay D. Pai
f67c2032a4
fix: use typeof instead of instanceof
instanceof fails to check for string, instead classifying the
$target.data('value') as instanceof Object; which causes the ternary
check to fail and pass filter without decodeURIComponent(), causing
filter to be applied like: email%40example.com instead of
email@example.com

we can instead just use typeof to check whether the passed value is a
string

Signed-off-by: Chinmay D. Pai <chinmaydpai@gmail.com>
2020-03-24 12:32:22 +05:30
mergify[bot]
0066244c97
Merge pull request #9762 from Thunderbottom/ldap-req
chore: add ldap3 to requirements
2020-03-24 05:31:14 +00:00
mergify[bot]
60d433d7fa
Merge pull request #9771 from hrwX/ep_notification_fix
fix: use db.set_value while resetting _seen value
2020-03-24 05:26:21 +00:00
mergify[bot]
fadc51528c
Merge pull request #9769 from netchampfaris/consistent-labels-in-user
fix: Consistent label casing in User fields
2020-03-24 04:43:55 +00:00
Himanshu Warekar
49532508c6 fix: use set_value instead of db_set 2020-03-23 23:16:36 +05:30
Himanshu Warekar
062ea3cb4c revert: " fix(EPS): parse email address for eps" 2020-03-23 23:13:47 +05:30
Faris Ansari
6e48dcc148 fix: Consistent label casing in User fields 2020-03-23 23:00:13 +05:30
Himanshu
01c6cd5c8f
fix(EPS): parse email address for eps (#9764) 2020-03-23 21:25:00 +05:30
Shivam Mishra
c874c1b9f4
Merge pull request #9761 from prssanna/group-by-enhancements
refactor: Allow more field types in group by fields
2020-03-23 19:50:09 +05:30
mergify[bot]
e61dae862c
Merge pull request #9698 from nabinhait/contact-enqueue-fix
fix: Do not enqueue contact creation if in test
2020-03-23 08:29:08 +00:00
Suraj Shetty
c891eda8c3 style: Fix import issue 2020-03-23 13:46:58 +05:30
Suraj Shetty
699e6f8d4c test: Delete contact phone and and contact email while deleting contact 2020-03-23 13:33:21 +05:30
Chinmay D. Pai
868f761c7d
chore: add ldap3 to requirements
Signed-off-by: Chinmay D. Pai <chinmaydpai@gmail.com>
2020-03-23 13:15:35 +05:30
prssanna
f210167229 refactor: allow data, int, check type fields in list sidebar filters 2020-03-23 12:18:22 +05:30
prssanna
a5fa451508 refactor: allow check type fields in report view group by 2020-03-23 12:17:28 +05:30
mergify[bot]
2f24671030
Merge pull request #9711 from scmmishra/cache-fix
refactor: improve caching for desk
2020-03-23 05:15:03 +00:00
Suraj Shetty
f6244d2740
style: Remove unnecessary space 2020-03-23 10:30:10 +05:30
mergify[bot]
e075fd0e97
Merge pull request #9756 from deepeshgarg007/toggle_filter
feat: Utility to toggle filter display in reports
2020-03-23 04:48:44 +00:00
Deepesh Garg
b8e8bbdb9b fix: Use toggle class instead of add and remove class 2020-03-23 08:57:13 +05:30
mergify[bot]
0faadc4126
Merge pull request #9754 from Thunderbottom/redirect-xss-fix
fix: sanitise xss on url redirect-to args
2020-03-21 07:30:38 +00:00
Chinmay D. Pai
d78587e6c5
chore: codacy fixes
Signed-off-by: Chinmay D. Pai <chinmaydpai@gmail.com>
2020-03-21 02:00:47 +05:30
Chinmay D. Pai
86c72e0b99
fix: pass all redirect-to args through sanitise_redirect
Signed-off-by: Chinmay D. Pai <chinmaydpai@gmail.com>
2020-03-21 01:53:22 +05:30
Chinmay D. Pai
1c56481ce8
fix: sanitise xss on url redirect-to args
add function to sanitise redirect-to url arguments to prevent xss

Signed-off-by: Chinmay D. Pai <chinmaydpai@gmail.com>
2020-03-21 01:36:46 +05:30
Deepesh Garg
f7b57994ff feat: Utility to toggle filter display in reports 2020-03-20 22:11:58 +05:30
Prssanna Desai
5eb057f410
Merge pull request #9750 from scmmishra/disable-sorting
feat: disable sortable on dashboard
2020-03-20 20:51:57 +05:30
Shivam Mishra
641892b0cc feat: disable sortable on dashboard 2020-03-20 19:44:14 +05:30
mergify[bot]
1e07ff2c4c
Merge pull request #9749 from scmmishra/res-fix-dash
fix: responsive dashboards
2020-03-20 14:04:45 +00:00
Prssanna Desai
6a4292357e
Merge pull request #9729 from scmmishra/breadcrumb-fix
refactor: Remove modules view
2020-03-20 19:11:12 +05:30
Shivam Mishra
3f1ba29620 fix: responsive chart widget in desk 2020-03-20 19:04:00 +05:30
Shivam Mishra
17f25fafcb fix: responsive dashboards 2020-03-20 19:01:45 +05:30
Prssanna Desai
1c243cd90d
Merge pull request #9693 from scmmishra/dashboard-enhancements
feat: use widgets to make dashboards
2020-03-20 18:30:36 +05:30
mergify[bot]
7ba65ac071
Merge pull request #9748 from sahil28297/fix_gcalendar_develop
fix(patch): delete depricated GCalendar
2020-03-20 12:02:57 +00:00
sahil28297
c615042d25
fix: develop version as 12.0.0.dev instead of 12.1.0 (#9746)
* fix:  develop version as 12.x.x instead of 12.1.0

* fix: develop version as 12.0.0.dev

* fix: develop version as 12.0.0-dev
2020-03-20 16:10:58 +05:30
prssanna
de1d8d0acd fix: hide summary if no data 2020-03-20 15:36:39 +05:30
prssanna
1abc0264c0 fix: missing return statement 2020-03-20 15:32:43 +05:30
Shivam Mishra
f79603e47b refactor: use after_ajax to return filters 2020-03-20 15:27:44 +05:30
prssanna
20994a4e18 fix: ignore prepared report for report type charts 2020-03-20 15:18:34 +05:30
Shivam Mishra
ea9f5dcfc1 fix: after_ajax should resolve the function 2020-03-20 15:14:10 +05:30
Sahil Khan
0e627ab14d fix(patch): delete depricated GCalendar 2020-03-20 15:10:08 +05:30