Commit graph

18752 commits

Author SHA1 Message Date
Suraj Shetty
738cab059b style: Fix review pill 2019-03-27 12:05:02 +05:30
Suraj Shetty
c92b9f00fc fix: Hide toolbar from energy point settings 2019-03-27 11:37:47 +05:30
Suraj Shetty
5fc64b7a15 fix: UX review
Co-authored-by: Faris Ansari <netchampfaris@users.noreply.github.com>
2019-03-26 21:27:20 +05:30
Suraj Shetty
d25ed701ab refactor: User list
Co-authored-by: Faris Ansari <netchampfaris@users.noreply.github.com>
2019-03-26 21:25:12 +05:30
Suraj Shetty
bde72dcba9 fix: Remove energy_points data from boot 2019-03-26 21:19:10 +05:30
Suraj Shetty
54322d9587 fix: Remove energy_points from user_info 2019-03-26 19:04:21 +05:30
Suraj Shetty
96ec88d4d9 feat: Attach popover to review pills for more info 2019-03-26 09:15:13 +05:30
Suraj Shetty
860473ab0a fix: Check for review point allocation date 2019-03-25 16:38:27 +05:30
Suraj Shetty
9b67ed1562 fix: Get real review data
- Rename points_gained listener to energy_point_alert
- Fix alert messages
2019-03-25 16:37:16 +05:30
Suraj Shetty
7fee2c42f3 fix(build): Disable spread transpilation
- https://github.com/bublejs/buble/issues/81
2019-03-25 11:09:07 +05:30
Suraj Shetty
c30af981e5 feat: Abstract review feature to separate file 2019-03-25 11:07:06 +05:30
Suraj Shetty
ae1db4613c feat: Add more data to energy point history page 2019-03-25 11:04:43 +05:30
Suraj Shetty
0084108e86 Merge branch 'develop' of https://github.com/frappe/frappe into energy_point_new 2019-03-23 13:05:47 +05:30
Frappe Bot
bd2e410a02 Merge branch 'master' into develop 2019-03-23 07:23:54 +00:00
Frappe Bot
b7b061105f Merge branch 'hotfix' 2019-03-23 07:21:22 +00:00
Frappe Bot
30bc0f95ad bumped to version 11.1.16 2019-03-23 07:21:22 +00:00
Rushabh Mehta
aae2c0e4e7
Merge pull request #7110 from khadijazaki/master
fix: indentation error in validate_email_address
2019-03-23 11:54:16 +05:30
Faris Ansari
f01130d1da
fix(HTML Editor): Update preview when form changes (#7108) 2019-03-22 18:56:22 +05:30
Deepesh Garg
f544dcafbe
Merge pull request #7106 from netchampfaris/user-signup-fix-2
fix: Ignore password policy in new user signup
2019-03-22 18:45:35 +05:30
khadijazaki
946cea700a fixed indentation error 2019-03-22 17:38:35 +05:00
Rushabh Mehta
98b1608ce9
Merge pull request #7100 from netchampfaris/doctype-form-ux
fix: Doctype UX
2019-03-22 17:59:07 +05:30
Rushabh Mehta
c6a7165d52
Merge pull request #7103 from netchampfaris/blog-post-fix
fix(BlogPost): Get content based on type
2019-03-22 17:58:42 +05:30
Faris Ansari
8c6c46281a fix: Ignore password policy in new user signup 2019-03-22 17:53:40 +05:30
Chinmay Pai
3c6b6dfcdf
Merge pull request #7104 from sahil28297/fix_email
fix: proxied 'validate_email_add'
2019-03-22 15:46:02 +05:30
Sahil Khan
44a2180d1a fix: proxied 'validate_email_add' 2019-03-22 15:41:30 +05:30
Faris Ansari
d9807d346e fix(BlogPost): Get content based on type 2019-03-22 10:03:14 +00:00
Shivam Mishra
efa8263d2b
Merge pull request #7102 from scmmishra/hotfix
fix: Proxied `validate_email_add`
2019-03-22 15:18:56 +05:30
scmmishra
349132f392 fix: Proxied validate_email_add 2019-03-22 15:00:16 +05:30
Rushabh Mehta
3e41c9421b
Merge pull request #7098 from sunnyakaxd/patch-5
fix: Variable bleed in response
2019-03-22 14:14:01 +05:30
Suraj Shetty
fda05cab83
Merge pull request #7097 from netchampfaris/refactor-custom-script
fix: Custom Script form and UX
2019-03-22 10:17:09 +05:30
Suraj Shetty
b79308b3bc
Merge pull request #7094 from netchampfaris/remove-old-style-custom-scripts
fix: Remove cscript and cur_frm from all client scripts
2019-03-22 10:15:30 +05:30
Faris Ansari
3c40742c96 fix: Remove deprecated fields from framework sql 2019-03-22 10:04:26 +05:30
Suraj Shetty
63288628ca feat: Inti ability to give review points 2019-03-22 10:03:06 +05:30
Suraj Shetty
dc1325ac55 feat: Auto review points allocation 2019-03-22 10:02:01 +05:30
Suraj Shetty
7c0030b978 test: Add multiplier calculation test, update old test
- Test to check if energy point is not calculation if setting is disabled
2019-03-22 08:10:30 +05:30
Suraj Shetty
d77fad8fbe refactor: Remove energy_points field from user doctype
- to decouple energy point feature.
2019-03-22 08:08:55 +05:30
Suraj Shetty
4c8c44f541 fix: Remove update_user_energy_points function
- Add create review points log
- Remove unwanted hooks
- Add get_energy_points function
2019-03-22 08:06:57 +05:30
Faris Ansari
f724cd84a1 fix: Remove usage of script_type 2019-03-22 00:32:50 +05:30
Faris Ansari
60a9b6cb06 wip: fields not mandatory 2019-03-22 00:31:28 +05:30
Faris Ansari
3eaf26dca9 fix: Patch to remove deprecated fields 2019-03-22 00:24:41 +05:30
Faris Ansari
ba741e5ced fix: Add custom button to go to list 2019-03-22 00:00:03 +05:30
Faris Ansari
e556ea5c59 fix(UX): Reorganize DocType Form Fields 2019-03-21 23:59:31 +05:30
Suraj Shetty
aee7c67f8b refactor: Move get_users_with_role to utils.user 2019-03-21 21:06:54 +05:30
Himanshu Mishra
d0eb066fa4
Variable bleed in response 2019-03-21 16:49:35 +05:30
Suraj Shetty
00ed1a0f1a Merge branch 'develop' of https://github.com/frappe/frappe into energy_point_new 2019-03-21 15:38:09 +05:30
Suraj Shetty
3ff4a4f8d7 refactor: Move code to Energy Point Rule
- Remove unwanted code
- Cache energy point rules

Co-authored-by: Faris Ansari <netchamp.faris@gmail.com>
2019-03-21 15:36:59 +05:30
Suraj Shetty
fb5129e154 feat: Add multiplier field option
- Change user field datatype to select
2019-03-21 15:32:04 +05:30
Faris Ansari
13512a4444 fix: Missing semicolon 2019-03-21 14:43:21 +05:30
Faris Ansari
9d1b8f896a fix: Custom Script form helpers and UX 2019-03-21 14:30:43 +05:30
Faris Ansari
dbd478dea4 fix(Custom Script): Remove script_type field 2019-03-21 14:29:57 +05:30