Raffael Meyer
|
5d14cdc44a
|
put functions in scope
|
2019-04-12 19:56:26 +02:00 |
|
Raffael Meyer
|
89e3ca7e14
|
Merge branch 'develop' of https://github.com/frappe/frappe into gsuite_autocomplete
|
2019-04-07 12:21:27 +02:00 |
|
Frappe Bot
|
629a5e502a
|
Merge branch 'master' into develop
|
2019-04-07 09:03:27 +00:00 |
|
Frappe Bot
|
a757f227b4
|
Merge branch 'hotfix'
|
2019-04-07 08:47:11 +00:00 |
|
Frappe Bot
|
acd7c99db6
|
bumped to version 11.1.20
|
2019-04-07 08:47:11 +00:00 |
|
Suraj Shetty
|
9457e2424d
|
Merge pull request #7223 from surajshetty3416/fix-login-develop
revert: "fix: Update user activity using ORM"
|
2019-04-07 14:08:20 +05:30 |
|
igrekus
|
f31e8f0ffa
|
fix: Hide empty categories in Show / Hide Cards dialog (#7215)
|
2019-04-07 13:27:16 +05:30 |
|
Faris Ansari
|
d2a81910d6
|
Merge pull request #7222 from surajshetty3416/fix-login
revert: "fix: Update user activity using ORM"
|
2019-04-07 13:14:23 +05:30 |
|
Suraj Shetty
|
42b6faabe7
|
fix: Add quotes
|
2019-04-07 13:10:10 +05:30 |
|
Suraj Shetty
|
e3d0a84e64
|
Revert "fix: Update user activity using ORM"
This reverts commit b963868f61.
|
2019-04-07 12:53:21 +05:30 |
|
Suraj Shetty
|
2d51a1ec7e
|
Revert "fix: Update user activity using ORM"
This reverts commit b963868f61.
|
2019-04-07 12:47:45 +05:30 |
|
Faris Ansari
|
bb1d5f7107
|
Merge pull request #7204 from surajshetty3416/energy-points-enhancements
feat: Revert points and other energy points enhancements
|
2019-04-05 22:51:33 +05:30 |
|
Suraj Shetty
|
8abd261c18
|
fix: Super class call in dialog.js
|
2019-04-05 22:03:30 +05:30 |
|
Suraj Shetty
|
0c31d9c814
|
fix: Allow revert for logs only with type auto
|
2019-04-05 22:00:53 +05:30 |
|
Suraj Shetty
|
a418e87444
|
fix: Refresh timeline after getting a new review
|
2019-04-05 21:57:17 +05:30 |
|
Suraj Shetty
|
b7cbf9e11f
|
Merge branch 'develop' of https://github.com/frappe/frappe into energy-points-enhancements
|
2019-04-05 21:15:34 +05:30 |
|
Suraj Shetty
|
04a40d286d
|
fix: Show alert message
- Append indicator element instead of adding
class to parent div to avoid css bleed
|
2019-04-05 21:14:21 +05:30 |
|
Suraj Shetty
|
743086dc41
|
fix: Rename revert_for -> revert_of
|
2019-04-05 21:08:10 +05:30 |
|
Suraj Shetty
|
520a6b8020
|
feat: Add revert dialog to get the reason of revert
- Show type and doctype in list view
- Track changes for energy point logs
|
2019-04-05 21:07:33 +05:30 |
|
Suraj Shetty
|
d1cc18b508
|
feat: Init revert point system
|
2019-04-05 19:48:15 +05:30 |
|
Suraj Shetty
|
950ce155f7
|
fix: format energy point log for history and form separately
|
2019-04-05 19:46:43 +05:30 |
|
Suraj Shetty
|
e8cd9dc4c6
|
fix: Include only appreciation and criticism logs for review pills
|
2019-04-05 19:42:16 +05:30 |
|
Suraj Shetty
|
7e8fc8f69e
|
fix: Skip review logs
- while adding to enegy point logs to docinfo
|
2019-04-05 19:16:15 +05:30 |
|
Saurabh
|
fb4ef2e3d2
|
Merge branch 'hotfix'
|
2019-04-05 16:39:04 +05:30 |
|
Saurabh
|
1972ff2375
|
bumped to version 11.1.19
|
2019-04-05 17:09:04 +06:00 |
|
Suraj Shetty
|
9633b4fb00
|
fix: Modify log message
|
2019-04-05 14:47:57 +05:30 |
|
Suraj Shetty
|
44da34b4b4
|
feat: Show Indicator for with energy point alert
|
2019-04-05 14:11:51 +05:30 |
|
Suraj Shetty
|
0fcececd9f
|
fix: Remove Administrator from involved users
|
2019-04-05 13:54:23 +05:30 |
|
Rushabh Mehta
|
5599634927
|
fix(ux): assign box
|
2019-04-05 13:14:49 +05:30 |
|
Suraj Shetty
|
1746d089a8
|
Merge branch 'develop' of https://github.com/frappe/frappe into energy-points-enhancements
|
2019-04-05 13:11:19 +05:30 |
|
Suraj Shetty
|
0e077dbfa8
|
fix: Set with_timestamp=false by default
|
2019-04-05 13:03:13 +05:30 |
|
Suraj Shetty
|
48e16de859
|
fix: Return review doc on new review creation
|
2019-04-05 13:00:05 +05:30 |
|
Suraj Shetty
|
872b867d63
|
refactor: Use commonified code for formatted log
|
2019-04-05 12:59:38 +05:30 |
|
Suraj Shetty
|
50ad3ea9f0
|
fix: History toggle
|
2019-04-05 12:57:19 +05:30 |
|
Suraj Shetty
|
3da809146c
|
feat: Show energy point logs on form timeline
|
2019-04-05 12:54:00 +05:30 |
|
Suraj Shetty
|
e0a1bc92f5
|
refactor: Get energy point log from docinfo
|
2019-04-05 12:52:24 +05:30 |
|
Suraj Shetty
|
991cf21704
|
refactor: Abstract energy point utils
|
2019-04-05 12:51:00 +05:30 |
|
Suraj Shetty
|
40b2990595
|
fix: Make review only if energy point system is enabled
|
2019-04-05 11:32:15 +05:30 |
|
Suraj Shetty
|
88e6d6927c
|
fix: Export parent fields while exporting fixtures (#7196)
- To allow the export of doctypes like "Custom DocPerm" which needs parent fields.
|
2019-04-05 11:29:04 +05:30 |
|
Suraj Shetty
|
25282d471e
|
fix: Export parent fields while exporting fixtures (#7199)
To allow the export of doctypes like "Custom DocPerm" which needs parent fields.
|
2019-04-05 11:28:53 +05:30 |
|
Suraj Shetty
|
8059573d9e
|
fix: Make "Energy Point Rule" fields mandatory (#7195)
|
2019-04-05 10:58:16 +05:30 |
|
Suraj Shetty
|
e59589d488
|
fix: Disable popover title
|
2019-04-05 09:25:32 +05:30 |
|
Suraj Shetty
|
d971268c53
|
feat: Enable toolbar for energy point rule
|
2019-04-05 09:08:22 +05:30 |
|
Suraj Shetty
|
281a514217
|
feat: Show popover with message instead of hiding add button
|
2019-04-05 08:50:59 +05:30 |
|
Deepesh Garg
|
484f695f76
|
Merge pull request #7200 from saurabh6790/paypal_subscription_cancellation_fix
fix: cancel existing subscription while creating new subscription
|
2019-04-04 16:42:08 +05:30 |
|
Suraj Shetty
|
cc58028ec3
|
Merge pull request #7197 from deepeshgarg007/upload-fix
fix: Show progress bar only for multiple files upload
|
2019-04-04 16:37:11 +05:30 |
|
Saurabh
|
7c6370a2d1
|
fix: cancel existing subscription while creating new subscription
|
2019-04-04 16:20:25 +05:30 |
|
deepeshgarg007
|
83f4d9b0f2
|
fix:Styling fixes
|
2019-04-04 15:55:43 +05:30 |
|
deepeshgarg007
|
326e2b3168
|
fix(Codacy): Comparison fix
|
2019-04-04 15:38:10 +05:30 |
|
Suraj Shetty
|
d22206a992
|
fix: Fix export customisation (#7198)
convert `sync_on_migrate` and `with_permissions` from string to Int
|
2019-04-04 14:49:52 +05:30 |
|