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

18954 commits

This branch
This branch
All branches
Author SHA1 Message Date
jibin jose
5cec97a0a2 Fix social login in Python3 
In Pyhton3, requests response content is in bytes type. So decoder
have to handle both `str` and `bytes` to make it compatible with
both python 2 and 3
 2019-04-05 16:41:25 +05:30
Rushabh Mehta
5599634927 fix(ux): assign box 2019-04-05 13:14:49 +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
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
Suraj Shetty
91926a4698 feat: Add docperm to make Energy Point Log readable to all 2019-03-31 19:42:18 +05:30
Suraj Shetty
15ef216dcb feat: Update points realtime 2019-03-31 19:42:17 +05:30
Faris Ansari
f7408d4d1c fix: Revert Multiselect, add MultiSelectPills 
MultiSelect with pills doesn't work well in Report filters. So we
introduce another control which can be used wherever appropriate.
 2019-03-31 17:18:22 +05:30
Suraj Shetty
eae217eaa9 fix: Energy point UX (#7164) 
- Make user mandatory
- Allow data fieldtype for user_field
- Change fieldtype of user selection from select to autocomplete
- Put create_energy_points_log inside try catch to avoid document save failure
 2019-03-31 16:42:45 +05:30
Faris Ansari
6f4ef89fb7
fix: Over usage of space was not handled (#7124) 
- Show a message to buy space if space is overused
 2019-03-30 23:40:14 +05:30
Faris Ansari
1dc1801cfb fix: Disable linting on deep_equal util 2019-03-30 23:29:42 +05:30
Faris Ansari
5d195e4157 fix: Save column widths in Custom Reports 2019-03-30 23:22:49 +05:30
Faris Ansari
fd43685695 fix: Datatable fixes 
- Remove minWidth limit
- Double click to resize to perfect width
 2019-03-30 23:21:43 +05:30
Aditya Hase
4a67163e2d fix(blog): Fix possible reflected XSS attack vector 2019-03-30 12:02:20 +05:30
Faris Ansari
b48755a9a1
fix: Handle row which can be dict while printing (#7163) 2019-03-29 23:03:42 +05:30
Faris Ansari
4bfec7ca19
fix: wrapper for '.__' (#7159) 2019-03-29 20:22:39 +05:30
Faris Ansari
a0e7f28438 wip 2019-03-29 20:17:37 +05:30
Nabin Hait
b0f9001c72
fix: Ignore symlinks during bench build (#7162) 2019-03-29 20:05:16 +05:30
Himanshu Warekar
7517a4ca0f fix: wrapper for '.__' 2019-03-29 19:05:05 +05:30