Commit graph

23518 commits

Author SHA1 Message Date
Bernhard Sirlinger
3edc7db2ed
chore(deps): bump beautifulsoup4 from 4.8.1 to 4.8.2 (#9572)
Bumps [beautifulsoup4](http://www.crummy.com/software/BeautifulSoup/bs4/) from 4.8.1 to 4.8.2.

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

Co-authored-by: dependabot-preview[bot] <27856297+dependabot-preview[bot]@users.noreply.github.com>
2020-02-28 14:31:31 +05:30
Bernhard Sirlinger
5dbdc63dfc
chore(deps): bump pyasn1 from 0.4.7 to 0.4.8 (#9571)
Bumps [pyasn1](https://github.com/etingof/pyasn1) from 0.4.7 to 0.4.8.
- [Release notes](https://github.com/etingof/pyasn1/releases)
- [Changelog](https://github.com/etingof/pyasn1/blob/master/CHANGES.rst)
- [Commits](https://github.com/etingof/pyasn1/compare/v0.4.7...v0.4.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-02-28 14:29:32 +05:30
Bernhard Sirlinger
6e8b6ad819
chore(deps): bump markdown2 from 2.3.7 to 2.3.8 (#9573)
Bumps [markdown2](https://github.com/trentm/python-markdown2) from 2.3.7 to 2.3.8.
- [Release notes](https://github.com/trentm/python-markdown2/releases)
- [Changelog](https://github.com/trentm/python-markdown2/blob/master/CHANGES.md)
- [Commits](https://github.com/trentm/python-markdown2/compare/2.3.7...2.3.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-02-28 14:28:53 +05:30
Bernhard Sirlinger
da82949ee5
chore(deps): bump frappe-datatable from 1.14.0 to 1.15.1 (#9569)
Bumps [frappe-datatable](https://github.com/frappe/datatable) from 1.14.0 to 1.15.1.
- [Release notes](https://github.com/frappe/datatable/releases)
- [Commits](https://github.com/frappe/datatable/compare/v1.14.0...v1.15.1)

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

Co-authored-by: dependabot-preview[bot] <27856297+dependabot-preview[bot]@users.noreply.github.com>
2020-02-28 12:33:49 +05:30
Bernhard Sirlinger
f5189119f4
chore(deps): bump vue and vue-template-compiler (#9568)
Bumps [vue](https://github.com/vuejs/vue) and [vue-template-compiler](https://github.com/vuejs/vue). These dependencies needed to be updated together.

Updates `vue` from 2.6.8 to 2.6.11
- [Release notes](https://github.com/vuejs/vue/releases)
- [Commits](https://github.com/vuejs/vue/compare/v2.6.8...v2.6.11)

Updates `vue-template-compiler` from 2.6.8 to 2.6.11
- [Release notes](https://github.com/vuejs/vue/releases)
- [Commits](https://github.com/vuejs/vue/compare/v2.6.8...v2.6.11)

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

Co-authored-by: dependabot-preview[bot] <27856297+dependabot-preview[bot]@users.noreply.github.com>
2020-02-28 12:20:07 +05:30
mergify[bot]
e1141d34e4
Merge pull request #9565 from kksoftwareag/develop
chore(deps): bump croniter from 0.3.30 to 0.3.31
2020-02-28 02:21:05 +00:00
Bernhard Sirlinger
96c48c99fd
Merge pull request #7 from kksoftwareag/dependabot/pip/croniter-0.3.31
chore(deps): bump croniter from 0.3.30 to 0.3.31
2020-02-27 15:15:31 +01:00
dependabot-preview[bot]
28529f1fa5
chore(deps): bump croniter from 0.3.30 to 0.3.31
Bumps [croniter](https://github.com/kiorky/croniter) from 0.3.30 to 0.3.31.
- [Release notes](https://github.com/kiorky/croniter/releases)
- [Changelog](https://github.com/kiorky/croniter/blob/master/docs/CHANGES.rst)
- [Commits](https://github.com/kiorky/croniter/compare/0.3.30...0.3.31)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2020-02-27 14:14:15 +00:00
mergify[bot]
3322806e19
Merge pull request #9563 from scmmishra/dashboard-filter
fix: Do not allow single doctypes in dashboard chart
2020-02-27 13:47:17 +00:00
Shivam Mishra
23ae536c78 feat: tests for single doctype validation 2020-02-27 18:27:44 +05:30
Shivam Mishra
8d3a5d23fb fix: do not allow single doctypes in dashboard 2020-02-27 18:27:34 +05:30
Deepesh Garg
05767310f8
fix: Preferred billing and shipping address selection (#9538)
* fix: Preferred billing and shipping address selection

* fix: Remove unnecessary code

* fix: looping

* fix: Cleaner function
2020-02-27 16:44:31 +05:30
mergify[bot]
a6d25032a4
Merge pull request #9263 from scmmishra/report-options
feat: API to show report summary
2020-02-27 07:30:35 +00:00
Shivam Mishra
90e7262103 chore: code cleanup 2020-02-27 12:33:50 +05:30
Shivam Mishra
ee674f2b31 fix: remove unused declaration 2020-02-27 12:32:04 +05:30
Shridhar Patil
9827606f9a
[fix]: Query fixes for postgres (#9549) 2020-02-26 07:20:57 +00:00
gavin
41a176aa77
chore: pin gitdb due to package update in PYPI (#9553) 2020-02-26 12:33:19 +05:30
Faris Ansari
737bbab389
Merge pull request #9544 from surajshetty3416/fix-setup-wizard
fix: Update modified in country.json
2020-02-25 11:54:38 +05:30
mergify[bot]
ded3bb95d4
Merge pull request #9536 from scmmishra/count-fix
fix: recheck zero count
2020-02-25 06:01:36 +00:00
Suraj Shetty
fa03a73fc0 fix: Update country.json
to make sure time_format column is created for country table.
2020-02-24 15:46:39 +05:30
Himanshu
8d6052a1a9
fix(Link): Set Link DocField default if permission ignored (#9447)
* fix: set link docfield default if ignore perm

* fix: set default value

* Update create_new.js

* fix: if no permission for default, use falback

* chore: commonize function

* fix: check permission
2020-02-24 06:57:09 +00:00
mergify[bot]
1973d181e9
Merge pull request #9539 from Dharmraj-48/develop
fix(grid): Broken TEXT column
2020-02-24 06:38:26 +00:00
mergify[bot]
6a3ddf9036
Merge pull request #9529 from marination/workflow-log
fix: Handling of Manual Exception raises in Bulk Workflow Log.
2020-02-24 06:28:18 +00:00
mergify[bot]
13b658dc72
Merge pull request #9535 from frappe/snyk-fix-ab4ff3e786d9440df1d5f0f1db49f091
[Snyk] Fix for 1 vulnerabilities
2020-02-22 15:53:50 +00:00
Dharmraj
f1ead1ce55 fix: Broken field of Expense Claim 2020-02-21 18:32:40 +05:30
Shivam Mishra
59f9bd0d74 fix: recheck zero count 2020-02-21 15:10:08 +05:30
snyk-bot
42660d084b fix: .snyk & package.json to reduce vulnerabilities
The following vulnerabilities are fixed with a Snyk patch:
- https://snyk.io/vuln/SNYK-JS-LODASH-450202
2020-02-21 02:41:09 +00:00
mergify[bot]
2b2794d675
Merge pull request #9523 from gavindsouza/snyk-yarn
chore: updated yarn.lock with snyk addition
2020-02-21 02:40:59 +00:00
mergify[bot]
7a09d16dce
Merge pull request #9528 from sahil28297/gmap_delete_doc_develop
fix(patch): delete deprecated Google Maps Settings
2020-02-20 19:33:58 +00:00
Faris Ansari
3cff30dc18
Merge pull request #9431 from Mangesh-Khairnar/add-list-template
feat: allow list structure to be changed for the web view
2020-02-20 19:44:36 +05:30
marination
9aa2723ce7 fix: Handling of Manual Exception raises in Bulk Workflow Log. 2020-02-20 15:01:04 +05:30
Sahil Khan
e63814a4a3 fix(patch): delete depricated Google Maps Settings 2020-02-20 14:49:44 +05:30
Gavin D'souza
244c511a88 chore: updated yarn.lock with snyk addition
in https://github.com/frappe/frappe/pull/9382 snyk was added in
    package.json yet yarn.lock wasnt updated. this makes changes in
    yarn.lock file after a run of `bench setup requirements` which would
    possibly cause `bench update` to break on the next run too.
2020-02-20 14:07:59 +05:30
mergify[bot]
706611c692
Merge pull request #9492 from netchampfaris/data-import-beta-fixes-12
fix(data-import): Data Import Beta fixes
2020-02-20 07:54:27 +00:00
Prssanna Desai
db462aa33f
Merge pull request #9439 from surajshetty3416/fix-workflow-action
fix(workflow action): De-duplicate actions sent in mail
2020-02-20 13:16:56 +05:30
mergify[bot]
d70c9d6719
Merge pull request #9384 from marination/multiselect-final
fix: MultiSelectDialog UX
2020-02-20 05:53:04 +00:00
Faris Ansari
b334b67bbd style: Fix eslint errors 2020-02-20 11:15:11 +05:30
mergify[bot]
98ef4c1aa5
Merge pull request #9441 from marination/bulk-workflow-apply
fix: Bulk Workflow Action rollback on Error
2020-02-20 05:41:43 +00:00
Suraj Shetty
5fc4f331b1
fix: set read only fieldtype as data for standard filters (#9520)
Co-authored-by: Prssanna Desai <prssud@gmail.com>
2020-02-20 11:00:40 +05:30
Faris Ansari
77d6c6937f Merge branch 'data-import-beta-fixes-12' of https://github.com/netchampfaris/frappe into data-import-beta-fixes-12 2020-02-19 15:55:47 +05:30
Faris Ansari
eaefa09c7e tests: Fix failing tests 2020-02-19 15:55:24 +05:30
Himanshu
52068ec0ca
fix: format error message (#9500)
* chore: format error message

* chore: formatting

* fix: remove / from translated string

* fix: typo

Co-authored-by: sahil28297 <37302950+sahil28297@users.noreply.github.com>
2020-02-19 15:53:46 +05:30
Prssanna Desai
b7aa5434bb
Revert "feat: add button to resend welcome email (#9464)" (#9515)
This reverts commit 09b6010e5a.
2020-02-19 15:47:41 +05:30
Faris Ansari
0f9aad0c99 fix: Detect and show date format for columns
- Ignore date values that dont match the format
2020-02-19 15:47:31 +05:30
marination
f5004865b9 fix: Conditional indicator and made strings translatable 2020-02-19 15:46:40 +05:30
mergify[bot]
6229ef1bdd
Merge pull request #9457 from surajshetty3416/fix-invalid-dashboard-filter
fix(Dashboard): Throw "Invalid Filter Value" error on getting TypeError
2020-02-19 04:14:52 +00:00
Suraj Shetty
0cca0778cc
Merge branch 'develop' into fix-invalid-dashboard-filter 2020-02-19 09:31:32 +05:30
Suraj Shetty
84cba1c908
Merge branch 'develop' into data-import-beta-fixes-12 2020-02-19 09:14:57 +05:30
Faris Ansari
4c3ac57f3b
style: fix indentation 2020-02-18 18:23:57 +05:30
sahil28297
b1d42e1302
fix: consider Not Sent and Sending status while pulling daily e… (#9496)
Co-authored-by: Saurabh <saurabh6790@gmail.com>
2020-02-18 15:43:16 +05:30