Commit graph

19217 commits

Author SHA1 Message Date
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
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
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
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
Rushabh Mehta
2c9aab25f0 fix(dashboard): make query postgres friendly 2019-04-15 10:16:56 +05:30
Rushabh Mehta
ce1b682ae5 fix: tests 2019-04-15 10:16:56 +05:30
Rushabh Mehta
41e1b6ab3b fix: dashboard charts with empty ranges and tests 2019-04-15 10:16:56 +05:30
Rushabh Mehta
c61944281d feat: more dashboard features, counts, sum, averages 2019-04-15 10:16:56 +05:30
Rushabh Mehta
ed19029052
Merge pull request #7271 from netchampfaris/route-to-doctype-for-custom-doctype
fix: Open DocType form if custom doctype is customized
2019-04-15 10:14:59 +05:30
Suraj Shetty
0f7f8de58a
Merge pull request #7278 from surajshetty3416/fix-summary-query
fix: typo in hooks
2019-04-15 09:25:50 +05:30
deepeshgarg007
3020679a6f fix: Pass report name while saving custom report 2019-04-15 08:49:59 +05:30
deepeshgarg007
11c6aa8506 fix(test): Rewrite test case 2019-04-15 08:35:13 +05:30
Suraj Shetty
f6a378f4a5 fix: typo in hooks 2019-04-15 00:41:53 +05:30
Suraj Shetty
c6304a19ed
Merge pull request #7277 from surajshetty3416/fix-summary-query
fix: get_user_energy_and_review_points query condition
2019-04-14 22:00:28 +05:30
Suraj Shetty
7f54312ec0 feat: Add numbering to "standings" table 2019-04-14 21:38:11 +05:30
Suraj Shetty
df61ed3ebe fix: Condition of get_user_energy_and_review_points query 2019-04-14 21:36:03 +05:30