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

19229 commits

This branch
This branch
All branches
Author SHA1 Message Date
Suraj Shetty
a9f24267b0 Merge branch 'develop' of https://github.com/frappe/frappe into fix-auto-assignment 2019-04-18 15:54:19 +05:30
rohitwaghchaure
7363ed21be
Merge pull request #7311 from rohitwaghchaure/not_able_to_create_lead_from_communication_develop 
fix: User not able to make lead from the communication
 2019-04-18 14:56:03 +05:30
rohitwaghchaure
4696610de2
Merge pull request #7309 from rohitwaghchaure/assign_to_notify_always_sending_emails_develop 
fix: On assignment, system sending an email to the assigned user even if notify to email is disabled(Cherry-picked)
 2019-04-18 14:55:41 +05:30
Rohit Waghchaure
3c01d85a3f fix: User not able to make lead from the communication 2019-04-18 13:20:12 +05:30
Suraj Shetty
4eaa9cfbf7 Merge branch 'develop' of https://github.com/frappe/frappe into fix-auto-assignment 2019-04-18 13:09:11 +05:30
Rohit Waghchaure
a62a11044a fix: On assignment, system sending an email to the assigned user even if notify to email is disabled 2019-04-18 12:39:22 +05:30
Suraj Shetty
40978eed7c
Merge pull request #7296 from netchampfaris/report-filter-numeric-d 
fix: Allow numeric filter without using =
 2019-04-18 11:11:44 +05:30
