Commit graph

11389 commits

Author SHA1 Message Date
Rushabh Mehta
96dd947111 [minor] add progress in desktop help message 2017-03-02 11:12:55 +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
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
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
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
Revant Nandgaonkar
94d9f2c48e [Fix] set user from refresh token if not found 2017-02-28 13:58:29 +05:30
mbauskar
1619a63b08 [minor] filter missing fixes in Report View 2017-02-28 12:55:23 +05:30
Nabin Hait
3b10f61541 Merge branch 'hotfix' 2017-02-27 14:30:21 +05:30
Nabin Hait
a0e18061d5 bumped to version 7.2.20 2017-02-27 15:00:20 +06:00
robert schouten
2b3f5db9da [hotfix] comply with imap and pop auth failed response (#2712)
* [hotfix] comply with imap and pop auth failed response

* simplified hotfix for imap and pop auth response
2017-02-27 12:09:46 +05:30
Nabin Hait
9aad1c52c4 Merge pull request #2757 from rmehta/new-buttons
[enhance] add new buttons on form dashboards
2017-02-24 11:42:24 +05:30
Nabin Hait
31990abdef Merge pull request #2751 from rmehta/desktop-help
[enhance] add help messages in desktop
2017-02-24 11:30:29 +05:30
Nabin Hait
cdc168586a Update desktop.py 2017-02-24 11:30:03 +05:30
Rushabh Mehta
77b17be78e [enhance] add new buttons on form dashboards 2017-02-23 17:02:27 +05:30
Rushabh Mehta
e7601d2357 [enhance] add help messages in desktop 2017-02-22 16:13:53 +05:30
Nabin Hait
fecf3fbf62 Merge branch 'hotfix' 2017-02-22 15:04:39 +05:30
Nabin Hait
85245e9233 bumped to version 7.2.19 2017-02-22 15:34:39 +06:00
Revant Nandgaonkar
4897848615 [Fix] Oauth2 fix for handling multiple scopes (#2744)
Replaced "+" in scopes with space " " in case of Guest is redirected
2017-02-22 14:54:34 +05:30
Nabin Hait
9cb63430bb Merge pull request #2739 from mbauskar/hotfix
[validate] validate the auto report format on validate
2017-02-20 17:02:30 +05:30
mbauskar
12a58bfa39 [validate] validate the auto report format on validate 2017-02-20 16:33:37 +05:30
Nabin Hait
5ce9cb20c4 Merge branch 'hotfix' 2017-02-20 14:44:19 +05:30
Nabin Hait
fc6edabbbc bumped to version 7.2.18 2017-02-20 15:14:19 +06:00
Nabin Hait
8bdc6e2d6f Merge pull request #2732 from mbauskar/hotfix
[minor] added method get_timestamp from date
2017-02-17 15:17:13 +05:30
Rushabh Mehta
a9da206cc2 [minor] control icon 2017-02-17 14:56:17 +05:30
Revant Nandgaonkar
496c1d293e [Add] OAuth 2 Implicit Grant flow (#2728) 2017-02-16 17:18:57 +05:30
mbauskar
6d9eab7f6e [minor] added method get_timestamp from date 2017-02-16 16:40:50 +05:30
Nabin Hait
3b8a8c4983 Merge branch 'hotfix' 2017-02-16 15:59:16 +05:30
Nabin Hait
8b3de0d999 bumped to version 7.2.17 2017-02-16 16:29:16 +06:00
Nabin Hait
b9528c6106 Merge pull request #2729 from saurabh6790/regx_hotfix
[urgent][fix] keep origional regx
2017-02-16 15:58:23 +05:30
Saurabh
19feb398cf [urgent][fix] keep origional regx 2017-02-16 15:55:48 +05:30
Nabin Hait
604b0dcab5 Merge branch 'hotfix' 2017-02-16 14:24:10 +05:30
Nabin Hait
bf3df0196b bumped to version 7.2.16 2017-02-16 14:54:10 +06:00
Makarand Bauskar
4834bfa946 [minor] added flags, docstatus in restricted fieldname (#2709)
* [minor] added flags, docstatus in restricted fieldname

* [minor] excluded Attach Image from In List View
2017-02-15 14:48:38 +05:30
Nabin Hait
383b0ec691 Merge pull request #2690 from rohitwaghchaure/strip_currecny_issue
[Fix] Strip currency symbol issue for EGP currency
2017-02-10 17:52:52 +05:30
Nabin Hait
391057f48c Merge pull request #2698 from saurabh6790/email_validation_fix
[typo][fix] remove double quotes from regx
2017-02-10 10:54:30 +05:30
Nabin Hait
5b1ca7f2eb Merge pull request #2700 from mntechnique/text-editor-fix
Text editor fix
2017-02-10 10:52:45 +05:30
Gaurav Naik
e4acc66163 Merge branch 'master' of https://github.com/frappe/frappe into text-editor-fix 2017-02-09 20:31:14 +05:30
Gaurav Naik
d7ee55b754 [Fix] Text Editor: Icons and sequence for indent-outdent icons 2017-02-09 20:30:52 +05:30
Saurabh
e795c08367 [typo][fix] remove double quotes from regx 2017-02-09 16:55:39 +05:30
Rushabh Mehta
76a9b3665d Update number_format.js 2017-02-09 12:54:37 +05:30
Rohit Waghchaure
bd7ed3dc3d [Fix] Strip currency symbol issue for EGP currency 2017-02-09 12:10:27 +05:30