Commit graph

2952 commits

Author SHA1 Message Date
mergify[bot]
7832b138e7
Merge pull request #10114 from netchampfaris/dib-fixes
fix: Validate value only if value is set
2020-04-27 10:11:22 +00:00
Faris Ansari
fc94add547 fix: Show child table after fieldname in warnings 2020-04-27 14:36:32 +05:30
Faris Ansari
f9ff4e6af7 fix: Validate value only if it is set 2020-04-27 14:36:12 +05:30
Faris Ansari
d8a0b8cc53 fix: Allow Yes, No, Y, N values for Check fields 2020-04-27 14:35:47 +05:30
Faris Ansari
b8a50f063f Merge branch 'develop' of https://github.com/frappe/frappe into page-builder-tailwind-blurred-images 2020-04-27 13:06:40 +05:30
Michelle Alva
027ec14bd7
fix: convert max_file_size to int
Traceback (most recent call last):
  File "/home/frappe/benches/bench-12-f1-0/apps/frappe/frappe/app.py", line 62, in application
    response = frappe.api.handle()
  File "/home/frappe/benches/bench-12-f1-0/apps/frappe/frappe/api.py", line 55, in handle
    return frappe.handler.handle()
  File "/home/frappe/benches/bench-12-f1-0/apps/frappe/frappe/handler.py", line 22, in handle
    data = execute_cmd(cmd)
  File "/home/frappe/benches/bench-12-f1-0/apps/frappe/frappe/handler.py", line 61, in execute_cmd
    return frappe.call(method, **frappe.form_dict)
  File "/home/frappe/benches/bench-12-f1-0/apps/frappe/frappe/__init__.py", line 1054, in call
    return fn(*args, **newargs)
  File "/home/frappe/benches/bench-12-f1-0/apps/frappe/frappe/handler.py", line 198, in upload_file
    ret.save(ignore_permissions=ignore_permissions)
  File "/home/frappe/benches/bench-12-f1-0/apps/frappe/frappe/model/document.py", line 273, in save
    return self._save(*args, **kwargs)
  File "/home/frappe/benches/bench-12-f1-0/apps/frappe/frappe/model/document.py", line 296, in _save
    self.insert()
  File "/home/frappe/benches/bench-12-f1-0/apps/frappe/frappe/model/document.py", line 223, in insert
    self.run_method("before_insert")
  File "/home/frappe/benches/bench-12-f1-0/apps/frappe/frappe/model/document.py", line 794, in run_method
    out = Document.hook(fn)(self, *args, **kwargs)
  File "/home/frappe/benches/bench-12-f1-0/apps/frappe/frappe/model/document.py", line 1065, in composer
    return composed(self, method, *args, **kwargs)
  File "/home/frappe/benches/bench-12-f1-0/apps/frappe/frappe/model/document.py", line 1048, in runner
    add_to_return_value(self, fn(self, *args, **kwargs))
  File "/home/frappe/benches/bench-12-f1-0/apps/frappe/frappe/model/document.py", line 788, in <lambda>
    fn = lambda self, *args, **kwargs: getattr(self, method)(*args, **kwargs)
  File "/home/frappe/benches/bench-12-f1-0/apps/frappe/frappe/core/doctype/file/file.py", line 55, in before_insert
    self.save_file(content=self.content, decode=self.decode)
  File "/home/frappe/benches/bench-12-f1-0/apps/frappe/frappe/core/doctype/file/file.py", line 439, in save_file
    self.file_size = self.check_max_file_size()
  File "/home/frappe/benches/bench-12-f1-0/apps/frappe/frappe/core/doctype/file/file.py", line 495, in check_max_file_size
    if file_size > max_file_size:
