Merge branch 'version-14' of https://github.com/frappe/frappe into ve…

…rsion-14
aliriocastro · Apr 9, 2024 · 71f0738 · 71f0738
2 parents dc1d000 + c3350b8
commit 71f0738
Show file tree

Hide file tree

Showing 40 changed files with 638 additions and 638 deletions.
diff --git a/frappe/commands/scheduler.py b/frappe/commands/scheduler.py
diff --git a/frappe/core/doctype/communication/email.py b/frappe/core/doctype/communication/email.py
diff --git a/frappe/core/doctype/data_import/fixtures/sample_import_file.csv b/frappe/core/doctype/data_import/fixtures/sample_import_file.csv
@@ -1,5 +1,5 @@
-Title  ,Description        ,Number ,Duration,another_number ,ID (Table Field 1),Child Title (Table Field 1),Child Description (Table Field 1),Child 2 Title (Table Field 2),Child 2 Date (Table Field 2),Child 2 Number (Table Field 2),Child Title (Table Field 1 Again),Child Date (Table Field 1 Again),Child Number (Table Field 1 Again),table_field_1_again.child_another_number
-Test   ,test description   ,1,3h,2,                 ,child title                 ,child description                 ,child title                   ,14-08-2019,4,child title again                 ,22-09-2020,5,7
-       ,                   ,       ,,               ,                   ,child title 2,child description 2,title child                   ,30-10-2019,5,child title again 2,22-09-2021,                                   ,
-Test 2,test description 2,1,4d 3h,2,                   ,child mandatory title       ,                                  ,title child man               ,                             ,                               ,child mandatory again             ,                                 ,                                   ,
+Title  ,Description        ,Number ,Duration,another_number ,ID (Table Field 1),Child Title (Table Field 1),Child Description (Table Field 1),Child 2 Title (Table Field 2),Child 2 Date (Table Field 2),Child 2 Number (Table Field 2),Child Title (Table Field 1 Again),Child Date (Table Field 1 Again),Child Number (Table Field 1 Again),table_field_1_again.child_another_number
+Test   ,test description   ,1,3h,2,                 ,child title                 ,child description                 ,child title                   ,14-08-2019,4,child title again                 ,22-09-2020,5,7
+       ,                   ,       ,,               ,                   ,child title 2,child description 2,title child                   ,30-10-2019,5,child title again 2,22-09-2021,                                   ,
+Test 2,test description 2,1,4d 3h,2,                   ,child mandatory title       ,                                  ,title child man               ,                             ,                               ,child mandatory again             ,                                 ,                                   ,
 Test 3,test description 3,4,5d 5h 45m,5,                 ,child title asdf            ,child description asdf            ,child title asdf adsf         ,15-08-2019,6,child title again asdf            ,22-09-2022,9,71
diff --git a/frappe/core/doctype/file/file.py b/frappe/core/doctype/file/file.py
diff --git a/frappe/core/doctype/sms_parameter/__init__.py b/frappe/core/doctype/sms_parameter/__init__.py
diff --git a/frappe/core/doctype/sms_parameter/sms_parameter.json b/frappe/core/doctype/sms_parameter/sms_parameter.json
diff --git a/frappe/core/doctype/sms_settings/__init__.py b/frappe/core/doctype/sms_settings/__init__.py
diff --git a/frappe/core/doctype/sms_settings/sms_settings.json b/frappe/core/doctype/sms_settings/sms_settings.json
diff --git a/frappe/desk/page/setup_wizard/setup_wizard.py b/frappe/desk/page/setup_wizard/setup_wizard.py
diff --git a/frappe/email/doctype/email_account/email_account.py b/frappe/email/doctype/email_account/email_account.py
diff --git a/frappe/email/doctype/email_group/email_group.py b/frappe/email/doctype/email_group/email_group.py
diff --git a/frappe/email/email_body.py b/frappe/email/email_body.py
diff --git a/frappe/email/queue.py b/frappe/email/queue.py
diff --git a/frappe/integrations/doctype/s3_backup_settings/__init__.py b/frappe/integrations/doctype/s3_backup_settings/__init__.py
diff --git a/frappe/integrations/doctype/s3_backup_settings/s3_backup_settings.js b/frappe/integrations/doctype/s3_backup_settings/s3_backup_settings.js
diff --git a/frappe/integrations/doctype/s3_backup_settings/s3_backup_settings.json b/frappe/integrations/doctype/s3_backup_settings/s3_backup_settings.json
diff --git a/frappe/integrations/doctype/s3_backup_settings/s3_backup_settings.py b/frappe/integrations/doctype/s3_backup_settings/s3_backup_settings.py
diff --git a/frappe/integrations/doctype/s3_backup_settings/test_s3_backup_settings.py b/frappe/integrations/doctype/s3_backup_settings/test_s3_backup_settings.py
diff --git a/frappe/public/css/octicons/LICENSE.txt b/frappe/public/css/octicons/LICENSE.txt
diff --git a/frappe/public/css/octicons/README.md b/frappe/public/css/octicons/README.md
diff --git a/frappe/public/css/octicons/octicons-local.ttf b/frappe/public/css/octicons/octicons-local.ttf
diff --git a/frappe/public/css/octicons/octicons.css b/frappe/public/css/octicons/octicons.css
diff --git a/frappe/public/css/octicons/octicons.eot b/frappe/public/css/octicons/octicons.eot
diff --git a/frappe/public/css/octicons/octicons.less b/frappe/public/css/octicons/octicons.less
diff --git a/frappe/public/css/octicons/octicons.scss b/frappe/public/css/octicons/octicons.scss
diff --git a/frappe/public/css/octicons/octicons.svg b/frappe/public/css/octicons/octicons.svg
diff --git a/frappe/public/css/octicons/octicons.ttf b/frappe/public/css/octicons/octicons.ttf
diff --git a/frappe/public/css/octicons/octicons.woff b/frappe/public/css/octicons/octicons.woff
diff --git a/frappe/public/css/octicons/sprockets-octicons.scss b/frappe/public/css/octicons/sprockets-octicons.scss
diff --git a/frappe/public/images/default-skin.svg b/frappe/public/images/default-skin.svg
diff --git a/frappe/public/js/frappe/views/communication.js b/frappe/public/js/frappe/views/communication.js
diff --git a/frappe/public/js/lib/jSignature.min.js b/frappe/public/js/lib/jSignature.min.js