Aditya Hase
|
2fa19c2506
|
fix(blog): Fix possible reflected XSS attack vector
|
2019-03-30 12:01:08 +05:30 |
|
Himanshu Mishra
|
2f84cfb178
|
fix fieldname
|
2019-03-29 23:18:25 +05:30 |
|
Himanshu Mishra
|
19f5bb0422
|
No need to fetch complete user list to get two usernames
|
2019-03-29 23:13:23 +05:30 |
|
Faris Ansari
|
b48755a9a1
|
fix: Handle row which can be dict while printing (#7163)
|
2019-03-29 23:03:42 +05:30 |
|
Faris Ansari
|
4bfec7ca19
|
fix: wrapper for '.__' (#7159)
|
2019-03-29 20:22:39 +05:30 |
|
Himanshu
|
4a5536c12f
|
fix: 'wrapper for __onload' (#7160)
|
2019-03-29 20:21:40 +05:30 |
|
Faris Ansari
|
a0e7f28438
|
wip
|
2019-03-29 20:17:37 +05:30 |
|
Faris Ansari
|
bca0573373
|
fix: Handle row which can be dict while printing (#7161)
|
2019-03-29 20:13:56 +05:30 |
|
Nabin Hait
|
b0f9001c72
|
fix: Ignore symlinks during bench build (#7162)
|
2019-03-29 20:05:16 +05:30 |
|
Kenneth Sequeira
|
80b78c576f
|
feat: View Password On Login Page (#7148)
|
2019-03-29 19:23:39 +05:30 |
|
Himanshu Warekar
|
7517a4ca0f
|
fix: wrapper for '.__'
|
2019-03-29 19:05:05 +05:30 |
|
Faris Ansari
|
65484367bd
|
fix: Desktop
- Customize Shortcuts dialog
- Show / Hide cards dialog
- MultiSelect UI Pills
|
2019-03-29 13:16:11 +05:30 |
|
Faris Ansari
|
9c2105dc39
|
Merge pull request #7139 from surajshetty3416/energy_point_new
feat: Energy points system
|
2019-03-29 12:32:35 +05:30 |
|
Himanshu Warekar
|
0a2911aa3f
|
fix: display all addresses and contacts
|
2019-03-29 12:25:16 +05:30 |
|
Suraj Shetty
|
17e424707c
|
feat: Ability to directly give review points from settings
|
2019-03-29 11:04:14 +05:30 |
|
Suraj Shetty
|
c578df5347
|
feat: Link review log with the energy point log created during review
- This will help us to track the reason for review point deduction
|
2019-03-29 11:01:58 +05:30 |
|
Suraj Shetty
|
afceb1f99d
|
test: Fix test for float multiplier
|
2019-03-29 10:58:04 +05:30 |
|
Suraj Shetty
|
fd9d1142c3
|
feat: Allow float multipliers
|
2019-03-29 10:57:26 +05:30 |
|
Suraj Shetty
|
c79ab1279d
|
test: Add test for review
|
2019-03-29 09:28:37 +05:30 |
|
Suraj Shetty
|
bef48d4268
|
fix: Use as_dict of doc if exist
- User can send doc instance instead of object
|
2019-03-29 09:28:20 +05:30 |
|
Suraj Shetty
|
b385d91fb0
|
style: fix formatting
- remove print statements
|
2019-03-29 08:38:25 +05:30 |
|
Suraj Shetty
|
14a41936da
|
fix: Remove unwanted code
- Fixes "undefined pts" on user master
|
2019-03-29 08:28:30 +05:30 |
|
Suraj Shetty
|
aaf046f23f
|
fix: comment out caching code
|
2019-03-29 07:45:49 +05:30 |
|
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 |
|
Rushabh Mehta
|
d3a2122ef9
|
Merge pull request #7152 from netchampfaris/unescape-traceback-hotfix
fix: Dont escape tracebacks in errprint
|
2019-03-28 17:49:57 +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
|
70246946b2
|
fix: Dont escape tracebacks in errprint
|
2019-03-28 15:05:23 +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
|
26fd184a9b
|
Merge pull request #7151 from netchampfaris/socketio-local-hotfix
fix: Use local copy of socketio
|
2019-03-28 14:05:56 +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
|
3a60bc79ce
|
fix: Use local copy of socketio
|
2019-03-28 11:38:33 +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 |
|