Suraj Shetty
|
b968c207d1
|
Merge branch 'develop' of https://github.com/frappe/frappe into energy_point_new
|
2019-03-28 19:54:36 +05:30 |
|
Prssanna Desai
|
85fb946392
|
fix(Assigned To): fix "Assigned To" query for postgres (#7154)
|
2019-03-28 18:29:12 +05:30 |
|
Suraj Shetty
|
6958c46d6e
|
chore: Add print statements to check the reason for test failure
|
2019-03-28 17:21:38 +05:30 |
|
Faris Ansari
|
c9fac081b8
|
Merge pull request #7128 from Mangesh-Khairnar/rating-control
Feature: Rating control
|
2019-03-28 14:16:12 +05:30 |
|
Rushabh Mehta
|
b9c01b4005
|
Merge pull request #7117 from prssanna/assigned-to-fixes
fix: Improvements to "Assigned To" dropdown
|
2019-03-28 14:04:00 +05:30 |
|
Sahil Khan
|
f085765abd
|
Merge branch 'master' into develop
|
2019-03-28 13:44:14 +05:30 |
|
Sahil Khan
|
c2b4d28246
|
Merge branch 'hotfix'
|
2019-03-28 13:22:14 +05:30 |
|
Sahil Khan
|
bfb96d7639
|
bumped to version 11.1.17
|
2019-03-28 13:42:14 +05:50 |
|
Suraj Shetty
|
015ba0417c
|
feat: Add leaderboard link to desktop
|
2019-03-28 12:37:48 +05:30 |
|
Mangesh-Khairnar
|
b5d1a3aa18
|
fix: pass fields as array in cypress dialog
|
2019-03-28 12:05:31 +05:30 |
|
Himanshu Mishra
|
4da80bae91
|
fix: doctype passed but not used (#7112)
|
2019-03-28 11:57:15 +05:30 |
|
Raffael Meyer
|
49b6b81a0f
|
fix(integrations): complete file-api migration (#7132)
|
2019-03-28 11:48:57 +05:30 |
|
Suraj Shetty
|
73c1f531e8
|
fix: Set default only if the dependent field is set (#7130)
Client side fix
https://github.com/frappe/frappe/pull/7004
|
2019-03-28 11:46:51 +05:30 |
|
Kenneth Sequeira
|
664bc680bd
|
fix: Add Currency Yemeni Rial (#7131)
Closes issue https://github.com/frappe/erpnext/issues/16956
|
2019-03-28 11:44:19 +05:30 |
|
Faris Ansari
|
c82d157e19
|
Merge pull request #6777 from adityahase/dashboard
feat: Dashboard
|
2019-03-28 10:45:26 +05:30 |
|
Suraj Shetty
|
b4bea4e09b
|
feat: Add description for user field of review dialog
|
2019-03-28 10:44:20 +05:30 |
|
Suraj Shetty
|
207749c3da
|
fix: Default for user selection in Review Dialog
- Fix message
|
2019-03-28 10:41:42 +05:30 |
|
Suraj Shetty
|
091b7c0ad1
|
feat: Improve alert message
- Add document link
- Separate get_alert_message code
|
2019-03-28 10:35:36 +05:30 |
|
Suraj Shetty
|
56dfe365ed
|
fix: Add missing is_column_missing method (#7150)
|
2019-03-28 10:27:50 +05:30 |
|
Suraj Shetty
|
9ef406bf31
|
test: Reset current user as admin in teardown
|
2019-03-28 07:38:11 +05:30 |
|
Mangesh-Khairnar
|
e6c6aeb98e
|
style: change rating formatter
|
2019-03-28 01:16:52 +05:30 |
|
Suraj Shetty
|
355b8e3868
|
fix: Comment out caching code to fix test
- Remove debug flag
|
2019-03-27 23:58:44 +05:30 |
|
Suraj Shetty
|
843d6cc69a
|
test: fix code to get energy_point from points dict
|
2019-03-27 23:57:39 +05:30 |
|
Suraj Shetty
|
eff958da52
|
perf: Index frequently queried fields in Energy Point Log
|
2019-03-27 23:54:14 +05:30 |
|
Prssanna Desai
|
3725ebf7c3
|
fix: Wrap quotes around columns and column names in query
|
2019-03-27 22:41:02 +05:30 |
|
Prssanna Desai
|
8a4bfb1429
|
Improve query for assignment count and add test
|
2019-03-27 22:41:02 +05:30 |
|
Prssanna Desai
|
7a81f26780
|
fix: Improve query for assignment count
|
2019-03-27 22:41:02 +05:30 |
|
Prssanna Desai
|
a43d89db82
|
fix: Improvements to "Assigned To" dropdown
|
2019-03-27 22:41:02 +05:30 |
|
Mangesh-Khairnar
|
cd3923b825
|
fix: add inline filter format
|
2019-03-27 20:10:33 +05:30 |
|
Mangesh-Khairnar
|
848943896c
|
fix: change from input only wrapper to input area wrapper
|
2019-03-27 20:10:10 +05:30 |
|
Mangesh-Khairnar
|
cb47502fb9
|
chore: add expect to eslintrc
|
2019-03-27 20:09:39 +05:30 |
|
Suraj Shetty
|
3137e8d631
|
fix: Add a missing comma to daily hook list
|
2019-03-27 19:39:27 +05:30 |
|
Aditya Hase
|
536bf6ce59
|
style: Linting fixes
|
2019-03-27 19:06:32 +05:30 |
|
Prateeksha Singh
|
4c73590294
|
Merge pull request #7146 from pratu16x7/hotfix-set-chart
fix(set_chart): Don't truncate null labels
|
2019-03-27 18:34:09 +05:30 |
|
Prateeksha Singh
|
e49cb8f9f3
|
fix(set_chart): Don't truncate null labels
|
2019-03-27 18:32:12 +05:30 |
|
Prateeksha Singh
|
23d4dfcedf
|
Merge pull request #7145 from pratu16x7/fix-set-chart-report
fix(set_chart): Don't truncate null labels
|
2019-03-27 18:25:54 +05:30 |
|
Prateeksha Singh
|
9c5310acdf
|
fix(set_chart): Don't truncate null labels
|
2019-03-27 18:16:10 +05:30 |
|
Suraj Shetty
|
db39160192
|
chore: Remove unused import
|
2019-03-27 17:38:25 +05:30 |
|
Faris Ansari
|
8081ad1c38
|
fix: Remove deprecated fields from Customize Form (#7143)
|
2019-03-27 15:42:21 +05:30 |
|
Faris Ansari
|
cd95d43d41
|
Merge pull request #7142 from netchampfaris/misc-fixes-3
Miscellaneous Fixes
|
2019-03-27 15:18:30 +05:30 |
|
Faris Ansari
|
7ca290b2d5
|
fix: Remove time measurement
|
2019-03-27 15:17:39 +05:30 |
|
Faris Ansari
|
34b0951281
|
fix: Chain setup_defaults in all type of views
|
2019-03-27 15:14:06 +05:30 |
|
Faris Ansari
|
c9e432e62a
|
fix: Ignore files that don't exist in Dropbox backup
|
2019-03-27 15:13:03 +05:30 |
|
rohitwaghchaure
|
698b0011b1
|
fix: exported data of report showing blank in the excel file (#7141)
|
2019-03-27 15:11:12 +05:30 |
|
Aditya Hase
|
977126b116
|
style: Linting Fixes
|
2019-03-27 14:54:54 +05:30 |
|
Suraj Shetty
|
5a82a5ed83
|
fix: Rearrange the order of checks to avoid error
|
2019-03-27 14:40:46 +05:30 |
|
Aditya Hase
|
4a2881450d
|
fix(tests): Show test duration if it exceeds SLOW_TEST_THRESHOLD (#7119)
|
2019-03-27 14:38:25 +05:30 |
|
Anurag Mishra
|
f8a0257c20
|
fix: Define default currency for Mozambique (#7118)
|
2019-03-27 13:12:52 +05:30 |
|
Suraj Shetty
|
c7d60703e7
|
Merge branch 'develop' of https://github.com/frappe/frappe into energy_point_new
|
2019-03-27 12:35:43 +05:30 |
|
Suraj Shetty
|
1b48f6e6df
|
revert: fix(build): Disable spread transpilation
This reverts commit 7fee2c42f3.
|
2019-03-27 12:32:37 +05:30 |
|