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

18968 commits

This branch
This branch
All branches
Author SHA1 Message Date
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
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
Kenneth Sequeira
dbd64f0789 added option to view password 2019-04-02 00:11:11 +05:30
Suraj Shetty
1c8fd3169e fix(permission): use .get to avoid key error (#7187) 
Port of https://github.com/frappe/frappe/pull/7184
 2019-04-01 18:22:17 +05:30
Faris Ansari
f853313a5a
fix: Update user activity using ORM (#7183) 2019-04-01 16:16:35 +05:30
Faris Ansari
b830a327d7 fix: Preserve state in query report 
After navigating back to a query report, the filters were setup again,
we can skip that and do nothing to preserve state.
 2019-04-01 13:24:13 +05:30
Suraj Shetty
934adcd2e8
Merge pull request #7157 from netchampfaris/desktop-fixes 
fix: Desktop UX
 2019-04-01 11:43:57 +05:30
Suraj Shetty
ec6da7e7eb
Merge pull request #7171 from netchampfaris/datatable-column-resize-develop 
Datatable column resize develop
 2019-04-01 11:12:58 +05:30
Suraj Shetty
aff6f71c81
style: unindent chained .then 2019-04-01 11:09:08 +05:30
Faris Ansari
3415335423 fix: Add fast-deep-equal as a dependency 2019-04-01 10:42:40 +05:30
Faris Ansari
a70533158b
Merge branch 'develop' into datatable-column-resize-develop 2019-04-01 10:22:50 +05:30
Faris Ansari
0b574a34b5
Merge branch 'develop' into desktop-fixes 2019-04-01 10:18:57 +05:30
Faris Ansari
358f641d09
Merge pull request #7173 from surajshetty3416/energy-point-fixes 
feat: Energy point history UI
 2019-04-01 10:17:24 +05:30
Suraj Shetty
3f6183c087 fix: Alignment of points 2019-03-31 19:42:18 +05:30
Suraj Shetty
ecae61e35a feat: Add energy point history component 2019-03-31 19:42:18 +05:30
Suraj Shetty
b62b9b5db2 fix: Translate string 2019-03-31 19:42:18 +05:30
Suraj Shetty
1d7fa2bd40 refactor: Abstract get_points code 2019-03-31 19:42:18 +05:30