Commit graph

33522 commits

Author SHA1 Message Date
Jon Lockwood
68a5ac2b34 fix: username required
as part of the search the login/user name is required to find the user

issue #13738
2021-07-25 11:15:52 +09:30
Jon Lockwood
622800453a feat: new method to search for members ldap groups
New method to search for user group membership. Replaces old logic of using an ldap users attribute memberof which is not supported by all LDAP implementations

issue #13738
2021-07-25 11:03:47 +09:30
Jon Lockwood
1f0e0d23ed feat: update interface
Add new fields for the new group feature

issue #13738
2021-07-25 11:02:00 +09:30
Suraj Shetty
e50059a86d
Merge pull request #13747 from surajshetty3416/fix-email-style 2021-07-20 16:07:47 +05:30
Suraj Shetty
e1c78bb9b3 test: Update test 2021-07-20 15:21:22 +05:30
Suraj Shetty
1e1f911540 fix: Use 1em margin for p outside container
Revert 397848f9f7 (diff-cad6d40df66d9378e252342fe4148d3f8114a3c361dffd048fc3b09d5d9024b3R39)
2021-07-20 15:00:07 +05:30
Suraj Shetty
ce7ca6897e
Merge pull request #13744 from surajshetty3416/fix-signature-control 2021-07-20 11:50:41 +05:30
Suraj Shetty
29c56b0452
Merge pull request #13742 from surajshetty3416/fix-website-form-style 2021-07-20 11:19:33 +05:30
Suraj Shetty
2a9b9875f9 fix: Make pad only after dom is ready
- Signature control used to break on first form load
2021-07-20 10:11:45 +05:30
Suraj Shetty
cd499af6b2 fix: Move layout colors to common css_variables.scss
-  Layout colors are used by website as well
2021-07-20 08:43:42 +05:30
mergify[bot]
3e2acb1cb6
Merge pull request #13654 from hasnain2808/notification-via-email
fix: system notifications without email
2021-07-19 07:55:11 +00:00
Suraj Shetty
41b7a980b8
Merge pull request #13734 from surajshetty3416/fix-workflow-action-hook 2021-07-17 13:43:01 +05:30
Suraj Shetty
b690374afe fix: Trigger worklow action on update_after_submit event 2021-07-16 21:58:20 +05:30
gavin
edc3e49467
Merge pull request #13720 from ankush/diff_aware_sgrep
ci: make semgrep check diff-aware
2021-07-16 12:36:39 +05:30
mergify[bot]
9fa46023b9
Merge pull request #13728 from gavindsouza/page-renderer-not-found
fix(NotFoundPage): Set default value for http_status_code
2021-07-16 06:50:44 +00:00
Gavin D'souza
c85ff679ef fix(NotFoundPage): Set default value for http_status_code 2021-07-16 12:02:13 +05:30
Ankush Menat
144880bfb1
ci: make semgrep check diff-aware 2021-07-16 12:00:30 +05:30
Suraj Shetty
713fba3d62
Merge pull request #13685 from surajshetty3416/fix-tag-filter 2021-07-15 08:50:18 +05:30
Suraj Shetty
ffb020ce0e fix: Make query postgres compatible 2021-07-15 08:37:47 +05:30
Suraj Shetty
1027185320
Merge pull request #13708 from surajshetty3416/fix-energy-points 2021-07-14 21:52:18 +05:30
Suraj Shetty
bd91a33bb9 test: Add test case to validate EP for disabled user 2021-07-14 21:35:04 +05:30
Suraj Shetty
bd854bb368 fix: Do not create energy points for disabled users 2021-07-14 18:16:50 +05:30
mergify[bot]
9053ae9a46
Merge pull request #13701 from shariquerik/code-editor-scrollbar-glitch
fix: Code Editor scrollbar glitch
2021-07-14 10:29:10 +00:00
gavin
f4d67d617b
Merge pull request #13240 from codescientist703/link-field-fix
fix: added suitable filtering mechanism to link field
2021-07-14 12:40:45 +05:30
Sagar Vora
b4ea6c8890
fix: dont refresh form dashboard in layout.refresh_sections (#13650) 2021-07-14 12:21:28 +05:30
shariquerik
0eafadf002 fix: Code Editor scrollbar glitch 2021-07-14 12:10:11 +05:30
Gavin D'souza
6f17e3d45f perf(test_search): Setup and teardown tests only if needed 2021-07-14 12:02:33 +05:30
Leela vadlamudi
ee1b27587d
Merge pull request #13698 from leela/fix-email-attachments
fix: sending document as an attachment through mail
2021-07-14 10:47:28 +05:30
leela
f2267bec25 fix: sending document as an attachment through mail
Currently sending document as an attachment is failing and the fix is to
make it work by fixing the bug introduced in latest refactoring.
2021-07-14 10:28:10 +05:30
mergify[bot]
6128123eed
Merge pull request #13687 from bhavesh95863/patch-6
fix: Duplicate if condition removed
2021-07-13 15:22:34 +00:00
gavin
59f4b4d754
Merge pull request #13554 from gavindsouza/drop-data-import-legacy
chore: Drop Data Import Legacy
2021-07-13 20:39:00 +05:30
codescientist703
b619c3d330 test: added test for order of link 2021-07-13 20:24:24 +05:30
mergify[bot]
e528c959e8
Merge pull request #13692 from resilient-tech/fix-boilerplate
fix: escape quotes before declaring variables when making a new app
2021-07-13 14:21:24 +00:00
Pruthvi Patel
bed64ef0ad test: change app description to test if quotes are being escaped 2021-07-13 18:49:26 +05:30
codescientist703
79124873c3 fix: fixed sider recommendation 2021-07-13 18:43:34 +05:30
mergify[bot]
2ca636be31
Merge pull request #13640 from alyf-de/bench_version_branch_commit
feat: different output formats for `bench version`
2021-07-13 12:59:36 +00:00
barredterra
199990decc Merge branch 'develop' into bench_version_branch_commit 2021-07-13 14:30:56 +02:00
Sagar Vora
b23dd71116 fix: escape quotes before declaring variables when making a new app 2021-07-13 17:56:47 +05:30
Suraj Shetty
e2bee9b46d
Merge pull request #13689 from surajshetty3416/fix-customize-form 2021-07-13 17:26:53 +05:30
Suraj Shetty
cf67dbce5a fix: Add missing fieldtypes in for custom fields 2021-07-13 16:56:49 +05:30
barredterra
fc2c887635 test: fix return code 2021-07-13 13:23:25 +02:00
gavin
9c0acea286
Merge pull request #13630 from frappe/dependabot/npm_and_yarn/minimist-1.2.5
chore(deps): [security] bump minimist from 1.2.0 to 1.2.5
2021-07-13 16:42:30 +05:30
barredterra
04094110f5 fix: handle detached head
Workaround for https://github.com/gitpython-developers/GitPython/issues/633
2021-07-13 13:11:15 +02:00
dependabot-preview[bot]
8bc498c18c
chore(deps): [security] bump minimist from 1.2.0 to 1.2.5
Bumps [minimist](https://github.com/substack/minimist) from 1.2.0 to 1.2.5. **This update includes security fixes.**
- [Release notes](https://github.com/substack/minimist/releases)
- [Commits](https://github.com/substack/minimist/compare/1.2.0...1.2.5)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2021-07-13 10:42:00 +00:00
Bhavesh Maheshwari
68930a022a
fix: Duplicate if condition remove 2021-07-13 15:55:24 +05:30
Suraj Shetty
ae70502f91 test: Add test case to validate tag count query 2021-07-13 15:34:36 +05:30
Suraj Shetty
e826866503 fix: Tag count query 2021-07-13 14:24:12 +05:30
gavin
a837a4d69c
Merge pull request #13680 from frappe/mergify/bp/develop/pr-13667
fix: custom script to duplicate row not working in v13 (backport #13667)
2021-07-13 13:21:55 +05:30
Suraj Shetty
58cb8e5dd1
style: Fix minor formatting issues
- Also, updated error title
2021-07-13 12:46:01 +05:30
Gavin D'souza
8dcb7a1eaa style: Remove redundant comments 2021-07-13 12:04:50 +05:30