Commit graph

23745 commits

Author SHA1 Message Date
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
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
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
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
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
prssanna
729f23735e fix: add title to msgprint 2020-03-05 15:18:03 +05:30
prssanna
7c3c47fd83 fix: use functools.wrap 2020-03-05 15:10:27 +05:30
Shivam Mishra
81fd7641d5 refactor: disable sorting for charts section 2020-03-05 15:08:39 +05:30
Shivam Mishra
492a5ad0d0 feat: disable customization for mobile or when specified 2020-03-05 15:06:19 +05:30
Aditya Hase
4740e4f7e6 refactor: Monitor
Do not collect request headers
Collect job wait time and whether it was scheduled
2020-03-05 15:06:15 +05:30
Aditya Hase
268c577acd fix(monitor): Include request ip in monitored data 2020-03-05 15:06:15 +05:30
Aditya Hase
2b8c5a7f47 fix: Push a newline after all logs 2020-03-05 15:06:15 +05:30
Aditya Hase
cb3507f5e4 fix(monitor): Use datetime.utcnow() instead of timezone.utc
Python 2, 3 compatibility issue
2020-03-05 15:06:15 +05:30
Aditya Hase
56e1cdde53 fix(monitor): Add UUID to every log 2020-03-05 15:06:15 +05:30
Aditya Hase
ea3f5632d1 fix(monitor): Remove unused imports 2020-03-05 15:06:15 +05:30
Aditya Hase
96d9f2624b fix(monitor): Maintain MAX_LOG entries in cache 2020-03-05 15:06:15 +05:30
Aditya Hase
af3c4feb64 feat: Monitor
Collect HTTP Request and Background Job logs
2020-03-05 15:06:15 +05:30
prssanna
3fb2b6795c fix: code formatting 2020-03-05 14:40:49 +05:30
prssanna
2786518280 fix: fix postgres tests 2020-03-05 14:29:29 +05:30
Faris Ansari
df0f8fa5d7 fix: Render email preview in an iframe 2020-03-05 14:05:50 +05:30
Shivam Mishra
af475a7d5d fix (cleanup): remove incomplete dependencies data 2020-03-05 11:31:19 +05:30
Shivam Mishra
8764661a72 fix: remove incomplete dependencies in migrate script 2020-03-05 11:22:39 +05:30
nehasacher143
d2369f76f6
feat: disable fields for comment (#9637)
* feat: disabled email and name fields for comments

* fix: disabled fields only for logged in users
2020-03-04 14:22:05 +00:00
Priyanka Gangar
f64785c895
fix: tag updating does work in preserve order (#9510)
* fix: tag updating does work in preserve order

* Removed Used Data

* Minor Changes

* Modified Changes with unique

* fix: revert sort order for Tag

Co-authored-by: pinka0925 <44537026+pinka0925@users.noreply.github.com>
2020-03-04 11:16:31 +00:00
Shridhar Patil
6397ffc6c5
fix: Create contact moved to background job in user (#9462)
* create contact moved to after insert hook in User

* [feat]: Update contact infomartion in background

* fix: create contact in foreground for tests
2020-03-04 11:15:37 +00:00
mergify[bot]
7fd609374b
Merge pull request #9484 from ruchamahabal/onboarding_slide_fixes
fix: Onboarding Dialog
2020-03-04 08:31:25 +00:00
Bernhard Sirlinger
7da5298a98
chore(deps): bump snyk from 1.297.2 to 1.297.4 (#9633)
Bumps [snyk](https://github.com/snyk/snyk) from 1.297.2 to 1.297.4.
- [Release notes](https://github.com/snyk/snyk/releases)
- [Changelog](https://github.com/snyk/snyk/blob/master/.releaserc)
- [Commits](https://github.com/snyk/snyk/compare/v1.297.2...v1.297.4)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>

Co-authored-by: dependabot-preview[bot] <27856297+dependabot-preview[bot]@users.noreply.github.com>
2020-03-04 09:10:52 +05:30
Bernhard Sirlinger
53b899343e
chore(deps): bump urllib3 from 1.25.7 to 1.25.8 (#9624)
Bumps [urllib3](https://github.com/urllib3/urllib3) from 1.25.7 to 1.25.8.
- [Release notes](https://github.com/urllib3/urllib3/releases)
- [Changelog](https://github.com/urllib3/urllib3/blob/master/CHANGES.rst)
- [Commits](https://github.com/urllib3/urllib3/compare/1.25.7...1.25.8)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>

Co-authored-by: dependabot-preview[bot] <27856297+dependabot-preview[bot]@users.noreply.github.com>
2020-03-03 07:45:57 +05:30