Commit graph

19825 commits

Author SHA1 Message Date
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
Faris Ansari
19c4f6086e fix: Remove cscript and cur_frm from all client scripts
- DocType
- Report
- Property Setter
- Newsletter
- Currency
- Contact
- Address and Contact
2019-03-20 17:29:43 +05:30
Suraj Shetty
b20a435aa8 feat: Init review points
- Show points in user list
- Realtime alert about gained points
- Avoid duplicate points
2019-03-20 17:04:48 +05:30
Saurabh
6d9fa54f0b Merge branch 'master' into develop 2019-03-20 14:30:48 +05:30
Saurabh
8134ffcb35 Merge branch 'hotfix' 2019-03-20 14:30:47 +05:30
Saurabh
1e4abd4f5b bumped to version 11.1.15 2019-03-20 15:00:47 +06:00
Suraj Shetty
76fd9939a7
Merge pull request #7091 from netchampfaris/reverse-sitemap
feat: Flip sitemap switch
2019-03-20 14:09:04 +05:30
Suraj Shetty
d30cd0b4b4
Merge pull request #7090 from saurabh6790/password_fix
fix: do not check password strength while creating system manager
2019-03-20 13:24:55 +05:30
Faris Ansari
33932b14db fix: Sitemap test 2019-03-20 13:03:23 +05:30
Suraj Shetty
1135b05cdd
Merge pull request #7093 from deepeshgarg007/auto_email_fix
fix: Auto email report fix
2019-03-20 12:41:40 +05:30
deepeshgarg007
47f07668cc fix: Key error handling 2019-03-20 12:10:52 +05:30
Suraj Shetty
23a1ffe001 fix: Fetch energy_points as well with user info 2019-03-20 11:35:57 +05:30
Suraj Shetty
85f2d50938 fix: show energy points UI only if enabled 2019-03-20 11:34:39 +05:30
Suraj Shetty
c9aa99537a fix: Process for energy points only if setting is enabled 2019-03-20 11:32:53 +05:30
Rushabh Mehta
79e7be3303
Merge pull request #7089 from rmehta/assignment-rule-refactor
fix(assignment-rule): try unassignment from all rules first, then try assignment
2019-03-20 11:28:54 +05:30
Suraj Shetty
815eab3fff fix: Avoid duplicate point allocation 2019-03-20 10:03:51 +05:30
Suraj Shetty
1fb582cd33 test(energy_points): point based on rule applied 2019-03-20 10:02:59 +05:30
Suraj Shetty
c11b5adea6 fix: process_energy_point code 2019-03-20 08:42:09 +05:30
Suraj Shetty
ce69ec7f76 fix: Make energy point log fields readonly 2019-03-20 08:41:24 +05:30
deepeshgarg007
7c0bb37230 fix:Auto email report fix 2019-03-19 21:39:47 +05:30
Faris Ansari
74be94433f test: Sitemap 2019-03-19 20:46:41 +05:30
Faris Ansari
7560d90f5d fix: Add contact to sitemap 2019-03-19 20:34:28 +05:30
Faris Ansari
467bd8a8ad fix: Remove no_sitemap flag 2019-03-19 20:34:19 +05:30
Suraj Shetty
c6c502d297 fix: make energy point rule enabled bt default 2019-03-19 16:30:23 +05:30
Faris Ansari
479e0c979f fix: Cache sitemap_routes 2019-03-19 16:17:51 +05:30
Suraj Shetty
ac9bae372d fix: Rename review levels -> review levels 2019-03-19 16:09:29 +05:30
Faris Ansari
51ece4a920 feat: Flip sitemap switch
BREAKING CHANGE
A route is added to the sitemap if no_sitemap is not set.
This PR reverses this design. Because sitemap should contain publicly accessible pages and not utility pages.
Also, having lots of utility pages on sitemap does more harm than good.
2019-03-19 15:12:28 +05:30
Saurabh
4ae92edfb9 fix: do not check password strength while creating system manager 2019-03-19 14:40:29 +05:30