Gavin D'souza
|
d8335e7a0e
|
Merge branch 'develop' of github.com:frappe/frappe into fix-broken-folders
|
2020-11-23 11:17:41 +05:30 |
|
mergify[bot]
|
f40aab94e2
|
Merge pull request #11966 from frappe/oauth_fixes
fix: oauth2
|
2020-11-23 00:41:55 +00:00 |
|
barredterra
|
e93a38f912
|
refactor: move encode_params from test to oauth2.py
|
2020-11-20 19:02:33 +01:00 |
|
barredterra
|
bea4f6e11b
|
fix: remove unused import
|
2020-11-20 18:03:17 +01:00 |
|
barredterra
|
9fb635828f
|
refactor: oauth2
|
2020-11-20 17:44:35 +01:00 |
|
barredterra
|
5a52bc73ef
|
fix: cookie value
|
2020-11-20 17:40:56 +01:00 |
|
barredterra
|
6bfe86d127
|
feat: translate oauth confirmation dialog
|
2020-11-20 17:40:20 +01:00 |
|
mergify[bot]
|
c201e9ed3f
|
Merge pull request #11914 from hasnain2808/allow-only-image-comments
fix(comment): allow "only image" in comments
|
2020-11-20 07:22:51 +00:00 |
|
mergify[bot]
|
46cd38fb7c
|
Merge pull request #11963 from frappe/email-html-sanitize
fix: display style removed from emails
|
2020-11-20 07:03:23 +00:00 |
|
Shivam Mishra
|
edbb26d73e
|
fix: display style removed from emails
|
2020-11-20 11:49:45 +05:30 |
|
gavin
|
f5f30a66a7
|
Merge pull request #11935 from gavindsouza/get_local_image
fix: Manage private images via get_local_image
|
2020-11-19 16:07:57 +05:30 |
|
mergify[bot]
|
a3b6c95b02
|
Merge pull request #11883 from scmmishra/fix-workflow-query
fix: fetch doc from db in get_transitions
|
2020-11-18 11:34:48 +00:00 |
|
mergify[bot]
|
3740253687
|
Merge pull request #11950 from frappe/mergify/bp/develop/pr-11526
fix: Define chunk size based on backup file size to avoid timeout issues (bp #11526)
|
2020-11-18 11:06:46 +00:00 |
|
mergify[bot]
|
1affc41aa6
|
Merge pull request #11869 from prssanna/prepared-report-batch-deletion
fix: delete prepared reports in batches
|
2020-11-18 10:43:30 +00:00 |
|
mergify[bot]
|
962b2a6e75
|
Merge pull request #11940 from surajshetty3416/maximum-attachment-limit-validation-develop
fix: Maximum attachment limit validation
|
2020-11-18 10:39:18 +00:00 |
|
Suraj Shetty
|
ca3515c05a
|
Merge branch 'develop' into prepared-report-batch-deletion
|
2020-11-18 15:57:18 +05:30 |
|
Suraj Shetty
|
2e05df2680
|
Merge branch 'develop' into mergify/bp/develop/pr-11526
|
2020-11-18 15:56:38 +05:30 |
|
Suraj Shetty
|
514f0dddd3
|
Merge branch 'develop' into fix-workflow-query
|
2020-11-18 15:55:55 +05:30 |
|
Suraj Shetty
|
a05ea1eea6
|
Merge branch 'develop' into maximum-attachment-limit-validation-develop
|
2020-11-18 15:54:37 +05:30 |
|
mergify[bot]
|
3d922183c7
|
Merge pull request #11104 from gavindsouza/skip-backup-tables
feat: Allow skip or backup only specific DocTypes during backups
|
2020-11-18 09:48:14 +00:00 |
|
Suraj Shetty
|
64ad7594d2
|
Merge branch 'develop' into fix-workflow-query
|
2020-11-18 14:33:21 +05:30 |
|
Suraj Shetty
|
e084bfd83a
|
Merge branch 'develop' into maximum-attachment-limit-validation-develop
|
2020-11-18 14:32:37 +05:30 |
|
Suraj Shetty
|
189c6cb771
|
style: Remove unused import
|
2020-11-18 14:01:14 +05:30 |
|
Suraj Shetty
|
887f4b0d61
|
fix: Resolve conflicts
|
2020-11-18 13:54:57 +05:30 |
|
gavin
|
c57c316f4d
|
Merge pull request #11930 from gavindsouza/installer-validate
fix: Validate SQL files better
|
2020-11-18 12:40:27 +05:30 |
|
Shivam Mishra
|
563761cbb6
|
Merge pull request #11827 from ruchamahabal/fix-auto-repeat-field-creation
fix: create auto_repeat field only if docfield/custom field does not exist
|
2020-11-18 11:25:04 +05:30 |
|
Saurabh
|
cb6c704671
|
fix: Define chunk size based on backup file size to avoid timeout issues (#11526)
Co-authored-by: Suraj Shetty <13928957+surajshetty3416@users.noreply.github.com>
(cherry picked from commit 5020bbe4f68abaf5f9c019efff6105573d2ed5c0)
# Conflicts:
# frappe/integrations/offsite_backup_utils.py
|
2020-11-18 05:42:19 +00:00 |
|
Suraj Shetty
|
cc60993120
|
Merge branch 'develop' into installer-validate
|
2020-11-18 10:53:37 +05:30 |
|
Himanshu
|
f37789280b
|
fix(user defaults): Set user selected timezone in user defaults (#11902)
Co-authored-by: Sahil Khan <sahilkhan28297@gmail.com>
Co-authored-by: Sahil Khan <sahilkhan28297@gmail.com>
|
2020-11-18 10:47:33 +05:30 |
|
Suraj Shetty
|
ab811b3a2d
|
Merge branch 'develop' into fix-workflow-query
|
2020-11-18 10:32:56 +05:30 |
|
Suraj Shetty
|
245931def4
|
Merge branch 'develop' into prepared-report-batch-deletion
|
2020-11-18 10:32:47 +05:30 |
|
Suraj Shetty
|
7e0b003d1f
|
Merge branch 'develop' into maximum-attachment-limit-validation-develop
|
2020-11-18 10:32:17 +05:30 |
|
mergify[bot]
|
c13e04b97c
|
Merge pull request #11911 from gavindsouza/uninstall-app-enhancements-0
fix: Uninstall app enhancements
|
2020-11-17 14:34:10 +00:00 |
|
Mohammad Hasnain
|
7f012b73b4
|
feat: solve translation string issues
|
2020-11-17 19:18:44 +05:30 |
|
mergify[bot]
|
d90673fd38
|
Merge pull request #11927 from conncampbell/11685-web-form-dependancy-read-only-req
feat: Web form fields support for property depends on fields (read-on…
|
2020-11-17 13:29:58 +00:00 |
|
prssanna
|
b90980406c
|
fix: increase batch limit
|
2020-11-17 18:53:31 +05:30 |
|
Gavin D'souza
|
39da1e0363
|
fix: Raise error if executable not found in PATH
|
2020-11-17 18:44:34 +05:30 |
|
Gavin D'souza
|
f1cd3388ba
|
style: Black-ish + fixed typos + Optimized imports
|
2020-11-17 16:29:54 +05:30 |
|
Gavin D'souza
|
2911799046
|
fix: Re-write restore tests to process another site
|
2020-11-17 15:14:23 +05:30 |
|
Suraj Shetty
|
1685afc49e
|
fix: Update limit validation message
|
2020-11-17 13:49:10 +05:30 |
|
Suraj Shetty
|
a7264405b5
|
style: Fix formatting
|
2020-11-17 13:49:10 +05:30 |
|
Suraj Shetty
|
e64483ad89
|
test: Add test for attachment limit validation
|
2020-11-17 13:49:10 +05:30 |
|
Suraj Shetty
|
42fc8fb25c
|
fix: Convert limit to integer
|
2020-11-17 13:49:10 +05:30 |
|
Suraj Shetty
|
a2471ace21
|
fix: Update attachment limit
|
2020-11-17 13:49:10 +05:30 |
|
Suraj Shetty
|
23efc9919a
|
fix: Update validation message
|
2020-11-17 13:49:10 +05:30 |
|
Suraj Shetty
|
b33461bb53
|
feat: Add server-side validation for attachment limit
|
2020-11-17 13:49:10 +05:30 |
|
Suraj Shetty
|
7d091c1957
|
fix: Move attachment limit validation to file uploader
|
2020-11-17 13:48:08 +05:30 |
|
Shivam Mishra
|
79fc9e2ac7
|
Merge pull request #11925 from scmmishra/fix-report-child-table-permission-error
fix: TypeError on saving report with child table
|
2020-11-17 12:52:16 +05:30 |
|
Gavin D'souza
|
3b5ec6aa88
|
fix: Sider + improper command ending
|
2020-11-17 12:45:55 +05:30 |
|
Gavin D'souza
|
84e2fcd6a8
|
fix: Add missing quote
|
2020-11-17 12:33:59 +05:30 |
|