Commit graph

19360 commits

Author SHA1 Message Date
Shivam Mishra
01a2df7e5a feat: code imporvements 2019-04-27 16:26:13 +05:30
Shivam Mishra
27fd3f7c99 feat: Refactored test and added tests for pdf encryption 2019-04-27 16:23:13 +05:30
Shivam Mishra
02c6abe609 feat: minor changes to pdf.py 2019-04-27 16:22:56 +05:30
Shivam Mishra
a9ca81370b fix: encoded password 2019-04-25 18:22:14 +05:30
Shivam Mishra
d791285ac2 feat: Added encryption feature for pdfs 2019-04-25 17:23:38 +05:30
Shivam Mishra
a11128c6d0
Merge pull request #7343 from scmmishra/report-fix-profitability
fix: Major bugs in query_report.js
2019-04-24 16:54:45 +05:30
Suraj Shetty
16d4d02aa5
fix: Remove quotes around color hex 2019-04-24 16:06:24 +05:30
scmmishra
9d98bed354 fix: linting fixes 2019-04-24 16:05:45 +05:30
Suraj Shetty
794f3d08b2
Merge pull request #7303 from Mangesh-Khairnar/default-user-permission
feat: Default user permission
2019-04-24 15:51:47 +05:30
scmmishra
2df654b5df style: minor improvements 2019-04-24 15:22:57 +05:30
Rushabh Mehta
c4c912160e fix(style): tighter whitespace in sidebar 2019-04-24 15:12:16 +05:30
Rushabh Mehta
8609b5b103
Merge pull request #7347 from netchampfaris/report-column-width-d
fix(ReportView): Remember column widths
2019-04-24 14:47:32 +05:30
Rushabh Mehta
bab1c5d5eb
Merge pull request #7212 from hrwX/data_import_fix_v12
fix(Data Import): get fields of doctype on change
2019-04-24 14:43:23 +05:30
Rushabh Mehta
c69204f0b4
Merge pull request #7133 from alyf-de/gsuite_autocomplete
feat(integrations): add autocomplete to gsuite templates
2019-04-24 14:35:09 +05:30
Mangesh-Khairnar
c9dc0a8379 style(linting): minor fixes 2019-04-24 14:29:10 +05:30
Faris Ansari
cfce388c5a
Update frappe/public/js/frappe/views/reports/query_report.js
Fixed syntax error

Co-Authored-By: scmmishra <scmmishra@users.noreply.github.com>
2019-04-24 14:23:32 +05:30
Rushabh Mehta
d1853c63a3
Merge pull request #7337 from rmehta/desk-style-cleanup
fix(style): cleaner style for form sidebar and other minor cleanups
2019-04-24 14:21:13 +05:30
Mangesh-Khairnar
21c46250ca style: formatting changes 2019-04-24 14:06:34 +05:30
Mangesh-Khairnar
51ad20e73a Merge branch 'default-user-permission' of https://github.com/Mangesh-Khairnar/frappe into default-user-permission 2019-04-24 13:21:24 +05:30
Mangesh-Khairnar
c81fa6db3c test: validate no fetch for multiple non default user permission 2019-04-24 13:19:04 +05:30
Faris Ansari
25316da863 fix(ReportView): Remember column widths 2019-04-24 12:53:59 +05:30
Suraj Shetty
6ae866bd84
fix: add a more descriptive method name
Co-Authored-By: Mangesh-Khairnar <mkhairnar10@gmail.com>
2019-04-24 12:04:23 +05:30
scmmishra
950934ddda Merge branch 'develop' of https://github.com/frappe/frappe into report-fix 2019-04-24 09:48:02 +05:30
Shivam Mishra
d87b900f7e
Merge pull request #7344 from surajshetty3416/fix-social-ui
feat(social): Add period filter and user search option for leaderboard and edit profile dialog
2019-04-24 09:44:19 +05:30
scmmishra
2fbfc93c4a chore: Minor code improvements 2019-04-24 09:26:28 +05:30
Suraj Shetty
2f5ebf93a4
Merge pull request #7345 from netchampfaris/page-title-centering-h
fix: Page Title wrapping and centering
2019-04-24 08:34:56 +05:30
Suraj Shetty
3bdd98f45c
Merge pull request #7342 from netchampfaris/page-title-centering
fix: Page Title wrapping and centering
2019-04-24 08:34:32 +05:30
Suraj Shetty
a0a3b9e7c2
fix: Add missing closing bracket 2019-04-24 08:15:02 +05:30
Suraj Shetty
670f5d61b4
Merge branch 'develop' into page-title-centering-h 2019-04-24 07:44:30 +05:30
Suraj Shetty
488dbd2949 fix: Pass from date to energy_point_history
- So that it can only show logs of current point
2019-04-24 07:35:40 +05:30
Suraj Shetty
8331510fad style: Fix formatting 2019-04-24 07:33:40 +05:30
Faris Ansari
8f41c44661 fix: Page Title wrapping and centering 2019-04-23 23:12:13 +05:30
Suraj Shetty
15ecb47564 feat: Add period filter and user search option 2019-04-23 22:19:02 +05:30
Suraj Shetty
48223be42e fix: Realtime image update on image change from edit profile dialog
- Remove unwnated code
2019-04-23 22:17:11 +05:30
Suraj Shetty
72d8870c87 feat: Show Dialog to edit profile data 2019-04-23 22:13:01 +05:30
scmmishra
79469357e3 fix (linitng): codacy 2019-04-23 21:02:12 +05:30
scmmishra
0641dc6df3 Merge branch 'develop' of https://github.com/frappe/frappe into report-fix 2019-04-23 20:46:41 +05:30
scmmishra
5c1b1748f4 fix: Major bugs in query_report.js 2019-04-23 20:44:38 +05:30
Shivam Mishra
02fbf8de9d
Merge pull request #7341 from netchampfaris/attach-get-value
fix: Attach get_value
2019-04-23 20:14:14 +05:30
Faris Ansari
8582721e6d fix: Page Title wrapping and centering 2019-04-23 19:18:31 +05:30
Faris Ansari
4841e09022 fix: Attach get_value
Return file_url in get_value
2019-04-23 15:41:23 +05:30
Deepesh Garg
3981daf875
Merge pull request #7340 from nabinhait/get-doc-before-save
fix: Removed get_doc_before_save
2019-04-23 14:14:33 +05:30
Nabin Hait
a92ed100e2 fix: Removed get_doc_before_save 2019-04-23 13:15:39 +05:30
Rushabh Mehta
e420b2e751
Merge pull request #7333 from adityahase/feat-touched-tables
feat: Maintain list of tables touched during migrate
2019-04-23 10:51:18 +05:30
Aditya Hase
c29fcb02d6 feat: Maintain list of tables touched during migrate
This can be used to selectively restore changed tables from backup
after migrate failure
2019-04-23 10:31:44 +05:30
Suraj Shetty
565bc8789d
Merge pull request #7338 from frappe/fix-grid-upload
fix: Remove unwanted frappe.upload.get_strting in grid.js
2019-04-23 09:47:14 +05:30
Suraj Shetty
bfde3835c4 fix: Decode file data to string 2019-04-23 09:43:48 +05:30
Suraj Shetty
79d5c9cf52 fix: Remove frappe.upload.get_strting 2019-04-23 09:24:42 +05:30
Rushabh Mehta
c35ad8887f fix: remove console.log 2019-04-23 08:30:55 +05:30
Rushabh Mehta
6af03aa129 fix(style): cleaner style for form sidebar and other minor cleanups 2019-04-23 08:28:32 +05:30