vassili/seitime-frappe
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 4
23489 commits 1 branch 0 tags 587 MiB
Commit graph

23489 commits

This branch
This branch
All branches
Author SHA1 Message Date
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
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
Faris Ansari
14fef7d01e
chore: Add github action to automate backporting (#9456) 2020-02-18 14:49:06 +05:30
Shivam Mishra
80f9a5f9fe
fix: don't try to export empty report (#9482) 2020-02-18 12:36:09 +05:30
Fab
59cc62b206
fix(base_list): Verify that filters are not undefined/empty. #9468 (#9487) 
* fix(base_list): Verify that filters are not undefined/empty. #9468

Fixes an issue with empty filters in certain list views as referenced in #9467

* style: Fix formatting issue

Co-Authored-By: Himanshu <himanshuwarekar@yahoo.com>

Co-authored-by: Suraj Shetty <13928957+surajshetty3416@users.noreply.github.com>
Co-authored-by: Himanshu <himanshuwarekar@yahoo.com>
 2020-02-18 12:33:01 +05:30
Faris Ansari
494c8274af
Merge pull request #9476 from scmmishra/better-only-for-message 
Better Only For message
 2020-02-18 12:21:35 +05:30
Faris Ansari
8c7a7942dc
style: missing semicolon 2020-02-18 12:20:52 +05:30
Faris Ansari
e8e0d6c7d7 style: Indent fix 2020-02-18 12:01:06 +05:30
Faris Ansari
435082f140 fix: Spaces to tabs 2020-02-18 11:52:43 +05:30
Suraj Shetty
0090142232
style: fix formatting 2020-02-18 11:38:47 +05:30
mergify[bot]
f2744a993b
Merge pull request #9491 from zerodhatech/scruburl 
fix: scrub urls should only replace relative urls
 2020-02-18 06:05:32 +00:00
Faris Ansari
ff7e04ffba fix(data-import): Cast value to string 
- Integer values break in the first check
 2020-02-18 11:28:18 +05:30
Faris Ansari
f09b2b897f fix(data-import): Show total rows in import preview 2020-02-18 11:27:30 +05:30
Faris Ansari
bafcc62c4d fix(data-import): Better error reporting 
- Set status as Error when exception as occurs during import
- Show Report Error button
- Formatting
 2020-02-18 11:25:20 +05:30
Faris Ansari
2e544ed6cd fix(data-import): Remove Import Options section 2020-02-18 11:14:35 +05:30
Priyanka Gangar
09b6010e5a
feat: add button to resend welcome email (#9464) 
* fix: Resend Welcome Email

* fix: Removed Space in Resend Welcome Email

* fix: Removed Space in Resend Welcome Email

* Send welcome mail called from frm

* Passing Parameter to msgprint

* Passing Parameter to msgprint

* Removed Unused Function

* Removed Unused Space

Co-authored-by: pinka0925 <44537026+pinka0925@users.noreply.github.com>
 2020-02-18 11:08:05 +05:30
Shridhar
efa740efba regular expression fixed 2020-02-18 10:58:47 +05:30
Shridhar
a68766261a workaround for wkhtmltopdf 2020-02-18 10:58:40 +05:30
Shridhar
690611f6f8 scrub urls should only replace relative urls 2020-02-18 10:58:28 +05:30
mergify[bot]
aa6a4f8c10
Merge pull request #9489 from deepeshgarg007/treeview_cleanup 
fix: Remove unnecessary code from treeview
 2020-02-18 04:41:16 +00:00
mergify[bot]
c27ee8fc2c
Merge pull request #9486 from gmplab/gmplab-patch-3 
fix(list_view): Cannot read property 'disable_auto_refresh'
 2020-02-18 04:39:52 +00:00
Deepesh Garg
86263496d5 fix: Remove unnecessary code from treeview 2020-02-18 09:01:24 +05:30
mergify[bot]
630c85a9cc
Merge pull request #9479 from scmmishra/report-key-error-dev 
fix: skip columns not sent
 2020-02-17 16:22:11 +00:00
gmplab
0a55241389
Fix property 'disable_auto_refresh' 
TypeError: Cannot read property 'disable_auto_refresh' of undefined
 2020-02-17 22:35:08 +08:00