Commit graph

39228 commits

Author SHA1 Message Date
Himanshu
44c2a2e309
Merge branch 'develop' into merge_translated_doctypes 2022-08-09 11:50:32 +01:00
Sagar Vora
c82b6e758e
Merge pull request #17681 from resilient-tech/fix-child-perm
refactor: improved child table permission check
2022-08-09 10:15:36 +00:00
mergify[bot]
cde6755aff
feat: Multilanguage sites: language selector only will show "enabled" languages and language default always will be System default (#17745) (#17766)
* feat: Select only enabled languages for "language selector", and use System Settings lang as default one

[skip ci]

(cherry picked from commit e5b8a47835d22b7834865324d30d796bb3031dd5)

Co-authored-by: Development for People <47140294+developmentforpeople@users.noreply.github.com>
2022-08-09 14:57:48 +05:30
Ankush Menat
42debec094
Merge pull request #17756 from netchampfaris/sanitize-html-allow-data-attrs
fix(sanitize-html): allow all data-* attrs
2022-08-09 14:48:13 +05:30
Ankush Menat
28fc208b51 test: sanitize_html attributes behaviour 2022-08-09 14:47:18 +05:30
Himanshu
c6e2ce3e42
Merge branch 'develop' into merge_translated_doctypes 2022-08-09 09:50:31 +01:00
Himanshu
b6281ffef6
chore: linter fixes 2022-08-09 09:49:21 +01:00
Sagar Vora
7a19d65ea4 chore: improve docstring 2022-08-09 12:14:26 +05:30
Sagar Vora
7129d6128f chore: lazier import; improved docstrings 2022-08-09 11:50:15 +05:30
Himanshu
1aa3f75d4c
feat: custom __link_options (#17699)
* feat: custom __link_optins

* chore: linter fixes

* test: add ui test for custom link option
2022-08-09 11:20:13 +05:30
hrwx
d9c3c03522 chore: set middle name as _Test User for admin 2022-08-08 22:06:59 +01:00
Himanshu
dffe396f1c
Merge branch 'develop' into merge_translated_doctypes 2022-08-08 16:21:02 +01:00
Ankush Menat
b263d7a724 fix: ignore forms without docs in realtime events 2022-08-08 19:30:08 +05:30
Ankush Menat
679e846707 fix: dont pass doc to tooltip formatter on reportview
This just doesn't exist. Also filtering doc by value makes no sense,
it's bound to be incorrect or misleading.
2022-08-08 19:30:08 +05:30
Faris Ansari
cafd2c920d fix(sanitize-html): allow all data-* attrs 2022-08-08 18:36:54 +05:30
Suraj Shetty
60b0f0d3aa
Merge pull request #17753 from frappe/remove-emoji-from-doctype 2022-08-08 17:51:21 +05:30
Suraj Shetty
6ef41e03e3 revert: Remove emoji from doctype
Use colored text instead
2022-08-08 17:10:34 +05:30
Himanshu
ad48f93b7b
Merge branch 'develop' into merge_translated_doctypes 2022-08-08 10:41:35 +01:00
gavin
90c5d4ca5b
chore: Update CODEOWNERS
[skip ci]
2022-08-08 13:25:59 +05:30
Ankush Menat
887d22cb1f
chore: rengerate yarn.lock (#17747)
yarn lock wasn't updated correctly in last package.json update which
causes failure during update

[skip ci]
2022-08-07 18:55:38 +05:30
Shariq Ansari
0ce7f44d45
fix: Webform Misc Fix (#17642) 2022-08-07 15:24:50 +05:30
hrwx
476b628a4e chore: revert changes to github workflow template 2022-08-06 10:52:59 +01:00
hrwx
db2e898397 chore: linter fixes 2022-08-06 10:52:59 +01:00
Himanshu
1b09db8d9b
Merge branch 'develop' into merge_translated_doctypes 2022-08-06 10:45:05 +01:00
Ernesto Ruiz
2101a2d576
chore: typo in comment on keyboard.js (#17742) 2022-08-06 13:06:42 +05:30
hrwx
b01929405d refactor: translatable doctypes 2022-08-05 21:38:10 +01:00
gavin
5385276547
Merge pull request #16748 from gavindsouza/refactor-oauth-tests
refactor: Oauth20 tests
2022-08-05 16:09:27 +05:30
gavin
2735d1c558
Merge branch 'develop' into refactor-oauth-tests 2022-08-05 15:37:41 +05:30
Gavin D'souza
e7a16135e0 fix: Setup test_client for each test 2022-08-05 15:12:52 +05:30
Gavin D'souza
7b149d4273 fix: Allow setting kwarg site for make_request test util 2022-08-05 13:54:58 +05:30
Gavin D'souza
b00ae8043f test: Set sid as client cookie instead of oauth payload 2022-08-05 12:25:04 +05:30
Sagar Vora
f9bfbfec98
perf: reduce DB calls made in get_fetch_values (#17671)
* perf: reduce DB calls made in `get_fetch_values`

* fix: ensure return value is same as before

* test: add test for `frappe.model.utils.get_fetch_values`
2022-08-05 11:52:37 +05:30
Gavin D'souza
832fbb6c85 chore: Remove dead imports 2022-08-05 11:39:39 +05:30
Gavin D'souza
65273ee828 Merge branch 'develop' of github.com:frappe/frappe into refactor-oauth-tests 2022-08-05 11:38:55 +05:30
Gavin D'souza
060498c3e4 test: Pass sid to requests to maintain a session 2022-08-05 10:41:13 +05:30
vishdha
9a50c30586 fix: add_user_permission with applicale_for arg set not updating in user permission 2022-08-05 00:27:38 +02:00
Ankush Menat
f6210e7c38
Merge pull request #17697 from ankush/ast_translate
feat: use babel to extract translation sources
2022-08-04 15:53:42 +05:30
Ankush Menat
7452ac5d37
chore: correct default arg for extract_javascript
Tuples need extra comma to make sure it's not treated as string. 

[skip ci]

Co-authored-by: Sagar Vora <sagar@resilient.tech>
2022-08-04 15:52:32 +05:30
Ankush Menat
16fdff8231 chore: remove pointless template strings 2022-08-04 15:33:03 +05:30
Ankush Menat
ec8f20c097 fix: send all messages on boot instead of scanning
close https://github.com/frappe/frappe/issues/17684
2022-08-04 15:33:03 +05:30
Ankush Menat
2d7fc1825f refactor: simplify get_messages_from_file 2022-08-04 15:33:03 +05:30
Ankush Menat
da872a0edf feat: modified parser for frappe JS translate syntax 2022-08-04 15:33:02 +05:30
Ankush Menat
cd53466b6a feat: JS extractor and custom JS parser 2022-08-04 15:19:56 +05:30
Ankush Menat
1425842ef0 refactor: extract python translations using babel
RIP my cool handwritten AST code :'(

Few things to note:

1. Publicly documented APIs, they don't support capturing kwargs.
2. We can't use documented "lower level" APIs, we need to go _even lower_.
2022-08-04 15:19:55 +05:30
Ankush Menat
ea836a824a feat: use AST to extract translation sources 2022-08-04 15:19:55 +05:30
Ankush Menat
0cb4da1195 fix: ignore built assets in translation 2022-08-04 15:19:55 +05:30
Ankush Menat
7c80d1e0ab
Merge pull request #17495 from ankush/format_js
style: auto-format JS files
2022-08-04 15:19:13 +05:30
Ankush Menat
7c051875b2 chore: ignore js format commit 2022-08-04 14:52:09 +05:30
Ankush Menat
40f27f908a style: format JS files with prettier 2022-08-04 14:51:01 +05:30
Ankush Menat
015937a03a test: fix anticipiated test failures 2022-08-04 14:50:24 +05:30