Commit graph

2736 commits

Author SHA1 Message Date
Faris Ansari
fe86aed1bc fix: Guess date format correctly from column 2020-01-09 15:13:22 +05:30
Gavin D'souza
aa07305b90 Merge branch 'develop' of github.com:frappe/frappe into rename-doc-fix 2020-01-08 23:15:45 +05:30
mergify[bot]
9b7c5915c7
Merge pull request #9039 from Thunderbottom/email_ssl
feat(email): send over ssl and append outgoing mails to sent folder
2020-01-01 08:38:48 +00:00
Suraj Shetty
e2935b5ba6 refactor: Commonify sent mail checks
-and fix formatting
2019-12-31 21:09:40 +05:30
Suraj Shetty
295c5f89f1
Merge branch 'develop' into email_ssl 2019-12-31 20:47:11 +05:30
Suraj Shetty
25c66b384b
Merge branch 'develop' into rename-doc-merge-alert 2019-12-31 20:37:04 +05:30
rohitwaghchaure
3ba9c2dfd4
Merge pull request #8775 from rohitwaghchaure/email_not_pull_because_of_contact_error
fix: Name of Contact cannot be Contact error while creating communication for incoming emails
2019-12-31 10:27:17 +05:30
Gavin D'souza
43ae8adeb4 feat: show_alert flag in rename_doc API 2019-12-30 12:52:35 +05:30
mergify[bot]
1bd0cfdfde
Merge pull request #8820 from prssanna/mandatory-depends-on
feat: Add Mandatory Depends On and Read Only Depends On to Docfield
2019-12-27 10:17:38 +00:00
Suraj Shetty
75a3732ed8 fix: File duplicate check (#9136)
* fix: File duplicate check

By passing file name from file url instead of file name.
because file name can be different from actual file
if the same file is uploaded twice with different names.

* refactor: Remove unused code
2019-12-27 13:01:49 +05:30
deepeshgarg007
7c69ff4646 Merge branch 'develop' of https://github.com/frappe/frappe into mandatory-depends-on 2019-12-26 13:23:11 +05:30
Andrew McLeod
07cedc581d feat: Optionally remove seconds from datetime (#8531)
* fix: Add updated datepicker; fixed seconds formatting bug.
Seconds between 0 and 9 were not zero-padded.

* feat: Add framework for time format

* feat: datetime server-side formatters.

* tests: Added server-side datetime formatter tests

* feat: Update client-side datetime formatters

* tests: Add Cypress client-side formatting tests.

* fix: JSON errors

* fix: Update to not hard-code admin password

* fix: Change to using bulk_update rather than the REST API

* tests: Use Custom doctype for testing, not Standard

* fix: Codacy style fixes

* fix: Commonify update_datetime_picker in date.js, datetime.js, time.js
Fix order of time_format in System Settings
Restore get_user_fmt in utils/datetime.js

* feat: Drastically reduce scale of Cypress testing (to make tests faster)
Full testing is possible by setting 'fast_mode' to false in the spec file.

* fix: Fix issues with datepicker/timepicker expansion

* fix: typo

* style: Various style fixes as requested by DeppSource: Python

* fix: Timepicker not hiding on 'now' button. Force hiding on click.

* style: Codacy style fixes.

* fix: Use datepicker from node_modules

* test: Refactor Datetime UI tests

- cy.get_field
- cy.set_value
- cy.insert_doc with ignore_duplicate
- Nominal datetime tests to cover most formats
- Formatting with prettier

* test: Datetime UI tests; wait for cur_frm.doc.datetime to update

* tests: Add whitespace to typed input

- Clear input only for Time field

* test: Wait timeout 200

* test: Fix form test

Co-authored-by: Faris Ansari <netchampfaris@users.noreply.github.com>
2019-12-25 14:54:28 +05:30
Faris Ansari
0d0c327ee7 fix: Child Table Update in New Data Import
- Dont check for mandatory in child rows in update
- Create a new doc for child rows being inserted in update
2019-12-25 14:25:46 +05:30
Faris Ansari
2f9ced19db fix: Update in New Data Import
- Build a doc from the provided columns in template
- Check if ID column is provided
2019-12-25 13:38:40 +05:30
Rushabh Mehta
c9afc965c1 fix(safe_exec): allow frappe.utils.[function] 2019-12-24 22:21:21 +05:30
Rushabh Mehta
2394586d11 feat(safe_exec): allow iterators and comprehension 2019-12-24 22:21:21 +05:30
Rohit Waghchaure
b9427a6091 fix: incorrect parameter passing 2019-12-23 15:34:46 +05:30
Suraj Shetty
480a192324
Merge branch 'develop' into mandatory-depends-on 2019-12-23 13:03:49 +05:30
Himanshu Warekar
16f6ba4d2f fix: rename first_name 2019-12-20 13:36:09 +05:30
Chinmay D. Pai
6357a4a9a5
feat(email): allow ssl for outgoing emails, append to sent folder
* dont always use default outgoing account for sending
* allow ssl for outgoing emails

Signed-off-by: Chinmay D. Pai <chinmaydpai@gmail.com>
2019-12-18 16:18:44 +05:30
Suraj Shetty
cf3aa54898 feat (#9052)
(server-scripts): Support Before/After Save for submitted document
2019-12-17 12:18:46 +00:00
Chinmay D. Pai
7347764c87
fix: use filter for removing administrator from email list
Signed-off-by: Chinmay D. Pai <chinmaydpai@gmail.com>
Co-authored-by: Saurabh Palande <saurabh6790@gmail.com>
2019-12-13 15:28:55 +05:30
deepeshgarg007
33ec59ad53 Merge barnch develop into mandatory-depends-on 2019-12-12 20:58:27 +05:30
Suraj Shetty
d1c0579c70 fix(file): Public-private issue (#9029)
* fix: Pass file's is_private for doc creation

* fix: File is_private and file_url mismatch

* fix: Check if file_url exists

* fix: Validation check

* fix(postgres): Convert is_private to int

* fix: File path for content_hash
2019-12-12 20:00:30 +05:30
Saurabh
ae418b90c5 fix: add hourly long frequency to scheduled job type 2019-12-09 11:13:45 +05:30
Chinmay D. Pai
35024c18fc
fix(security): invalidate reset_password_key on password reset
currently there is no way to invalidate reset_password_key on updating
password through the user settings. so whenever the user sets a new
password we'll invalidate the reset_password_key, so that existing links
to reset user passwords cannot be used.

Signed-off-by: Chinmay D. Pai <chinmaydpai@gmail.com>
2019-12-07 19:00:54 +05:30
Chinmay D. Pai
196b2ad254
fix: use get_status for rq job status
job.status has been replaced with job.get_status() in the latest release (1.0)

https://github.com/rq/rq/releases/tag/v1.0

Signed-off-by: Chinmay D. Pai <chinmaydpai@gmail.com>
2019-12-06 22:43:49 +05:30
Rushabh Mehta
e6664bfba9 fix: scheduler log cold start 2019-12-06 16:13:10 +05:30
prssanna
1026800ee0 feat: add mandatory_depends_on and read_only_depends_on to docfield 2019-12-04 21:34:49 +05:30
mergify[bot]
e193746a91
Merge pull request #8873 from Mangesh-Khairnar/add-yearly-in-dashboard
feat: Add all time in dashboard charts
2019-12-03 15:59:32 +00:00
Shivam Mishra
3c3c0b2252 Merge branch 'develop' of https://github.com/frappe/frappe into null-state 2019-12-02 16:46:05 +05:30
Faris Ansari
488c68df96
Merge branch 'develop' into refactor-scheduler 2019-12-02 13:16:45 +05:30
gavin
695e212575
Merge branch 'develop' into drop-selenium 2019-11-29 13:13:33 +05:30
Aditya Hase
333ea79d2d
fix(patch): Handle failures in while making Prepared Report attachments private 2019-11-26 18:33:54 +05:30
Shivam Mishra
4a0db8df25 Merge branch 'develop' of https://github.com/frappe/frappe into null-state 2019-11-26 12:35:50 +05:30
mergify[bot]
d1cf393cec
Merge pull request #8884 from adityahase/fix-prepared-report-private-12
fix(security): Make all Prepared Report file attachments private
2019-11-26 06:38:02 +00:00
mergify[bot]
edf35838c8
Merge pull request #8851 from netchampfaris/new-data-import-fixes
fix: Data Import fixes
2019-11-26 04:48:41 +00:00
Aditya Hase
17161976c6
fix(security): Make all Prepared Report file attachments private 2019-11-25 19:35:18 +05:30
Shivam Mishra
b6d10dc02d feat: documentation link as a separate field 2019-11-25 17:31:18 +05:30
Mangesh-Khairnar
f7e48d5a81 fix: minor changes 2019-11-23 18:36:34 +05:30
Mangesh-Khairnar
2489a1bc9d fix: fetch date based on a predefined period for yearly charts 2019-11-23 12:07:46 +05:30
mergify[bot]
0058fd4e51
Merge pull request #8790 from ruchamahabal/fix_report_builder
fix(Report): do not validate Script Manager role for Report Builder type
2019-11-21 11:48:05 +00:00
Rucha Mahabal
6a489f1e39
fix: remove explicit check for session user as Administrator
Co-Authored-By: Suraj Shetty <13928957+surajshetty3416@users.noreply.github.com>
2019-11-21 14:43:53 +05:30
Rucha Mahabal
6797aec45b
fix: do not validate Script Manager role for Report Builder type 2019-11-20 19:52:08 +05:30
mergify[bot]
4bdbd0c29c
Merge pull request #8777 from prssanna/notifications-fix
fix: Notification fixes
2019-11-20 12:05:08 +00:00
Faris Ansari
f0663b63a0 style: Unused variable 2019-11-20 14:15:50 +05:30
prssanna
7bf1e09327 fix: code cleanup 2019-11-20 14:03:25 +05:30
prssanna
6f00c83e74 fix: check if settings exist before ccreating 2019-11-19 19:04:00 +05:30
Faris Ansari
42cb0f3eb3 style: Formatting 2019-11-19 17:33:44 +05:30
Faris Ansari
af4f9b2e3e fix: Show Error for invalid template
- For template with invalid extension or not enough rows
2019-11-19 17:33:28 +05:30