Rushabh Mehta
|
fce9989e1f
|
Merge pull request #7326 from oshosanya/allow-database-port-config
feat: Allow user to specify database port
|
2019-04-25 11:40:54 +05:30 |
|
Rushabh Mehta
|
c3da808f76
|
Merge pull request #7352 from SaiFi0102/Boilerplate-Linting-V12
style: Linting for boilerplate files
|
2019-04-25 11:39:15 +05:30 |
|
Rushabh Mehta
|
bfa946e6ab
|
Merge pull request #7353 from SaiFi0102/DocType-JSON-Field-Order-V12
feat: DocType JSON changes for cleaner Git Diffs (v12)
|
2019-04-25 11:38:35 +05:30 |
|
Rushabh Mehta
|
501d248fe4
|
Merge pull request #7351 from rmehta/button-in-list
feat: Buttons in List View (added in ToDo)
|
2019-04-25 11:36:32 +05:30 |
|
Rushabh Mehta
|
505371e096
|
fix(minor): style and linting
|
2019-04-25 10:51:54 +05:30 |
|
Saif Ur Rehman
|
b40c3a874b
|
style: Linting for boilerplate files
|
2019-04-24 17:11:00 +05:00 |
|
Saif Ur Rehman
|
dd5385e94b
|
style: Rename prepare_docdict_for_import to prepare_for_import
|
2019-04-24 17:06:46 +05:00 |
|
Saif Ur Rehman
|
6b427705be
|
fix: codacy
|
2019-04-24 17:06:24 +05:00 |
|
Saif Ur Rehman
|
e2cf0f4619
|
fix: test
|
2019-04-24 17:06:16 +05:00 |
|
Saif Ur Rehman
|
b74e082300
|
fix: test
|
2019-04-24 17:06:04 +05:00 |
|
Saif Ur Rehman
|
dc74a83d90
|
fix: Remove trailing spaces from exported JSON
|
2019-04-24 17:05:55 +05:00 |
|
Saif Ur Rehman
|
539c4f72a0
|
fix: test
|
2019-04-24 17:05:44 +05:00 |
|
Saif Ur Rehman
|
a496e5b91c
|
feat: Remove null and empty attributes from DocType JSON file on export
|
2019-04-24 17:05:34 +05:00 |
|
Saif Ur Rehman
|
fc410ee950
|
fix: Move field_order sync logic to DocType controller and introduce hooks
before_export, before_import and prepare_docdict_for_import
|
2019-04-24 17:05:21 +05:00 |
|
Saif Ur Rehman
|
03cf293136
|
test(DocType): test_load_file_field_order
|
2019-04-24 17:05:12 +05:00 |
|
Saif Ur Rehman
|
d30ec73d43
|
feat: Use field_order attr in DocType JSON file for cleaner git diffs
|
2019-04-24 17:05:01 +05:00 |
|
Rushabh Mehta
|
3ab2850b74
|
feat: allow addition of buttons in list
|
2019-04-24 17:02:47 +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 |
|