vassili/seitime-frappe
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 4
38588 commits 1 branch 0 tags 587 MiB
Commit graph

38588 commits

This branch
This branch
All branches
Author SHA1 Message Date
mergify[bot]
81d41c8d3a
Merge pull request #17297 from resilient-tech/dont-remove-custom-perms 
fix!: dont delete custom permissions when doctype is deleted
 2022-06-26 14:22:55 +00:00
mergify[bot]
9b2ce4861e
Merge pull request #17298 from resilient-tech/ignore-docs-on-delete 
fix: ignore integration request when deleting doc
 2022-06-26 08:27:49 +00:00
Smit Vora
b6963b1dec fix: ignore integration request when deleting doc 2022-06-26 12:53:38 +05:30
Sagar Vora
3c617e3b06 fix!: dont delete custom permissions when doctype is deleted 2022-06-26 11:51:52 +05:30
mergify[bot]
568702967e
Merge pull request #17287 from scdanieli/patch-3 
fix(Image View): make info field translatable
 2022-06-24 14:02:54 +00:00
Danny
47483f833f
feat(translations-cli): Fetch translations for a particular app (#17276) 
* translataions for particular app 

get-untranslated/update-translations string for particular app frappe#17268 (feature request)

* fix: linting, making stuff DRY-er

Co-authored-by: gavin <gavin18d@gmail.com>
 2022-06-24 17:04:49 +05:30
Samuel Danieli
3bc636ce30
fix(Image View): translate info field 2022-06-24 11:27:30 +02:00
gruener
1349a73e14
fix: Virtual DocTypes currently breaking Parent-DocType Update and Deletion (#16977) 
When you create a Virtual DocType as a Child Table (which is possible without any warning), then it will lead to several errors when updating or deleting of the parent document.

This is because the following files just execute a SQL Statement for the doctype (which doesnt have a DB Table, as this is the nature of a virtual doctype ;-)

**apps/frappe/frappe/model/document.py**
```py
frappe.db.sql("""delete from `tab{0}` where parent=%s and parenttype=%s and parentfield=%s""".format(df.options), (self.name, self.doctype, fieldname))
```

**apps/frappe/frappe/model/delete_doc.py**
```py
frappe.db.sql(
	"delete from `tab%s` where parenttype=%s and parent = %s" % (t, "%s", "%s"), (doctype, name)
)
```

So at these points, I added a check to not perform any sql command for virtual doctypes. With these changes, my affected situation is solved. Perhaps there are other situations, I didn't encounter yet.

As an additional feature, those virtual doctype models should also get an information about the parent is deleted, to propagate the deletion to the remote data pools; but for now I hope this bugfix can be approved.
 2022-06-23 11:38:29 +00:00
gavin
6a91c2cf14
Merge pull request #17141 from vishdha/_format_naming 
fix: Use date/time field in document naming
 2022-06-23 16:35:16 +05:30
mergify[bot]
5f94cac111
Merge pull request #17278 from pateljannat/navbar-redirection-issue 
fix: navbar child redirection issue
 2022-06-23 09:39:09 +00:00
Jannat Patel
20c94a5d32 fix: navbar child redirection issue 2022-06-23 12:26:31 +05:30
mergify[bot]
35405dec1c
Merge pull request #17262 from ankush/doc_conficts_ux 
fix: show "doc modified after load" message
 2022-06-23 05:38:23 +00:00
Suraj Shetty
bb525de78b
Merge pull request #17271 from frappe/dependabot/npm_and_yarn/shell-quote-1.7.3 2022-06-23 10:04:15 +05:30
Suraj Shetty
94f61fc3ba
Merge branch 'develop' into doc_conficts_ux 2022-06-23 09:59:57 +05:30
Ernesto Ruiz
b076ec1b91
fix: Make OTP link for get QR Code clickleable (#17275) 2022-06-22 21:11:48 +05:30
dependabot[bot]
9737bb39fa
build(deps): bump shell-quote from 1.7.2 to 1.7.3 
Bumps [shell-quote](https://github.com/substack/node-shell-quote) from 1.7.2 to 1.7.3.
- [Release notes](https://github.com/substack/node-shell-quote/releases)
- [Changelog](https://github.com/substack/node-shell-quote/blob/master/CHANGELOG.md)
- [Commits](https://github.com/substack/node-shell-quote/compare/v1.7.2...1.7.3)

---
updated-dependencies:
- dependency-name: shell-quote
  dependency-type: indirect
...

Signed-off-by: dependabot[bot] <support@github.com>
 2022-06-22 10:45:05 +00:00
gavin
1297b25ecf
Merge pull request #17245 from gavindsouza/deps-audit 
ci: Add audit for python dependencies via pip-audit
 2022-06-22 16:14:33 +05:30
Gavin D'souza
71531bd290 chore(deps): Bump PyJWT from 2.0.1 to 2.4.0 
Consists of security & bug fixes, and seemingly no breaking changes

Ref: https://pyjwt.readthedocs.io/en/stable/changelog.html
 2022-06-22 15:02:18 +05:30
Gavin D'souza
593fd0a178 ci: Add audit for python dependencies via pip-audit 2022-06-22 15:02:18 +05:30
Ritwik Puri
09229029da
Merge pull request #17234 from phot0n/fix-parameterized-list-pg 
fix: cast list to tuple when using parameterized query for postgres
 2022-06-22 13:59:26 +05:30
mergify[bot]
c6ada3d186
Merge pull request #17266 from adityahase/fix-oauth-id-token 
fix(oauth): Send id_token of the authorized user instead of Guest
 2022-06-22 08:24:10 +00:00
Jannat Patel
fd4a7031b9
fix: added mailto to email displayed on contact us page (#17269) 2022-06-22 13:23:15 +05:30
Suraj Shetty
b0d53d93ad
Merge pull request #17264 from netchampfaris/page-builder-section-ids 2022-06-22 12:48:36 +05:30
Sagar Vora
c6d8f3bc7f
fix: dont clear _meta when caching doc (#17115) 
fix: dont clear meta when caching doc
 2022-06-22 12:13:35 +05:30
mergify[bot]
1a1f5cc9f9
Merge pull request #17249 from ankush/plyr_out_of_bundle 
refactor!: remove video plyr from default bundle
 2022-06-22 06:43:18 +00:00
Faris Ansari
d49f9bfb8f fix: handle case where web_block is invoked 
from places other than web page
 2022-06-22 12:04:57 +05:30
Aditya Hase
93320ce6e7
fix(oauth): Send id_token of the authorized user instead of Guest 
This only affects OAuth clients that use `id_token` obtained from `frappe.integrations.oauth2.get_token`.

Doesn't affect OAuth clients that ignore id_token and explicitly use `frappe.integrations.oauth2.openid_profile` endpoint for getting user details. e.g. Frappe OAuth client.

A simple way to replicate this is to setup Frappe-Frappe OAuth client-server pair and use `login_via_oauth2_id_token` instead of `login_via_oauth2` in `login_via_frappe`.
 2022-06-21 21:52:22 +05:30
Aditya Hase
23cad54802
test(oauth): Send id_token of the authorized user instead of Guest 
This only affects OAuth clients that use `id_token` obtained from `frappe.integrations.oauth2.get_token`.

Doesn't affect OAuth clients that ignore id_token and explicitly use `frappe.integrations.oauth2.openid_profile` endpoint for getting user details. e.g. Frappe OAuth client.

A simple way to replicate this is to setup Frappe-Frappe OAuth client-server pair and use `login_via_oauth2_id_token` instead of `login_via_oauth2` in `login_via_frappe`.
 2022-06-21 21:50:16 +05:30
Faris Ansari
8814041b33 fix: set web-template attr in script and style tags from web templates 
Also, deduplication of styles and scripts when web_blocks jinja method is used
 2022-06-21 20:42:14 +05:30
Ankush Menat
e63e26890c fix: show "doc modifed after" load message 2022-06-21 20:25:54 +05:30
Deepesh Garg
26d0e7a0f9
fix: App logo not set in website settings (#17261) 
* fix: App logo not set in website settings

* chore: potential error in system settings
 2022-06-21 20:07:59 +05:30
Faris Ansari
891a2c7d5b feat(PageBuilder): Section IDs 
Set IDs on sections so that you can link to them using anchor tags
 2022-06-21 20:03:00 +05:30
barredterra
ef3777badb test: refactor date naming test 2022-06-21 16:22:22 +02:00
Vishal Dhayagude
e004740309
Merge branch 'develop' into _format_naming 2022-06-21 15:43:41 +05:30
Ankush Menat
9c5d6feec1
test(cypress): show full response on insert_doc failure (#17257) 2022-06-21 13:30:39 +05:30
Suraj Shetty
f8fc1918d2
Merge pull request #17253 from surajshetty3416/fix-login-ux 
perf(UX): Load splash screen immediately after login
 2022-06-21 09:36:41 +05:30
Suraj Shetty
1767af4972
Merge branch 'develop' into fix-login-ux 2022-06-21 09:30:19 +05:30
Suraj Shetty
ad89d07247
Merge pull request #17252 from frappe/dependabot/github_actions/actions/checkout-3 
build(deps): bump actions/checkout from 2 to 3
 2022-06-21 09:29:06 +05:30
Suraj Shetty
d68965a694
Merge pull request #17251 from frappe/dependabot/github_actions/pre-commit/action-3.0.0 
build(deps): bump pre-commit/action from 2.0.3 to 3.0.0
 2022-06-21 09:28:29 +05:30
Suraj Shetty
9f2dfbe980 chore: Fix merge error 2022-06-21 09:06:34 +05:30
Suraj Shetty
49bee3a912
Merge branch 'develop' into fix-login-ux 2022-06-21 09:02:14 +05:30
Suraj Shetty
242e3825a4
Merge pull request #17254 from surajshetty3416/refactor-clean-up 2022-06-21 08:47:00 +05:30
Suraj Shetty
245302dc7a refactor: Rename icon symbol filename from symbol-defs.svg to icons.svg 2022-06-21 08:07:51 +05:30
Suraj Shetty
64cc07227e refactor: Replace usage of deprecated attribute 2022-06-21 08:00:49 +05:30
Ankush Menat
d6f2d34bf4 perf: send boot string instead of JSON literal 
changes:

- compact boot info in /app HTML
    /app size went from 451kb to 393kb - ~13% less
    Verified that regex applied on this JSON aren't affecting perf, infact
    found them to be faster with compact JSON.

- Send json string instead of placing JSON literal in code using Jinja.
  JS takes more time to pass object literal than parsing a plain JSON string.

Overall content transfer size remains roughly same (albeit slightly
lower) since double escaping ends up adding extra `\` around quotes.

Co-authored-by: Suraj Shetty <surajshetty3416@gmail.com>
 2022-06-21 07:53:48 +05:30
Suraj Shetty
d7fe7ae39c perf(UX): Load splash screen immediately after login 2022-06-21 07:02:58 +05:30
dependabot[bot]
e12d37a943
build(deps): bump actions/checkout from 2 to 3 
Bumps [actions/checkout](https://github.com/actions/checkout) from 2 to 3.
- [Release notes](https://github.com/actions/checkout/releases)
- [Changelog](https://github.com/actions/checkout/blob/main/CHANGELOG.md)
- [Commits](https://github.com/actions/checkout/compare/v2...v3)

---
updated-dependencies:
- dependency-name: actions/checkout
  dependency-type: direct:production
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <support@github.com>
 2022-06-20 18:40:35 +00:00
dependabot[bot]
4811c51ecc
build(deps): bump pre-commit/action from 2.0.3 to 3.0.0 
Bumps [pre-commit/action](https://github.com/pre-commit/action) from 2.0.3 to 3.0.0.
- [Release notes](https://github.com/pre-commit/action/releases)
- [Commits](https://github.com/pre-commit/action/compare/v2.0.3...v3.0.0)

---
updated-dependencies:
- dependency-name: pre-commit/action
  dependency-type: direct:production
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <support@github.com>
 2022-06-20 18:40:31 +00:00
Ankush Menat
6ca75357f0
Merge branch 'develop' into plyr_out_of_bundle 2022-06-20 22:37:21 +05:30
Ankush Menat
fd324db67e
chore!: remove deprecated quaggajs based barcode scanner (#17248) 2022-06-20 21:04:30 +05:30