Commit graph

27931 commits

Author SHA1 Message Date
sezanzeb
429cbb17eb chore: github shorthand for air-datepicker 2020-10-21 13:39:11 +02:00
sezanzeb
8906c1eba4 chore: git url format for air-datepicker 2020-10-21 12:57:37 +02:00
Saurabh
11e54cbfbe
Merge pull request #11699 from saurabh6790/log-settings
feat: Log settings
2020-10-20 18:01:46 +05:30
Prssanna Desai
2a3a9cceaf
Merge pull request #11741 from prssanna/datatable-update
chore: update datatable to 1.15.3
2020-10-20 17:22:08 +05:30
prssanna
2f890c1391 chore: update datatable to 1.15.3 2020-10-20 16:51:01 +05:30
Saurabh
af5f535d1f fix: test case 2020-10-20 16:15:17 +05:30
Shivam Mishra
8a442f4185
feat: set fieldname before insert (#11675) 2020-10-20 10:04:44 +00:00
mergify[bot]
52b685ce2c
Merge pull request #11580 from Mangesh-Khairnar/mpesa-integration-changes
fix(integration-request): handle response and update status
2020-10-20 09:23:19 +00:00
mergify[bot]
e6eda59a55
Merge pull request #11736 from anupamvs/report-del-fix
fix: don't allow user to delete standard report
2020-10-20 08:41:21 +00:00
Suraj Shetty
94112b4f37
fix: Warning message 2020-10-20 13:54:54 +05:30
Saurabh
697a9e0cf2 fix: run log notifier from client side 2020-10-20 13:19:12 +05:30
Saurabh
07e4885775 fix: renaming of fields and test fixes 2020-10-20 13:19:12 +05:30
Saurabh
ce97e7275e feat: provision to setup users for Erro Log notification on log settings 2020-10-20 13:19:12 +05:30
Saurabh
117d28ba3a Enahancement:
1. Log Settings doctype to control log cleanup
2. Provision to show an alert message if unseen error log exists
2020-10-20 13:19:12 +05:30
Rucha Mahabal
09dcf5ac6e
fix: Link Preview not working for Link fields with indicator formatters (#11729) 2020-10-20 11:25:08 +05:30
mergify[bot]
38b2c072ef
Merge pull request #11594 from frappe/google_analytics_anonymize_ip
feat: option to anonymize ip for google analytics
2020-10-19 14:28:08 +00:00
Anupam
57b493efb7 fix: deletion of standard report 2020-10-19 17:45:29 +05:30
dependabot[bot]
f3077f3f12
chore(deps): bump lodash from 4.17.15 to 4.17.20 (#11728)
Bumps [lodash](https://github.com/lodash/lodash) from 4.17.15 to 4.17.20.
- [Release notes](https://github.com/lodash/lodash/releases)
- [Commits](https://github.com/lodash/lodash/compare/4.17.15...4.17.20)

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

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2020-10-19 09:14:24 +05:30
mergify[bot]
66dcaf1e4e
Merge pull request #11489 from gavindsouza/move-cypress
fix: Install Cypress only if running UI tests
2020-10-18 11:38:48 +00:00
Suraj Shetty
365b7b0561 test: Pass force upload to avoid failure during dragleave 2020-10-18 15:54:54 +05:30
Frappe PR Bot
76a1057e7b
chore: Update translations (#11726)
Co-authored-by: frappe <frappe@scw-dazzling-elgamal>
2020-10-18 12:02:53 +05:30
mergify[bot]
4545deb685
Merge pull request #11725 from braunse/fix-respect-postgres-port
fix: use configured postgres port in setup_db
2020-10-18 06:31:09 +00:00
Manuel
8a8e898ccb
fix: Copy incoming_port from Email Domain to Email Account (#11558)
When changing an Email Domain, the configuration fields are copied
to all Email Accounts using this domain. This happens in the method
`on_update`

- Include `incoming_port` when copying fields
- Add test case for `on_update`

Co-authored-by: mtraeber <mtraeber@linux-ag.com>
2020-10-18 11:55:54 +05:30
Suraj Shetty
d546a84659
refactor: Make code more readable 2020-10-18 11:47:28 +05:30
Suraj Shetty
4ba6044f2f
Merge branch 'develop' into move-cypress 2020-10-17 15:04:13 +05:30
Sebastien Braun
cbf815f25b fix: use configured postgres port in setup_db 2020-10-17 08:08:44 +02:00
mergify[bot]
0555536f34
Merge pull request #11712 from abhishekbalam/address_x_company_flag
fix(Address): Move 'Is Your Company Address' field to ERPNext
2020-10-16 11:57:41 +00:00
Faris Ansari
398451103a fix(customization): Only read .json files from custom folder 2020-10-16 15:43:17 +05:30
mergify[bot]
39a40b81ee
Merge pull request #11719 from resilient-tech/fix-readme-link
fix: broken link in README
2020-10-16 06:59:25 +00:00
Akash Hamirwasia
a3cdb8413e
fix: back navigation on user-profile (#11627)
Co-authored-by: Suraj Shetty <13928957+surajshetty3416@users.noreply.github.com>
2020-10-16 11:32:02 +05:30
mergify[bot]
f7b264afaf
Merge pull request #11670 from gregor-horvath/patch-2
fix: py3 AttributeError decode
2020-10-16 05:37:07 +00:00
mergify[bot]
88a1af1732
Merge pull request #11714 from abhishekbalam/webhooks_xss_fix
fix(Request): Sanitize Error Report Email Message
2020-10-16 04:57:57 +00:00
mergify[bot]
79bfbe0416
Merge pull request #11637 from conncampbell/11636-WebForm-Clear-Attach
fix: Clearing attachment from web form causes error on save.
2020-10-16 04:10:55 +00:00
Sagar Vora
eabe58148e fix: broken link in README 2020-10-16 08:52:42 +05:30
Mangesh-Khairnar
4f3ec03fd6 fix: follow single responsibility principle 2020-10-15 19:01:40 +05:30
Abhishek Balam
c9e2922591 fix: santize email content 2020-10-15 15:52:28 +05:30
Abhishek Balam
21ab499989 fix: sanitize error report email message 2020-10-15 14:56:39 +05:30
Abhishek Balam
e31162e9f1 fix: move get_shipping_address() from frappe to erpnext since it has no references 2020-10-14 21:10:16 +05:30
Abhishek Balam
37a3096b68 fix: remove serverside validation 2020-10-14 19:09:36 +05:30
Abhishek Balam
fb40044496 fix: moving 'is your company address' field to erpnext 2020-10-14 18:09:28 +05:30
Shivam Mishra
02e7844690
Merge pull request #11709 from scmmishra/fall-back-desk
fix: better handling of default page
2020-10-14 13:07:03 +05:30
Shivam Mishra
9c5f4d5dff fix: better handling of default page 2020-10-14 13:05:21 +05:30
Kenneth Sequeira
09c625cc67
fix: Add default timezone for Laos (#11705) 2020-10-14 13:04:42 +05:30
gavin
e9fa3164fe
Merge pull request #11703 from gavindsouza/fix-build-for-init
fix: Restore assets during bench init
2020-10-14 11:40:05 +05:30
Gavin D'souza
86dd74f277 perf: Maintain set of created paths to reduce path.exists calls 2020-10-13 17:53:46 +05:30
Suraj Shetty
76ab7fa490
Merge pull request #11702 from surajshetty3416/fix-assignment-rule-based-on 2020-10-13 17:34:33 +05:30
mergify[bot]
31e5b78fca
Merge pull request #11701 from walstanb/perf-success-action
perf(form): use get_list with limit instead of count
2020-10-13 11:56:10 +00:00
Gavin D'souza
f5e1cdc5ce fix: Restore assets during bench init 2020-10-13 17:25:05 +05:30
Gavin D'souza
5cf1568248 fix: Don't make lockfile changes
* Adding --no-save still updates the package.json. Unsure what to do
next.
2020-10-13 16:48:37 +05:30
Gavin D'souza
c266d8b7a8 Merge branch 'develop' of github.com:frappe/frappe into move-cypress 2020-10-13 16:35:21 +05:30