Brian Pond
d0273b1b27 fix(mariadb): refactor db setup (#7049) 
* Fixed setup_db.py to support MariaDB version 10.3.  Added function for calculating versions, per MariaDB documentation.

* Major rewrite of setup_db.py. Reduced number of functions. Made fully compatible with MariaDB 10.3+. Removed references to client parameters in my.cnf that cannot be queried.  Applied PEP8 rules to python code.

* Adding missing print statement in setup_db.py

* Replaced 4-spaces with tabs, per ERPNext standards.

* Fixed broken test by substituing 'check_database_settings()'

Fixed the test in convert_to_barracuda_and_utf8mb4.py by calling the new function 'check_database_settings()'

* Cleaned up setup.py, to match latest version of Frappe develop
 2019-04-17 18:38:11 +05:30
Suraj Shetty
591e52aaf7
Merge pull request #7289 from deepeshgarg007/doctype-fix 
fix:Do not rename files and folders before rename for custom doctype
 2019-04-17 14:53:31 +05:30
Deepesh Garg
c93c8a0ea6
Merge pull request #7290 from surajshetty3416/fix-energy-point-ui 
fix: Ignore permission while creating a revert doc
 2019-04-17 14:51:45 +05:30
Suraj Shetty
964e0ce313
Merge pull request #7253 from netchampfaris/new-upload 
feat: New Upload Dialog
 2019-04-17 09:44:39 +05:30
Faris Ansari
106c35cd34
Merge branch 'develop' into new-upload 2019-04-16 23:57:45 +05:30
Faris Ansari
b1c0f663ba
Merge branch 'develop' into report-filter-numeric-d 2019-04-16 23:57:36 +05:30
Suraj Shetty
8d7e645c15 Merge branch 'develop' of https://github.com/frappe/frappe into fix-auto-assignment 2019-04-16 23:17:55 +05:30
Suraj Shetty
44520e45b8 Merge branch 'develop' of https://github.com/frappe/frappe into fix-energy-point-ui 2019-04-16 23:17:04 +05:30
Suraj Shetty
191b5f37f9
Merge pull request #7299 from netchampfaris/cypress-disable-runs 
fix: Remove projectId to disable recording
 2019-04-16 23:13:15 +05:30
Suraj Shetty
6875d8c55b fix: Remove default for user from review dialog 
- let users explicitly select whom they want to review
 2019-04-16 23:01:44 +05:30
deepeshgarg007
21bc4552df Merge branch 'develop' of https://github.com/frappe/frappe into doctype-fix 2019-04-16 21:26:46 +05:30
Faris Ansari
7a7ac3b85f fix: Remove --record flag 2019-04-16 18:39:22 +05:30
Suraj Shetty
d89f9080d3 fix: Change fieldtype of assign_condition from "Small Text" to "Code" 
- Small text fields gets sanitized unless ignore_xss_filter
 is explicitly enabled.
- Code fieldtype seems to be right fieldtype for such use case
 2019-04-16 17:52:16 +05:30
Suraj Shetty
a751e1c37a
Merge pull request #7279 from surajshetty3416/fix-offline-save-button 
fix: save button should not remain disabled when the system is offline
 2019-04-16 17:08:25 +05:30
Deepesh Garg
74816eeebf
Merge pull request #7291 from deepeshgarg007/prepared-report-fix 
fix: Custom columns handling for prepared report
 2019-04-16 16:34:53 +05:30
Faris Ansari
30639dd261 fix: Remove projectId to disable recording 2019-04-16 16:07:05 +05:30
Suraj Shetty
95cd23826e Merge branch 'develop' of https://github.com/frappe/frappe into fix-energy-point-ui 2019-04-16 15:56:01 +05:30
Rushabh Mehta
2155c52d36 fix: link selection relevance 2019-04-16 15:38:00 +05:30
Rushabh Mehta
939fb8e277
Merge pull request #7252 from scmmishra/employee-imageview 
feat: added employee image view details
 2019-04-16 15:35:23 +05:30
deepeshgarg007
d04fa4c553 Merge branch 'develop' of https://github.com/frappe/frappe into prepared-report-fix 2019-04-16 15:35:07 +05:30
Rushabh Mehta
f5b459c4c8 fix(test): comments 2019-04-16 15:10:55 +05:30
Faris Ansari
012137d0eb fix: Allow numeric filter without using = 2019-04-16 13:49:39 +05:30
Faris Ansari
97600e5bc9 fix: Alignment 2019-04-16 13:20:32 +05:30
Faris Ansari
fc78e8eeed fix: Show help text for public/private toggle 2019-04-16 13:20:26 +05:30
deepeshgarg007
64187bb451 fix: Custom columns handling for prepared report 2019-04-16 12:53:37 +05:30
Suraj Shetty
4d88403401 fix: Disable submit button while doing network request 
- to avoid duplicate entries
 2019-04-16 12:08:24 +05:30
Rushabh Mehta
f34363956c feat(get_period_beginning): in frappe.desk.doctype.dashboard_chart.dashboard_chart 2019-04-16 11:11:58 +05:30
Suraj Shetty
58e520a3f8 fix: Ignore permission while saving revert doc 
- Since on system manager can revert points
 2019-04-16 10:55:35 +05:30
deepeshgarg007
1a005337d8 fix: Do not rename or move files for custom doctype 2019-04-16 09:45:43 +05:30
Rushabh Mehta
04c6ed3605 fix(comment): blog comment email and min length 2019-04-16 09:06:18 +05:30
Rushabh Mehta
3f8ff952d1
Merge pull request #7243 from rmehta/dashboard-refactor 
feat: more dashboard features, counts, sum, averages
 2019-04-15 16:52:27 +05:30
Faris Ansari
19cd7bc6bc
fix: Hide Standard field since it is not editable (#7272) 
- Standard can only be set in developer mode
 2019-04-15 16:40:55 +05:30
scmmishra
8fb86cc1eb fix (codacy): Fixed linting issues 2019-04-15 16:19:49 +05:30
Deepesh Garg
0b38ca391c
Merge pull request #7280 from deepeshgarg007/custom-report-fix 
fix: Custom report name passing fix
 2019-04-15 15:58:15 +05:30
deepeshgarg007
9ef880f611 fix: Report name data passing fix 2019-04-15 15:42:11 +05:30
Suraj Shetty
a3ee5ab6df fix: save button should not remain disabled when the system is offline 2019-04-15 14:38:09 +05:30
scmmishra
396c0f4b8a fix: Bottom border not visible for single item in image view 2019-04-15 13:57:11 +05:30
scmmishra
914dada4b9 feat: Refactored image view details 
- Now "Show in List View" marked fields are shown in the image view
 2019-04-15 13:49:43 +05:30
Faris Ansari
2227d8eab3
Merge pull request #7251 from deepeshgarg007/custom-reports-develop 
feat: Allow users to add field in reports
 2019-04-15 11:58:16 +05:30
Rushabh Mehta
d0e025ed17 fix(style): minor 2019-04-15 10:18:15 +05:30
Rushabh Mehta
d25d9556ad fix(linting): for dashboard 2019-04-15 10:18:15 +05:30
Rushabh Mehta
979c9da059 feat(dashboard): home section 2019-04-15 10:18:15 +05:30
Rushabh Mehta
02209d7860 feat(dashbaord): set default 2019-04-15 10:18:15 +05:30