Commit graph

11724 commits

Author SHA1 Message Date
Nabin Hait
f9139dee31 Merge branch 'master' into develop 2017-03-02 18:03:33 +05:30
Nabin Hait
ec63a8048e Merge branch 'hotfix' 2017-03-02 18:03:33 +05:30
Nabin Hait
dc35c1ddba bumped to version 7.2.26 2017-03-02 18:33:33 +06:00
Nabin Hait
cc12dc033e Minor fix 2017-03-02 18:02:46 +05:30
Nabin Hait
6bdb453cb4 Update db_query.py 2017-03-02 17:49:30 +05:30
Nabin Hait
0a844d15d5 Fixed merge conflict 2017-03-02 17:02:40 +05:30
Nabin Hait
e52e37fc10 Merge branch 'hotfix' 2017-03-02 16:59:25 +05:30
Nabin Hait
cefd90d090 bumped to version 7.2.25 2017-03-02 17:29:25 +06:00
Nabin Hait
16e437db7d Merge pull request #2793 from mbauskar/hotfix
[minor] filter dashboard fixes
2017-03-02 16:57:26 +05:30
Nabin Hait
bf310c59b4 Merge pull request #2794 from saurabh6790/sql_injection_fixes
[fix] consider optional fields too while chekcing sql injection
2017-03-02 16:56:02 +05:30
Saurabh
b2b2df56aa [fix] consider optional fields too while chekcing sql injection 2017-03-02 16:52:21 +05:30
mbauskar
ab862b060c [minor] filter dashboard fixes 2017-03-02 16:39:22 +05:30
Nabin Hait
5f5d3066fa Merge pull request #2784 from saurabh6790/sql_injection_fixes
[security][fix] fixed order by and group by clause vulnerability for sql injection
2017-03-02 14:09:12 +05:30
Rushabh Mehta
6962962211 [fix] contact us to create communication and blog list 2017-03-02 13:06:45 +05:30
Nabin Hait
29d9abb7bd Update db_query.py 2017-03-02 13:01:41 +05:30
Nabin Hait
25bce97acd Update db_query.py 2017-03-02 12:57:49 +05:30
Nabin Hait
f8e5a7a75a Merge pull request #2786 from ratskin/patch-1
[minor] Fixed spelling mistake
2017-03-02 12:42:59 +05:30
Nabin Hait
04458ab988 Merge pull request #2790 from pratu16x7/communication-remove
[minor]Remove communication from search
2017-03-02 12:42:28 +05:30
Nabin Hait
67da957b8c Merge pull request #2789 from KanchanChauhan/deleted-document-error-msg
Error message on restoring Cancelled Document
2017-03-02 12:41:53 +05:30
Nabin Hait
de8bca68f9 Merge pull request #2791 from KanchanChauhan/editable-field-fix
[Fix] Show dialog if field is editable and not hidden
2017-03-02 12:40:54 +05:30
Nabin Hait
2f024ddbb2 Merge pull request #2792 from KanchanChauhan/webpage-title
[Fix] Webpage title fix
2017-03-02 12:39:42 +05:30
Nabin Hait
df1a596b44 Merge branch 'master' into develop 2017-03-02 12:37:37 +05:30
Nabin Hait
76dea9c4aa Merge branch 'hotfix' 2017-03-02 12:37:36 +05:30
Nabin Hait
cf0b897a5e bumped to version 7.2.24 2017-03-02 13:07:36 +06:00
Kanchan Chauhan
8f58649905 [Fix] Webpage title fix 2017-03-02 12:35:56 +05:30
Rushabh Mehta
96dd947111 [minor] add progress in desktop help message 2017-03-02 11:12:55 +05:30
Kanchan Chauhan
94121be1b4 [Fix] Show dialog if field is editable and not hidden 2017-03-01 18:29:58 +05:30
Nabin Hait
29d771d0c0 Merge branch 'master' into develop 2017-03-01 15:08:28 +05:30
Nabin Hait
494f39de78 Merge branch 'hotfix' 2017-03-01 15:08:27 +05:30
Nabin Hait
4f9676b221 bumped to version 7.2.23 2017-03-01 15:38:27 +06:00
Nabin Hait
299a998cf7 Update control.js 2017-03-01 15:07:20 +05:30
pratu16x7
38d97e1347 Remove communication from search, change modified by of custformfield 2017-03-01 11:01:58 +05:30
Kanchan Chauhan
1bd0660fc8 Error message on restoring Cancelled Document 2017-03-01 10:55:02 +05:30
Elliot Schep
3cd8be14c4 [minor] Fixed spelling mistake 2017-02-28 17:16:46 +01:00
Saurabh
acb660322d [fix] trim whitespaces 2017-02-28 19:15:39 +05:30
Saurabh
049d51cdf1 [security][fix] fixed order by and group by clause vulnerability for sql injection 2017-02-28 18:52:07 +05:30
Nabin Hait
2e0ef33647 Merge branch 'master' into develop 2017-02-28 18:42:07 +05:30
Nabin Hait
d1e573dba8 Merge branch 'hotfix' 2017-02-28 18:42:06 +05:30
Nabin Hait
c567869136 bumped to version 7.2.22 2017-02-28 19:12:06 +06:00
Rushabh Mehta
488cff68bc [minor] update mixpanel analytics 2017-02-28 18:41:16 +05:30
Nabin Hait
181ca977b5 Merge branch 'master' into develop 2017-02-28 18:07:01 +05:30
Nabin Hait
c0d96ba0d7 Merge branch 'hotfix' 2017-02-28 18:07:01 +05:30
Nabin Hait
f997ea68c3 bumped to version 7.2.21 2017-02-28 18:37:01 +06:00
Rushabh Mehta
ef9bd517e2 [minor] add app analytics 2017-02-28 18:05:10 +05:30
Rushabh Mehta
5aadce54be [minor] add app analytics 2017-02-28 17:58:50 +05:30
Rushabh Mehta
75855de5bb [minor] fixes to web form, listview, add portal items via hooks 2017-02-28 17:49:45 +05:30
Revant Nandgaonkar
6ca4984907 Merge pull request #2781 from mntechnique/oauth-refresh-token-user-fix
[Fix] set user from refresh token if not found
2017-02-28 16:24:54 +05:30
Revant Nandgaonkar
511a7e2dde [Fix] set user from refresh token if not found
Use frappe.db.get_value instead of frappe.get_doc
to fetch value of user from bearer/refresh_token
2017-02-28 15:51:23 +05:30
Nabin Hait
403a4d5d57 Merge pull request #2779 from mbauskar/hotfix
[minor] filter missing fixes in Report View
2017-02-28 15:40:24 +05:30
Nabin Hait
2704c7cbab Merge pull request #2782 from nabinhait/develop
Show indicator only if save enabled
2017-02-28 15:24:00 +05:30