vassili/seitime-frappe
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 4
18983 commits 1 branch 0 tags 587 MiB
Commit graph

18983 commits

This branch
This branch
All branches
Author SHA1 Message Date
Faris Ansari
8ff5c75d33 fix: Missing semicolon 2019-04-11 10:36:22 +05:30
Faris Ansari
7fbe08b0bc feat: Use Feature Flag to enable new upload 2019-04-11 01:42:33 +05:30
Faris Ansari
b4ae975313 feat: Introduce new upload dialog 2019-04-11 01:41:07 +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
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
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
deepeshgarg007
af7388deb7 fix: Show progress bar only for multiple files 2019-04-04 12:55:11 +05:30
Suraj Shetty
6e2c6269f7 fix: Return if user_field is set empty (#7181) 
* fix: Return if user_field is set empty

- fix log_error usage

* fix: log complete traceback
 2019-04-04 12:02:59 +05:30
Suraj Shetty
8d8755ec41
Merge pull request #7180 from netchampfaris/preserve-state-query-report-d 
fix: Preserve state in query report
 2019-04-04 12:02:30 +05:30
Suraj Shetty
b040f8ad60
Merge pull request #7193 from netchampfaris/fix-page-names-in-awesomebar 
fix: Fetch page title for core pages
 2019-04-04 11:59:18 +05:30
Aditya Hase
cb48feac98 fix: Raise exception if apps are on incompatible branches (#7175) 2019-04-04 10:37:41 +05:30
Faris Ansari
2e811b1603 fix: Fetch page title for core pages 2019-04-03 18:12:11 +05:30
Deepesh Garg
56c5e6d683
Merge pull request #7191 from surajshetty3416/fix-password-reset-error 
fix(permission): ignore_permissions while updating user activity
 2019-04-03 13:05:14 +05:30
Suraj Shetty
70e569287c fix: ignore_permissions while updating user activity 
- Since all users do not have access to user doctype
 2019-04-03 12:50:06 +05:30
Suraj Shetty
2857fe3739
Merge pull request #7166 from adityahase/xss-fix 
fix(blog): Fix possible reflected XSS attack vector
 2019-04-02 19:10:47 +05:30
Suraj Shetty
32a03a0677
Merge pull request #7188 from kennethsequeira/view-password 
feat: Added option to view password
 2019-04-02 19:09:49 +05:30
rohitwaghchaure
f02fe1cf3d
Merge pull request #7189 from rohitwaghchaure/ignore_user_permissions_not_working 
fix: user ignore permissions not working at server side
 2019-04-02 18:45:37 +05:30
Rohit Waghchaure
790c3ccf40 fix: user ignore permissions not working at server side 2019-04-02 18:44:33 +05:30