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

18246 commits

This branch
This branch
All branches
Author SHA1 Message Date
Saurabh
0dd6c44e2b Merge branch 'master' into develop 2019-02-22 10:25:19 +05:30
Saurabh
86dab7e492 Merge branch 'hotfix' 2019-02-22 10:25:18 +05:30
Saurabh
cd618f2aec bumped to version 11.1.10 2019-02-22 10:55:18 +06:00
rohitwaghchaure
a94a429f91
Merge pull request #6973 from netchampfaris/fix-custom-report-filters 
fix: Report filters in Custom Reports
 2019-02-21 18:48:24 +05:30
rohitwaghchaure
052b0b7bb7
Merge pull request #6974 from netchampfaris/fix-custom-report-filters 
fix: Report filters in Custom Reports
 2019-02-21 18:48:11 +05:30
Faris Ansari
de1ced231d fix: Report filters in Custom Reports 
- frappe.route_options should not override Report Filters
 2019-02-21 18:37:06 +05:30
Saurabh
cbbc4251c9 Merge branch 'master' into develop 2019-02-21 16:18:16 +05:30
Saurabh
e3be9b383f Merge branch 'hotfix' 2019-02-21 16:18:15 +05:30
Saurabh
dd328340c2 bumped to version 11.1.9 2019-02-21 16:48:15 +06:00
Suraj Shetty
490c3d8964
Merge pull request #6970 from hrwX/weekdays 
feat: Function to get a list of Weekdays
 2019-02-21 14:40:35 +05:30
Suraj Shetty
7559aea876
Merge pull request #6969 from deepeshgarg007/multiselect-fix 
fix: Cannot email docs form menu
 2019-02-21 13:19:27 +05:30
rohitwaghchaure
8ca0d3574c
Merge pull request #6972 from rohitwaghchaure/fixed_code_issue_report 
fix: code cleanup
 2019-02-21 13:16:32 +05:30
Rohit Waghchaure
1e3ee5db9b code cleanup 2019-02-21 13:15:07 +05:30
rohitwaghchaure
98a94d18b8
Merge pull request #6971 from rohitwaghchaure/email_button_is_not_working 
fix: email button not working
 2019-02-21 13:07:39 +05:30
Rohit Waghchaure
3575686618 fix: email button not working 2019-02-21 13:03:45 +05:30
Suraj Shetty
ce18b5ab2f
Fix minor formatting 2019-02-21 12:10:49 +05:30
Himanshu Warekar
121ffc0cf7 renamed function to get_weekdays 2019-02-21 11:17:52 +05:30
Himanshu Warekar
a6ce45240d add function to get weekdays 2019-02-21 11:11:38 +05:30
deepeshgarg007
9bb614e93d fix: Check if options exists in df or not" 2019-02-21 09:37:53 +05:30
deepeshgarg007
1076b25d1c fix: Check option length in condition 2019-02-21 09:23:37 +05:30
Saurabh
f638a500ae Merge branch 'master' into develop 2019-02-20 18:12:48 +05:30
Saurabh
c2b87443a0 Merge branch 'hotfix' 2019-02-20 18:12:47 +05:30
Saurabh
6ea90fba91 bumped to version 11.1.8 2019-02-20 18:42:47 +06:00
Faris Ansari
82036241e2 fix: Dont set doctype if it is not set (#6966) 2019-02-20 17:36:07 +05:30
Rushabh Mehta
b534fcecc8
Merge pull request #6964 from rohitwaghchaure/reports_are_not_working 
fix: reports are not working
 2019-02-20 16:59:13 +05:30
Rohit Waghchaure
013bee1c07 fix: reports are not working 2019-02-20 16:56:00 +05:30
Suraj Shetty
06841e80d4
Merge pull request #6963 from deepeshgarg007/base_list 
fix: Filter out null values form field array
 2019-02-20 16:17:49 +05:30
deepeshgarg007
39a0372f4f fix: Filter out null values form field array 2019-02-20 14:30:14 +05:30
Suraj Shetty
bc05377352
fix(reportview): use .pop instead of del 
- use .pop() instead of del to avoid KeyError
 2019-02-20 13:10:11 +05:30
Suraj Shetty
f708d05de5
Merge pull request #6962 from netchampfaris/deferred-rendering-signature-geo 
fix: Render Signature and Geolocation after dialog is shown
 2019-02-20 12:56:45 +05:30
Suraj Shetty
f52a294c27
fix: unexpected permission message while creating address 
fix: unexpected permission message while creating address
 2019-02-20 11:45:58 +05:30
Faris Ansari
0e82b8dcf7 fix: Indent using tabs 2019-02-20 11:20:25 +05:30
Rushabh Mehta
78c3a5de2d fix(dialog): clear message before show incase the dialog is being reused 2019-02-20 11:13:49 +05:30
Faris Ansari
550e601186
Merge pull request #6952 from adityahase/recorder 
feat: Recorder
 2019-02-20 11:07:24 +05:30
Faris Ansari
976fc2ffea fix: Render Signature and Geolocation after dialog is shown 
Dialogs are hidden the first time they are created, some fields need to
calculate the dimensions of their container which is not possible when
they are hidden, we fix it by rendering them after the dialog is shown.
 2019-02-20 10:55:57 +05:30
Suraj Shetty
0035c90fa5
Merge pull request #6926 from netchampfaris/fix-frappe-call-to-api-method 
fix: Make requests with cmd on /api/method/path
 2019-02-20 08:58:36 +05:30
Aditya Hase
a87b9cc3bd fix: Clear duplicate entry message (#6961) 2019-02-19 23:52:57 +05:30
Aditya Hase
127ff39d2a test(recorder): fallback to mariadb if sql dialect is not defined 2019-02-19 21:58:58 +05:30
Aditya Hase
b6ff770c61 feat(cypress): Add awesomebar command 2019-02-19 21:58:58 +05:30
Aditya Hase
8bb2288992 test(recorder): Fix tests for postgres 2019-02-19 21:58:58 +05:30
Aditya Hase
e034979b16 fix(recorder): use cursor.query to obtain executed query for postgres 2019-02-19 21:58:58 +05:30
Aditya Hase
58367b7df7 fix(recorder): Use EXPLAIN instead of EXPLAIN EXTENDED 
EXPLAIN EXTENDED is not a valid postgres query, use EXPLAIN instead
 2019-02-19 21:58:58 +05:30
Aditya Hase
e33563e24c test(recorder): Add python tests for recorder 2019-02-19 21:58:58 +05:30
Aditya Hase
0aaa7fcfd1 fix(recorder): Only allow Administrator to use Recorder 2019-02-19 21:58:58 +05:30
Aditya Hase
5f12f970fa style: Linting fixes 2019-02-19 21:58:58 +05:30
Aditya Hase
a9238c874d feat(recorder): Identify duplicate queries 2019-02-19 21:58:58 +05:30
Aditya Hase
f83d1be9af feat(recorder): Add paging in SQL queries table 2019-02-19 21:58:58 +05:30
Aditya Hase
606d436002 feat(recorder): Add sorting for SQL Queries 2019-02-19 21:58:58 +05:30
Aditya Hase
7ef273cf82 fix(recorder): Cleanup 
Add breadcrumb for backward navigation
Add Table view for SQL Explain
Add __debug__ check for NOOP in production
Remove unnecessary v-bind
Use router.push instead of router-link
Route to request-detail page if route is set to /request/:id
 2019-02-19 21:58:58 +05:30
Aditya Hase
488a23b7c6 fix(recorder): Yield smaller stack trace 2019-02-19 21:58:58 +05:30