Commit graph

23772 commits

Author SHA1 Message Date
Suraj Shetty
98f5366fac
fix: Remove duplicate on_trash key 2020-03-14 16:16:16 +05:30
Suraj Shetty
6b2dd7ca00
Merge branch 'develop' into setup-wizard-dev 2020-03-12 20:11:14 +05:30
Suraj Shetty
b937311ab3
chore(mergify): configuration update (#9682) 2020-03-12 20:07:27 +05:30
Nabin Hait
1d6c3a9acd
fix: Run dashboard patch if table already exists (#9678) 2020-03-12 18:58:47 +05:30
Suraj Shetty
2233235ec2
fix: duplicate entry error while renaming item (#9651)
Co-authored-by: Rohit Waghchaure <rohitw1991@gmail.com>
2020-03-12 18:38:45 +05:30
Suraj Shetty
0088f27f71
Merge branch 'develop' into setup-wizard-dev 2020-03-12 18:29:31 +05:30
Suraj Shetty
1c5ee05300
Revert __init__.py 2020-03-12 18:27:29 +05:30
Shivam Mishra
fbcd034710
Merge pull request #9677 from scmmishra/desk-improvements
feat: desk improvements
2020-03-12 17:55:48 +05:30
Shivam Mishra
432d5842a4 fix (linting): added semicolon 2020-03-12 17:25:18 +05:30
Shivam Mishra
8d0f026eeb refactor: return promise explicitly 2020-03-12 17:10:27 +05:30
Shivam Mishra
5f47f2dd36 refactor: minor improvements 2020-03-12 16:41:56 +05:30
Shivam Mishra
ec36479b6a refactor: merge custom reports and doctype 2020-03-12 16:41:42 +05:30
Shivam Mishra
6461a01fc5 feat: update doctype 2020-03-12 16:33:37 +05:30
Shivam Mishra
6a953e6801 feat: allow extending pages 2020-03-12 16:27:37 +05:30
Shivam Mishra
85c436ac1b feat: updated client script 2020-03-12 16:27:25 +05:30
mergify[bot]
41f5dfc120
Merge pull request #9672 from sahil28297/fix_gsuite_develop
fix(GSuite): remove deprecated GSuite doctypes
2020-03-12 09:45:03 +00:00
Shivam Mishra
52bf52790d refactor: desk page update handling 2020-03-12 14:25:25 +05:30
mergify[bot]
2cc95c4566
Merge pull request #9669 from Mangesh-Khairnar/fix-webform-list
fix: create option to load more entries
2020-03-12 08:54:53 +00:00
Shivam Mishra
bdb34ea006 feat: update is_standard for integrations page 2020-03-12 11:32:00 +05:30
Shivam Mishra
639e105ec2 refactor: filter shortcuts based on domains 2020-03-12 11:31:48 +05:30
Shivam Mishra
1c68e4582d refactor: page update logic 2020-03-12 11:31:25 +05:30
Shivam Mishra
fdd4a94fe2 feat: add restrict to domain in cards 2020-03-12 11:31:10 +05:30
Shivam Mishra
d3b0df0d40 feat: set is_standard 2020-03-12 11:31:00 +05:30
mergify[bot]
613eaea689
Merge pull request #9649 from Thunderbottom/no-mariadb-socket
feat(db): add new-site flag to use tcp/ip instead of unix socket
2020-03-11 20:29:49 +00:00
Sahil Khan
77e66272bc fix(GSuite): remove deprecated GSuite doctypes 2020-03-11 20:53:56 +05:30
Chinmay D. Pai
ca7fc2c17d
chore: delete user on the unix socket as well
Signed-off-by: Chinmay D. Pai <chinmaydpai@gmail.com>
2020-03-11 18:23:20 +05:30
lijiming
4195928090
fix: mismatched translation key (#9667) 2020-03-11 17:59:16 +05:30
Shivam Mishra
fcb5470151 fix: use tabs 2020-03-11 12:32:40 +05:30
Mangesh-Khairnar
7d6957952e fix: do not pass empty values to the filter 2020-03-11 00:11:59 +05:30
Mangesh-Khairnar
303ba2daa3 fix: create option to load more entries 2020-03-10 23:55:31 +05:30
mergify[bot]
c43bddd8d8
Merge pull request #9662 from Thunderbottom/workflow-mail-fix
fix: correctly pickle email_args for workflow emails
2020-03-09 13:00:34 +00:00
mergify[bot]
5da7503efa
Merge pull request #9644 from netchampfaris/preview-email-iframe
fix: Render email preview in an iframe
2020-03-09 12:51:44 +00:00
Shivam Mishra
98d3533c2c
fix: UI tests (#9664)
* fix: fallback for default desk page

* fix: return if reference name does not exist

* refactor: rename to Query Report

* refactor: codacy linting fixes

* refactor: null check for data in workspace

* feat: enable cypress recording

* chore: codacy linting fixes

* refactor: don't set route explicitly

* fix (cypress): wait for request to be complete in grid pagination test

* fix (cypress): explicitly return async calls

* refactor: visit new_form directly

* refactor: skip some scripts for ui tests

* Revert "refactor: skip some scripts for ui tests"

This reverts commit 1e46e3cd5361c2910d25efb244774d153511af53.
2020-03-09 12:30:59 +00:00
Chinmay D. Pai
9d36b05804
fix: correctly pickle email_args for workflow emails
currently, since we return possible actions as dict_values, pickle fails
to work with it with the following error:

```python-traceback
Traceback (most recent call last):
  File "/home/frappe/frappe-bench/apps/frappe/frappe/utils/background_jobs.py", line 99, in execute_job
    method(**kwargs)
  File "/home/frappe/frappe-bench/apps/frappe/frappe/workflow/doctype/workflow_action/workflow_action.py", line 210, in send_workflow_action_email
    enqueue(method=frappe.sendmail, queue='short', **email_args)
  File "/home/frappe/frappe-bench/apps/frappe/frappe/utils/background_jobs.py", line 69, in enqueue
    kwargs=queue_args)
  File "/home/frappe/frappe-bench/env/lib/python3.6/site-packages/rq/queue.py", line 258, in enqueue_call
    job = self.enqueue_job(job, at_front=at_front)
  File "/home/frappe/frappe-bench/env/lib/python3.6/site-packages/rq/queue.py", line 324, in enqueue_job
    job.save(pipeline=pipe)
  File "/home/frappe/frappe-bench/env/lib/python3.6/site-packages/rq/job.py", line 516, in save
    connection.hmset(key, self.to_dict(include_meta=include_meta))
  File "/home/frappe/frappe-bench/env/lib/python3.6/site-packages/rq/job.py", line 469, in to_dict
    obj['data'] = zlib.compress(self.data)
  File "/home/frappe/frappe-bench/env/lib/python3.6/site-packages/rq/job.py", line 234, in data
    self._data = dumps(job_tuple)
TypeError: can't pickle dict_values objects
```

passing the values as a list instead works fine.

Signed-off-by: Chinmay D. Pai <chinmaydpai@gmail.com>
2020-03-07 18:06:02 +05:30
Chinmay D. Pai
004ddacbf1
fix: do not set db_host to % and instead pass to setup_db
db_host != the hostname part after @, hmm. so instead we'll pass
no-mariadb-socket flag to setup_database where we'll drop and create
users with host set to the TCP/IP socket instead of the UNIX socket.

Signed-off-by: Chinmay D. Pai <chinmaydpai@gmail.com>
2020-03-06 13:02:26 +05:30
Shivam Mishra
4441e765c9 feat: add is standard option 2020-03-06 12:49:26 +05:30
Shivam Mishra
8e1df1e034
Merge pull request #9518 from prssanna/refactor-dashboards
refactor(Dashboards): Create dashboard charts from reports and other changes
2020-03-06 12:45:50 +05:30
Shivam Mishra
4370747a8b refactor: remove unused code 2020-03-06 12:45:21 +05:30
Shivam Mishra
50a21bc87d feat: add dashboard chart to separate namespace 2020-03-06 12:28:04 +05:30
Shivam Mishra
b15df49225 Merge branch 'develop' of github.com:frappe/frappe into dashdash 2020-03-06 12:11:50 +05:30
prssanna
8e51dff07e fix: codacy issues 2020-03-06 00:45:38 +05:30
Chinmay D. Pai
e5a896ef00
feat(db): add new-site flag to use tcp/ip instead of unix socket
ref frappe/bench#949

Signed-off-by: Chinmay D. Pai <chinmaydpai@gmail.com>
2020-03-05 23:27:15 +05:30
Aditya Hase
cadb2bb4f2
Merge pull request #9617 from scmmishra/yet-another-yet-another-desk
feat: yet another desk
2020-03-05 21:27:36 +05:30
Aditya Hase
d5fc0cef5d
Merge pull request #9542 from adityahase/feat-monitor
feat: Monitor
2020-03-05 21:24:29 +05:30
Aditya Hase
542a3ce222 fix: Remove flaky assertions 2020-03-05 17:20:59 +05:30
mergify[bot]
fc2073081f
Merge pull request #9543 from adityahase/fix-frequent-scheduler
feat(scheduler): Frequent job scheduling
2020-03-05 11:15:59 +00:00
Aditya Hase
4e69326fac style: Remove unused imports 2020-03-05 16:27:22 +05:30
prssanna
154199b83b fix: codacy 2020-03-05 15:58:40 +05:30
prssanna
0a434693a7 fix: append color picker to wrapper 2020-03-05 15:53:40 +05:30
Aditya Hase
692055499a feat(scheduler): Frequent job scheduling
Scheduler tick interval (default 60 seconds) can now be configured with scheduler_tick_interval key in common_site_config.json
2020-03-05 15:45:19 +05:30