Commit graph

24629 commits

Author SHA1 Message Date
mergify[bot]
27af065bbb
Merge pull request #10001 from RJPvT/patch-7
feat: enable 2fa for ldap users
2020-04-26 18:38:07 +00:00
mergify[bot]
6d0cd17190
Merge pull request #10105 from sagarvora/fix-rollup-dev
fix: proper sass mapping and always failing test
2020-04-26 18:18:36 +00:00
Prssanna Desai
2633c5fedc
Merge pull request #10108 from ruchamahabal/fix-dashboard-chart-filter
fix(minor): Initialise filters in Dashboard Chart
2020-04-26 21:58:39 +05:30
Rucha Mahabal
c4c71bc539 fix: initialise filters in Dashboard Chart 2020-04-26 21:26:28 +05:30
Suraj Shetty
280b68707a
Merge pull request #10101 from frappe/revert-9721-editable-grid-fix-develop 2020-04-26 20:52:56 +05:30
Sagar Vora
4d80b592e2 fix: merge conflict 2020-04-26 20:48:21 +05:30
Sagar Vora
44b78e7fb2 fix: proper sass mapping and always failing test 2020-04-26 20:47:11 +05:30
Suraj Shetty
7503128765
Revert "fix: Set fields in grid form as read only for non-editable grids" 2020-04-26 17:18:11 +05:30
Chinmay Pai
8e772277bb
Merge pull request #10098 from frappe/michellealva-patch-1 2020-04-26 15:15:04 +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
mergify[bot]
777d7aedd4
Merge pull request #10083 from gavindsouza/allow-truncated-img
fix: Allow truncated images
2020-04-25 14:25:28 +00:00
Suraj Shetty
e5d171b54a
Merge branch 'develop' into allow-truncated-img 2020-04-25 19:22:19 +05:30
mergify[bot]
4d8717171a
Merge pull request #10021 from rohitwaghchaure/custom_dashbaiord_options
fix: custom options not adding in the dashboard chart
2020-04-25 13:04:52 +00:00
Suraj Shetty
e2bf18f1b3
Merge branch 'develop' into custom_dashbaiord_options 2020-04-25 17:38:18 +05:30
Suraj Shetty
b0abdfd4cb
Merge pull request #10072 from surajshetty3416/update-cypress 2020-04-25 17:37:41 +05:30
Suraj Shetty
dbee5931d2 test: Fix form.js test
- By waiting for form save
2020-04-25 16:18:10 +05:30
Suraj Shetty
8dbc7ecff4 test: Force weblink input 2020-04-25 15:26:59 +05:30
Suraj Shetty
ba9b8a4060 test: Remove unnecessary website page visit 2020-04-25 14:55:12 +05:30
mergify[bot]
767f4d2aaa
Merge pull request #10091 from rhnvrm/patch-1
feat: add support for golang mode in ace-editor
2020-04-25 09:02:29 +00:00
mergify[bot]
3820ec6e52
Merge pull request #10084 from prssanna/file-permission-fix
fix(File): Private file permissions
2020-04-25 08:56:26 +00:00
Suraj Shetty
6ecd83a27d test: Add type delay while typing file-web-link 2020-04-25 14:24:34 +05:30
Suraj Shetty
6922241d51
Merge branch 'develop' into patch-1 2020-04-25 14:06:25 +05:30
Suraj Shetty
0b6e1cb78e test: Remove unnecessary website visit 2020-04-25 13:59:26 +05:30
Suraj Shetty
01246db252 Merge branch 'update-cypress' of https://github.com/surajshetty3416/frappe into update-cypress 2020-04-25 12:52:22 +05:30
Suraj Shetty
2ed8cacd2f chore: Use chrome browser for test
- Remove unused cypress:run command from package.json
2020-04-25 12:52:14 +05:30
Suraj Shetty
e4a566b877
Merge branch 'develop' into file-permission-fix 2020-04-25 12:40:56 +05:30
Suraj Shetty
cc4e7b4865
Merge branch 'develop' into update-cypress 2020-04-25 12:33:10 +05:30
Suraj Shetty
d1e68d95ad chore: Fix travis config
used https://config.travis-ci.com/explore to verify
2020-04-25 12:17:27 +05:30
Suraj Shetty
1c3077b259
fix: Clear __unsaved flag in insert method (#10094) 2020-04-25 11:56:55 +05:30
Suraj Shetty
6c9b5db2c7 Merge branch 'update-cypress' of https://github.com/surajshetty3416/frappe into update-cypress 2020-04-25 11:56:21 +05:30
Suraj Shetty
15ac34d84f chore: Install chrome to travis 2020-04-25 11:56:08 +05:30
Suraj Shetty
78f2833e64
Merge branch 'develop' into update-cypress 2020-04-25 11:52:31 +05:30
Suraj Shetty
cbaa3b2f8e chore: Use chrome browser for test 2020-04-25 11:48:26 +05:30
Suraj Shetty
6344360132 chore: Cache cypress binary to save time 2020-04-25 11:24:16 +05:30
mergify[bot]
8d8d4afa29
Merge pull request #10087 from scmmishra/remove-red
fix: remove unused red indicator from the legend
2020-04-25 05:43:47 +00:00
mergify[bot]
4bddb0b9f6
Merge pull request #10050 from scmmishra/barcode-width
fix: Override barcode svg width to fit in html area
2020-04-25 05:31:01 +00:00
rohitwaghchaure
9c78c5b564
fix: don't reset the child doc fields value for new record (#10090) 2020-04-25 10:47:13 +05:30
mergify[bot]
ce31e795c9
Merge pull request #10063 from rohitwaghchaure/test-case-for-default-user-permission-develop
fix: added test case for default user permission
2020-04-25 04:09:47 +00:00
Suraj Shetty
e08213e098
Merge branch 'develop' into update-cypress 2020-04-25 09:23:10 +05:30
Suraj Shetty
73c05fbb60
Merge branch 'develop' into test-case-for-default-user-permission-develop 2020-04-25 09:20:20 +05:30
Suraj Shetty
5675144dee
Merge branch 'develop' into file-permission-fix 2020-04-25 09:18:37 +05:30
Suraj Shetty
c0d4d37d9e
Merge branch 'develop' into barcode-width 2020-04-25 09:18:21 +05:30
mergify[bot]
852741581a
Merge pull request #10044 from prssanna/code-expand-button
fix: move expand button after description and change label according to state
2020-04-24 18:03:06 +00:00
Suraj Shetty
92c43f70fb
Merge branch 'develop' into file-permission-fix 2020-04-24 23:17:23 +05:30
Suraj Shetty
2aee5f64ef
Merge branch 'develop' into patch-1 2020-04-24 23:07:12 +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
Gavin D'souza
e0d9cf50df fix: update password API mapping for /update-password 2020-04-24 18:32:03 +05:30