Commit graph

24677 commits

Author SHA1 Message Date
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
mergify[bot]
50da7acba7
Merge pull request #10106 from surajshetty3416/fix-child-table-style
fix: Grid Form style
2020-04-27 06:04:44 +00:00
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
3292cfb82d fix(style): Make grid form look visually centered & fix scrolling
- Scroll -15px to make grid form look visually centered
- Do not scroll if grid is displayed in modal
2020-04-26 20:36:01 +05:30
Suraj Shetty
84a3d9271e fix: Only make form-area scrollable
- Exclude grid-form-footer from scrolling area
2020-04-26 20:32:51 +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
Faris Ansari
a77c35be1d fix: Set image fieldtype to Attach Image 2020-04-26 15:24:22 +05:30
Faris Ansari
cac0592a77 fix: Add flexible content area in Footer template 2020-04-26 15:24:10 +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
Faris Ansari
252713236f fix: Duplicate statement 2020-04-26 14:53:45 +05:30
Faris Ansari
1e2744318e fix: Markdown styles 2020-04-26 14:53:34 +05:30
Faris Ansari
6996ff3059 fix: Update modified of Web Page 2020-04-25 20:51:38 +05:30
Faris Ansari
9c7f01b59d fix: Style 2020-04-25 20:51:29 +05:30
Faris Ansari
42586041c1 fix: Remove unnecessary error handling 2020-04-25 20:50:57 +05:30
Faris Ansari
c676174908 fix: Unused variable name 2020-04-25 20:50:43 +05:30
Faris Ansari
31b8b53e88 fix: Use assertEqual instead of assertEquals
- assertEquals will be deprecated
2020-04-25 20:50:31 +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
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
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
Faris Ansari
152f2fa798 fix: Set developer_mode explicitly 2020-04-25 16:00:04 +05:30
Faris Ansari
dbf180f368 fix: Handle empty image 2020-04-25 15:48:05 +05:30
Faris Ansari
c4891b47be chore: Install bench via pip 2020-04-25 15:47:45 +05:30
Suraj Shetty
8dbc7ecff4 test: Force weblink input 2020-04-25 15:26:59 +05:30
Faris Ansari
e8e64012e6 tests: Fix exporter tests 2020-04-25 15:22:35 +05:30
Faris Ansari
d0b725b347 chore: Install node 12 via nvm 2020-04-25 14:58:25 +05:30
Suraj Shetty
ba9b8a4060 test: Remove unnecessary website page visit 2020-04-25 14:55:12 +05:30
Faris Ansari
816ccade2b chore: Set node version to 12 2020-04-25 14:51:26 +05:30
Faris Ansari
280e7d982e feat: Blur-up images before loading 2020-04-25 14:48:43 +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