dependabot-preview[bot]
|
fdfdc6fa7f
|
chore(deps): [security] bump bleach from 3.1.4 to 3.3.0 (#12309)
Bumps [bleach](https://github.com/mozilla/bleach) from 3.1.4 to 3.3.0. **This update includes a security fix.**
- [Release notes](https://github.com/mozilla/bleach/releases)
- [Changelog](https://github.com/mozilla/bleach/blob/master/CHANGES)
- [Commits](https://github.com/mozilla/bleach/compare/v3.1.4...v3.3.0)
Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
Co-authored-by: dependabot-preview[bot] <27856297+dependabot-preview[bot]@users.noreply.github.com>
|
2021-02-03 22:10:42 +05:30 |
|
mergify[bot]
|
399311a699
|
Merge pull request #12315 from anupamvs/common-js-variable-scope
fix: variable scope issue
|
2021-02-03 10:01:34 +00:00 |
|
Anupam
|
b440f1eb37
|
fix: variable scope issue
|
2021-02-03 14:45:44 +05:30 |
|
Saurabh
|
d2b61f333c
|
Merge pull request #12293 from saurabh6790/validate-user-key
fix: validate the key type while updating the password
|
2021-02-03 11:41:24 +05:30 |
|
mergify[bot]
|
c3ba0ec68c
|
Merge pull request #12304 from amenat/update_docstrings
docs: update docstring of top level module
|
2021-02-02 16:58:15 +00:00 |
|
Ankush Menat
|
de0f7fd9d9
|
docs: update docstring of top level module
|
2021-02-02 22:04:41 +05:30 |
|
Faris Ansari
|
3129543185
|
Merge pull request #12307 from netchampfaris/force-reload-workspace-doctype
fix(patch): Force reload Workspace doctypes
|
2021-02-02 20:32:38 +05:30 |
|
Faris Ansari
|
5efe3a3bae
|
fix(patch): Force reload Workspace doctypes
Reload after rename doc doesn't actually update the workspace doctypes.
Fixing by adding the force flag.
|
2021-02-02 20:31:22 +05:30 |
|
Suraj Shetty
|
bdcb769c18
|
fix: Check if css file exists
|
2021-02-02 18:17:02 +05:30 |
|
Suraj Shetty
|
66194eaac9
|
Merge pull request #12303 from surajshetty3416/fix-rename-patch
|
2021-02-02 18:10:05 +05:30 |
|
Suraj Shetty
|
3504fcf7b4
|
fix: Desk Page rename patch
|
2021-02-02 18:08:06 +05:30 |
|
Prssanna Desai
|
3868b1978c
|
Merge pull request #12288 from shariquerik/on-event-creation-assign-to-fix
|
2021-02-02 17:41:30 +05:30 |
|
Suraj Shetty
|
99fe0412b3
|
fix(patch): Pass if table is missing (#12302)
|
2021-02-02 17:39:05 +05:30 |
|
mergify[bot]
|
d3650b9051
|
Merge pull request #12301 from resilient-tech/fix-patch
fix: reload workspace link in patch
|
2021-02-02 11:47:06 +00:00 |
|
Shariq Ansari
|
8985130c80
|
Update frappe/public/js/frappe/views/interaction.js
Co-authored-by: Prssanna Desai <prssud@gmail.com>
|
2021-02-02 16:27:52 +05:30 |
|
Sagar Vora
|
69d942a488
|
fix: reload modified patch
|
2021-02-02 15:59:42 +05:30 |
|
Prssanna Desai
|
6b4ed06527
|
Merge pull request #12274 from this-gavagai/form-title-fix
|
2021-02-02 14:51:32 +05:30 |
|
Prssanna Desai
|
1b6d8e3b2d
|
Merge pull request #12275 from KieranSmith892/develop
|
2021-02-02 14:48:50 +05:30 |
|
Prssanna Desai
|
ff44523b04
|
Merge pull request #12278 from hasnain2808/fix-auto-login-redirect
|
2021-02-02 14:30:25 +05:30 |
|
Suraj Shetty
|
b9b00ffed4
|
Merge branch 'develop' of https://github.com/frappe/frappe into develop
|
2021-02-02 12:51:53 +05:30 |
|
Suraj Shetty
|
1cdca0c07e
|
chore: Bump frappe-charts version
|
2021-02-02 12:51:48 +05:30 |
|
Sagar Vora
|
75f9eeeeaa
|
fix: reload workspace link in patch
|
2021-02-02 12:31:13 +05:30 |
|
Prssanna Desai
|
cb3e57f914
|
Merge pull request #12300 from prssanna/patch-fixes
|
2021-02-02 11:27:52 +05:30 |
|
prssanna
|
f4362dbb26
|
fix: reload user and role doctype
|
2021-02-02 11:25:10 +05:30 |
|
prssanna
|
be634c99e1
|
fix: ignore route conflict validation while renaming desk page to workspace
|
2021-02-02 11:24:49 +05:30 |
|
Rushabh Mehta
|
5b7e7ec39c
|
chore(Snyk): Security upgrade jinja2 from 2.11.1 to 2.11.3 (#12297)
Co-authored-by: snyk-bot <snyk-bot@snyk.io>
Co-authored-by: Suraj Shetty <13928957+surajshetty3416@users.noreply.github.com>
|
2021-02-02 09:46:27 +05:30 |
|
Suraj Shetty
|
579842da1e
|
Merge pull request #12277 from frappe/rebrand-ui
|
2021-02-02 09:06:39 +05:30 |
|
prssanna
|
94db4b6c3d
|
Merge branch 'develop' of https://github.com/frappe/frappe into rebrand-ui
|
2021-02-01 20:41:34 +05:30 |
|
Saqib
|
f4f8160183
|
fix: cannot extend a desk page with developer mode off (#12294)
|
2021-02-01 19:46:38 +05:30 |
|
Suraj Shetty
|
76f4d9aee5
|
fix: Update User modified
to sync changes made in following PR
https://github.com/frappe/frappe/pull/12148
|
2021-02-01 19:05:32 +05:30 |
|
Prssanna Desai
|
2f46febe27
|
Merge pull request #12269 from shariquerik/auto-email-report-fix
|
2021-02-01 19:04:05 +05:30 |
|
Saurabh
|
62889993fb
|
fix: validate the key type while updating the password
|
2021-02-01 17:50:15 +05:30 |
|
Saurabh
|
d120ca7f9e
|
fix: validate user perms if user has select perm (#12289)
|
2021-02-01 17:43:24 +05:30 |
|
Suraj Shetty
|
d730a110da
|
fix: Frappe control style
|
2021-02-01 16:25:09 +05:30 |
|
Suraj Shetty
|
b7ba011aeb
|
Merge branch 'develop' of https://github.com/frappe/frappe into rebrand-ui
|
2021-02-01 14:21:51 +05:30 |
|
Suraj Shetty
|
0aa18df0de
|
fix: Typo
|
2021-02-01 14:08:38 +05:30 |
|
shariquerik
|
1e565ad066
|
fix: On Event creation assign to not working
|
2021-02-01 14:07:05 +05:30 |
|
mergify[bot]
|
9656ef3940
|
Merge pull request #12214 from nextchamp-saqib/default-desk-page
feat: ability to set default desk page
|
2021-02-01 07:22:45 +00:00 |
|
Suraj Shetty
|
d4288048e4
|
fix: Remove margin bottom from last form-control
|
2021-02-01 12:14:34 +05:30 |
|
Suraj Shetty
|
1eac7f1d47
|
Merge branch 'rebrand-ui' of https://github.com/frappe/frappe into rebrand-ui
|
2021-02-01 12:01:11 +05:30 |
|
Suraj Shetty
|
7a80a321f5
|
fix: Rename Desk Shortcut to Workspace Shortcut
|
2021-02-01 12:01:07 +05:30 |
|
prssanna
|
6fd8b58843
|
fix: indicator ellipsis on desk
|
2021-02-01 11:53:47 +05:30 |
|
Suraj Shetty
|
b49fa40937
|
Merge branch 'develop' of https://github.com/frappe/frappe into rebrand-ui
|
2021-02-01 11:23:52 +05:30 |
|
Fisher Yu
|
2b01fb091f
|
fix: Translation related issues (#11932)
Co-authored-by: Suraj Shetty <13928957+surajshetty3416@users.noreply.github.com>
|
2021-02-01 11:06:49 +05:30 |
|
Suraj Shetty
|
19428f2303
|
chore: Update CODEOWNERS
|
2021-02-01 10:39:53 +05:30 |
|
Suraj Shetty
|
2f59dc2a7d
|
test: Fix failing tests
|
2021-02-01 09:39:09 +05:30 |
|
Suraj Shetty
|
6e43a287ba
|
chore: Skip porducer site installation in ui test
|
2021-02-01 08:05:10 +05:30 |
|
Suraj Shetty
|
068efab200
|
chore: Fix syntax error
|
2021-02-01 07:44:59 +05:30 |
|
Suraj Shetty
|
cd74ac9be0
|
chore: Reinstall producer site only for server-side tests
|
2021-02-01 07:37:03 +05:30 |
|
Suraj Shetty
|
8b95df92f9
|
chore: Enable cypress retries
|
2021-02-01 07:36:04 +05:30 |
|