TypeError: '>' not supported between instances of 'int' and 'str'
2020-04-26 14:59:26 +05:30
Faris Ansari
f7109d6294 Merge branch 'develop' of https://github.com/frappe/frappe into page-builder-tailwind-blurred-images 2020-04-25 19:52:17 +05:30
Suraj Shetty
e5d171b54a
Merge branch 'develop' into allow-truncated-img 2020-04-25 19:22:19 +05:30
Faris Ansari
e8e64012e6 tests: Fix exporter tests 2020-04-25 15:22:35 +05:30
Suraj Shetty
e4a566b877
Merge branch 'develop' into file-permission-fix 2020-04-25 12:40:56 +05:30
Suraj Shetty
92c43f70fb
Merge branch 'develop' into file-permission-fix 2020-04-24 23:17:23 +05:30
Suraj Shetty
c5b40565a4
Merge branch 'develop' into test-case-for-default-user-permission-develop 2020-04-24 23:05:03 +05:30
mergify[bot]
4e3706763a
Merge pull request #10040 from Thunderbottom/data-validation-fix
fix: skip validation if oldfieldtype is not set to data
2020-04-24 17:26:11 +00:00
mergify[bot]
c4f8471960
Merge pull request #10011 from gavindsouza/update-password
fix: Message on reset password
2020-04-24 17:25:02 +00:00
Gavin D'souza
442810e7c0 fix: updated http_status_code and message 2020-04-24 18:33:53 +05:30
Rohit Waghchaure
8600e4e150 fix: added test case for default user permission 2020-04-24 18:23:39 +05:30
prssanna
b9baa63cfd fix: fix file permissions
Co-authored-by: Suraj Shetty <surajshetty3416@gmail.com>
2020-04-24 13:44:41 +05:30
Gavin D'souza
a55589ec8d chore: remove unused imports 2020-04-24 13:06:02 +05:30
Gavin D'souza
8144ae3bff style: sort imports 2020-04-24 13:01:13 +05:30
Gavin D'souza
ce4560078a fix: allow truncated image files
Reason: "IOError: broken data stream when reading image file"
Reference: https://github.com/python-pillow/Pillow/issues/1510
2020-04-24 12:58:22 +05:30
Chinmay Pai
0296908f18
fix: only allow ldap reset password for system manager (#10076)
* fix: only allow ldap reset password for system manager

Signed-off-by: Chinmay D. Pai <chinmaydpai@gmail.com>

* chore: only check for system manager

Signed-off-by: Chinmay D. Pai <chinmaydpai@gmail.com>

* fix: Syntax error

Co-authored-by: Suraj Shetty <13928957+surajshetty3416@users.noreply.github.com>
2020-04-23 17:52:15 +05:30
Rucha Mahabal
8c63e4de2e fix(minor): Value Error during importing or exporting document files in migrate 2020-04-23 01:49:43 +05:30
mergify[bot]
118d1e3de6
Merge pull request #10042 from ruchamahabal/move-video
fix: Permissions for Video DocType
2020-04-22 08:22:35 +00:00
Chinmay D. Pai
919562e60e
fix: skip data validation on creation if oldfieldtype is set
Signed-off-by: Chinmay D. Pai <chinmaydpai@gmail.com>
2020-04-22 12:22:46 +05:30
Rucha Mahabal
be6c58d606 fix: permissions for Video DocType 2020-04-22 12:10:18 +05:30
mergify[bot]
e950b2e45d
Merge pull request #9910 from ruchamahabal/move-video
feat: Add Video DocType
2020-04-22 05:20:55 +00:00
Aditya Hase
f6f55fa0ad
fix(background jobs): Show method name on Background Jobs page. (#10014)
After https://github.com/frappe/frappe/pull/8486 background jobs page doesn't provide any information.
2020-04-20 13:32:18 +05:30
Rushabh Mehta
b7b0f1ddb1
Merge pull request #9999 from rmehta/webview-fixes-1
fix(web view): Made Web Views embeddable & other enhancements
2020-04-20 10:28:08 +05:30
Rushabh Mehta
fb4338b780 fix(test): Exporter test, uses Web Page 2020-04-19 22:18:24 +05:30
prssanna
3b5a1aaa3f fix: fix position of mandatory field in docfield 2020-04-19 21:56:31 +05:30
Rushabh Mehta
9f26548b31 fix(minor): update web page test and allow dashboards for custom doctype 2020-04-19 18:01:06 +05:30
Gavin D'souza
4fa3522c3b Merge branch 'develop' into misc-fix-1 2020-04-17 13:40:49 +05:30
Rucha Mahabal
938684759b fix: update Roles in Video DocType 2020-04-17 13:35:17 +05:30
Suraj Shetty
81706ef773
Merge branch 'develop' into move-video 2020-04-17 12:18:35 +05:30
Suraj Shetty
3db595f06d
Delete test_video.js 2020-04-17 12:15:49 +05:30
Chinmay Pai
6d8540fbe2
Merge pull request #9849 from saurabh6790/scheduler_based_server_scripts 2020-04-17 11:09:22 +05:30
Suraj Shetty
2d21afb49b
Merge pull request #9980 from marination/language-code
fix: User should not be able to create a language
2020-04-17 09:31:33 +05:30
marination
0cdcfdcd9e fix: User should not be able to create a language 2020-04-16 22:13:51 +05:30
Rushabh Mehta
e323441c15 feat: Add Web View to compose webpages with components 2020-04-15 23:12:57 +05:30
mergify[bot]
4fb9717074
Merge pull request #9947 from rohitwaghchaure/fixed_dont_disaply_mandatory_property_to_specific_fieldtype
fix: hide mandatory property for html, section / column break, button…
2020-04-15 04:30:06 +00:00
Rohit Waghchaure
35398e8879 fix: hide mandatory property for html, section / column break, button fieldtype 2020-04-15 02:30:25 +05:30
Suraj Shetty
310f32175b fix: Allow private files if owner is accessing 2020-04-13 17:07:38 +05:30
Suraj Shetty
c188de8947 fix: No access for private files by default 2020-04-13 16:10:34 +05:30
Rucha Mahabal
558fec0d7c fix: move Video DocType from Education Module to Core 2020-04-10 23:40:34 +05:30
Shivam Mishra
d4e6b89863 Merge branch 'develop' of github.com:frappe/frappe into desk-user-custom 2020-04-10 15:48:53 +05:30
Abhishek Kedar
5d92e7cf9f
fix: checking value of send_welcome_email (#9888)
* checking value of send_welcome_email

If send_welcome_email is set to 0 still it is triggering send_welcome_mail_to_user(). Need to check if send_welcome_email=1.
This is required.

* fix: cint(self.send_welcome_email) in user.py

Instead of checking self.send_welcome_email==1 used cint(self.send_welcome_email

Co-Authored-By: Chinmay Pai <chinmaydpai@gmail.com>

* chore: remove list from kwargs

Co-authored-by: Chinmay Pai <chinmaydpai@gmail.com>
2020-04-10 15:30:09 +05:30
Gavin D'souza
0a0045e9cc chore: raise exception via frappe.msgprint 2020-04-10 13:38:51 +05:30
Shivam Mishra
4764f65c13 Merge branch 'develop' of github.com:frappe/frappe into desk-user-custom 2020-04-08 18:12:43 +05:30
Gavin D'souza
24e0174fcf fix: enable validations for email and phone data fields 2020-04-08 12:35:33 +05:30
Shivam Mishra
3dd2c756f1 fix: added comma 2020-04-06 14:00:43 +05:30