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
Suraj Shetty
aee7c67f8b
refactor: Move get_users_with_role to utils.user
2019-03-21 21:06:54 +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
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
Suraj Shetty
5109edf00f
feat: Add Energy Point Settings
2019-03-19 14:20:18 +05:30
Suraj Shetty
7279d8bc59
refactor: Energy Point Log and Energy Point Rule doctype
...
- Rename point -> points
- Rearrange fields
2019-03-19 14:19:20 +05:30
Suraj Shetty
3402166943
chore: Rename update_log method
...
- Add a field which was accidently removed
2019-03-19 14:17:06 +05:30
Suraj Shetty
56b28d0a0a
feat: Init energy points
2019-03-19 14:08:35 +05:30
Rushabh Mehta
5cbcdc7e3f
fix(assignment-rule): try unassignment from all rules first, then try assignment
2019-03-19 09:42:08 +05:30
Suraj Shetty
53ab51a73d
Merge pull request #7087 from deepeshgarg007/table_patch
...
fix: Replace NULL values with zero in tables for fields with data type INT, FLOAT or DECIMAL
2019-03-18 15:56:18 +05:30
deepeshgarg007
48e2ff5924
fix: Code cleanup
2019-03-18 15:18:25 +05:30
Aleksas Pielikis
70ac6f5c4e
fix(email): Fixed py3 email byte-content decoding ( #7058 )
...
* Email decode from bytes fix added.
* Correction according to comments.
2019-03-18 13:08:06 +05:30
deepeshgarg007
78deb1aec4
fix: Escape sql keywords
2019-03-18 09:27:35 +05:30
deepeshgarg007
fb49819cd7
fix: Replace NULL values with zero having data type as INT, FLOAT or DECIMAL
2019-03-18 08:47:17 +05:30
Suraj Shetty
26197ee29e
Merge pull request #6878 from Mangesh-Khairnar/privacy-data
...
Feature: Personal data download and deletion
2019-03-15 18:36:10 +05:30
Rushabh Mehta
eaaeba5df2
Merge remote-tracking branch 'upstream/hotfix' into develop
2019-03-15 14:52:09 +05:30
Rushabh Mehta
b6d2e61ff0
fix(style): frappe theme colours in bs4 and minor fix
2019-03-15 12:03:35 +05:30
Rushabh Mehta
9a3ff771bc
Merge pull request #7059 from scmmishra/desk-fixes
...
feat(desk): UI changes for module cards
2019-03-15 10:17:09 +05:30
Rushabh Mehta
1a25daf6c1
Merge pull request #7020 from ElasticRun/shift-db
...
fix: compulsorily shift db
2019-03-15 09:09:26 +05:30
Suraj Shetty
45c813222a
Merge pull request #7070 from netchampfaris/verbose-permission-message
...
fix: More verbose User permission message
2019-03-15 08:09:23 +05:30
Suraj Shetty
60c8d47388
Merge pull request #7076 from netchampfaris/fix-revert-traceback-escape
...
fix: Don't escape traceback
2019-03-14 20:35:55 +05:30
Suraj Shetty
72d82538a8
fix: typo
2019-03-14 20:34:12 +05:30
