Abhishek Balam
2da53b652b
Merge branch 'develop' of https://github.com/frappe/frappe into develop
2021-06-01 19:42:12 +05:30
Abhishek Balam
f15edd21d1
feat: enable use of custom encryption_key in encrypt()/decrypt()
2021-06-01 19:41:18 +05:30
Suraj Shetty
a0bd52b02b
Merge pull request #13397 from surajshetty3416/fix-awesomeplete-width
...
fix: Add min-width for dropdown list
2021-06-01 19:04:31 +05:30
Suraj Shetty
39eee3e5c8
fix: Add min-width for awesomplete class
2021-06-01 19:02:01 +05:30
Aditya Hase
1d7b72b75d
Merge pull request #13383 from adityahase/fix-server-script-getattr
...
fix(server scripts): Restrict access to python's internal attributes
2021-06-01 10:54:43 +05:30
Aditya Hase
c033e0d34d
fix(server scripts): Restrict access to python's internal attributes
2021-05-31 19:24:36 +05:30
mergify[bot]
e82c9edc12
Merge pull request #13176 from shariquerik/grid-row-deletion-fix
...
fix: Grid row deletion fix
2021-05-31 11:38:38 +00:00
mergify[bot]
89feae785f
Merge pull request #13301 from resilient-tech/fix-grid-nav
...
fix: Grid navigation with keyboard on multiple pages
2021-05-31 11:28:52 +00:00
Suraj Shetty
f42f93fa65
Merge branch 'develop' into grid-row-deletion-fix
2021-05-31 16:46:43 +05:30
getsali
0afe774ddb
fix: Select appropriate email template response ( #13051 )
...
* Update email_group.py
Fix: Select appropriate email template response, Welcome email template can be either html or rich text
* refactor: Simpify code
Co-authored-by: Suraj Shetty <13928957+surajshetty3416@users.noreply.github.com>
2021-05-31 16:32:58 +05:30
Fisher Yu
872299b3f3
fix: Translate Strings ( #13277 )
2021-05-31 16:31:42 +05:30
dependabot[bot]
7759018492
chore(deps): bump ws from 7.4.2 to 7.4.6 ( #13369 )
...
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2021-05-31 16:26:38 +05:30
Faris Ansari
49901ac239
Merge pull request #13373 from adityahase/fix-jinja-globals
...
fix(jinja): Remove frappe.utils.jinja.get_jenv() from jinja globals
2021-05-31 11:27:41 +05:30
Aditya Hase
980f224bba
Merge pull request #13253 from rmehta/safe-json
2021-05-31 10:42:56 +05:30
Saqib
e73efaec04
fix: Return promise while reloading doc ( #13219 )
2021-05-31 10:42:50 +05:30
Aditya Hase
8aff94d514
fix(jinja): Remove frappe.utils.jinja.get_jenv() from jinja globals
2021-05-31 10:37:32 +05:30
Leela vadlamudi
5b3acf7fe8
Merge pull request #13307 from leela/incoming-mail-refactoring
...
refactor: Incoming mail refactoring
2021-05-31 10:16:58 +05:30
leela
4ce8a600e8
fix: Tests and sider issues
2021-05-31 10:02:13 +05:30
Leela vadlamudi
f1d54442e1
Merge pull request #13340 from frappe/mergify/bp/develop/pr-13339
...
fix: display currency in auto email report (backport #13339 )
2021-05-31 09:08:12 +05:30
Leela vadlamudi
8935001f1f
Merge pull request #13364 from frappe/mergify/bp/develop/pr-13355
...
fix: refresh form section while refreshing the field (backport #13355 )
2021-05-31 09:06:21 +05:30
leela
f14d9bd3da
fix: refresh form section while refreshing the field
...
If all the fields with in a section has depends_on property and in such
case section itself stays hidden as all fields with in it are hidden.
Currently when any form field is updated, we are refreshing only the
fields but not the sections. So, field refresh is not affecting the form
because of section being hidden.
Fix is to refresh the sections when ever form fields are refreshed.
(cherry picked from commit 20c6e24a9f58a303b36da8cce247d273e6e3582f)
2021-05-28 05:00:19 +00:00
mergify[bot]
a440286877
fix: check if salutation already exists in email body (backport #13196 ) ( #13358 )
2021-05-28 09:14:27 +05:30
Suraj Shetty
1562f0e72d
Merge pull request #13280 from prssanna/website-theme-fixes
2021-05-28 09:04:13 +05:30
Suraj Shetty
38efba692d
fix: Conditionally set css variables
2021-05-28 08:44:41 +05:30
Suraj Shetty
70348977be
Merge branch 'develop' into website-theme-fixes
2021-05-28 08:36:15 +05:30
Abhishek Balam
9cc555d544
Merge pull request #13346 from krishnakanthati/tooltip
...
fix: tooltip displays correct title
2021-05-28 03:28:30 +05:30
Faris Ansari
914daed6e4
Merge pull request #13349 from netchampfaris/assets-json-path
2021-05-27 14:17:57 +05:30
Suraj Shetty
e9f040304b
Merge branch 'develop' into website-theme-fixes
2021-05-27 13:56:22 +05:30
Faris Ansari
23406d031a
fix: Store assets.json directly in assets folder
...
assets.json stores assets of all apps, so doesn't make sense to put it in frappe folder
2021-05-27 11:50:56 +05:30
Krishna Kant Hati
2ccea73aa2
fix: tooltip displays correct title
2021-05-27 01:52:28 +05:30
Suraj Shetty
ab9b6bf36e
ci: Run ui tests after PR merge for status badge
2021-05-26 15:46:41 +05:30
Suraj Shetty
71632073ec
chore: Fix status badge link
2021-05-26 15:45:02 +05:30
Suraj Shetty
df0143f948
Merge pull request #13204 from hasnain2808/allow-naming-series-update
2021-05-26 12:42:47 +05:30
hasnain2808
71604d479a
chore: Merge branch 'develop' into allow-naming-series-update
...
:# Please enter a commit message to explain why this merge is necessary,
2021-05-26 11:30:55 +05:30
Akshay Kumar Tripathi
b0f1bbc378
fix: corrected the function get_url ( #13330 )
...
* Removed /Form from the function get_url
As per issue #12820 , I think /Form was causing a problem so I removed it. Now the get_url returns URL in the format: "app/doctype/name".
* fix: Change to f-strings
* Implement slug on get_url
* Removed slug for names
2021-05-26 05:07:50 +00:00
mergify[bot]
8ebc251394
Merge pull request #13065 from gavindsouza/api-updates
...
fix: Evaluate boolean values better via /api/resource/<doctype>
2021-05-26 04:41:55 +00:00
Suraj Shetty
8764134309
ci: Run mariadb tests after PR merge for coverage badge
2021-05-26 10:02:12 +05:30
Gavin D'souza
b215921a97
fix: Convert only as_dict and debug values to bool
...
Given the scope of its usage at this point, this becomes a problem when you'd have a field named y,n, true, false and order_by that field, or have the same values for a document name that parent parameter would accept out of all those that Frappe REST allows.
2021-05-25 21:44:54 +05:30
mergify[bot]
21473aced7
Merge pull request #13338 from resilient-tech/fix-cb-grid
...
fix: double checkboxes in editable grid
2021-05-25 15:47:38 +00:00
leela
45b709906f
fix: display currency in auto email report
...
Currently currency is always showed as INR(default) irrespective of what currency
field option is.
To get the field currency, the whole document(record) is needed. Fixed
it by passing the document record.
(cherry picked from commit 2e58d669e22e7fc8804ddfd759cdfe24f03d2916)
2021-05-25 14:33:27 +00:00
Sagar Vora
e79ce22d4d
fix: double checkboxes showing in editable grid
2021-05-25 19:41:03 +05:30
Suraj Shetty
878ac658b2
Merge pull request #13333 from surajshetty3416/fix-breakpoint
...
feat: Add grid breakpoint css_variables
2021-05-25 16:08:22 +05:30
mergify[bot]
1c5747bf71
Merge pull request #13286 from gavindsouza/router-fix
...
fix: Don't strip 'app' from doctype route names
2021-05-25 10:31:12 +00:00
Suraj Shetty
ad8b844942
feat: Add grid breakpoint css_variables
...
So that other apps does not have to be dependant on 'variables' file to get grid sizes
2021-05-25 15:51:59 +05:30
shariquerik
d30e6f6a43
fix: refactor code
2021-05-25 15:34:22 +05:30
shariquerik
2bbf71ade0
fix: refactor code
2021-05-25 15:30:12 +05:30
Gavin D'souza
f94ee120c2
Merge branch 'develop' into website-theme-fixes
2021-05-25 15:24:22 +05:30
mergify[bot]
b7312545f2
Merge pull request #13296 from resilient-tech/fix-col-heading
...
fix: set title attribute for grid header columns
2021-05-25 09:52:32 +00:00
mergify[bot]
b726f4bff7
Merge pull request #13325 from frappe/dependabot/npm_and_yarn/browserslist-4.16.6
...
chore(deps): bump browserslist from 4.4.2 to 4.16.6
2021-05-25 05:39:45 +00:00
gavin
6fb979b81c
Merge pull request #13206 from ankush/slack_disable_link
...
feat(minor): option to disable button in slack message
2021-05-25 11:05:34 +05:30
