Commit graph

11360 commits

Author SHA1 Message Date
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
robert schouten
f54efe0aa8 [fix] show action after duplicate having no action (#2681) 2017-02-08 16:18:21 +05:30
Nabin Hait
7a007a2cb4 Merge branch 'hotfix' 2017-02-08 11:26:38 +05:30
Nabin Hait
e4e26720e9 bumped to version 7.2.15 2017-02-08 11:56:37 +06:00
Rushabh Mehta
7b7152a5cb Update email_body.py 2017-02-03 12:14:10 +05:30
Makarand Bauskar
2119e9aed2 [minor] minor fixes breadcrumbs & clear auth log (#2663) 2017-02-02 11:14:37 +05:30
Saurabh
b32cb3d203 [minor][fix] validate email using regex (#2656) 2017-01-31 17:57:03 +05:30
Saurabh
59775f2f48 [fix] consider route options only if report filters not exists (#2652) 2017-01-31 17:56:11 +05:30
krnkris
dc527f12cd Update __init.py__ to master (#2641)
It is stable now only issue is the emoji use
2017-01-30 15:20:49 +05:30
Rushabh Mehta
830f22be93 Merge branch 'hotfix' 2017-01-27 15:36:19 +05:30
Rushabh Mehta
6487604ca7 bumped to version 7.2.14 2017-01-27 16:06:18 +06:00
KanchanChauhan
3249272852 [Fix]Linked with not found (#2635) 2017-01-27 11:25:46 +05:30
Rushabh Mehta
9a23f808ff [minor] allow all roles for permission manager 2017-01-26 20:37:41 +05:30
Rushabh Mehta
073dd69ea9 Merge branch 'hotfix' 2017-01-24 18:21:31 +05:30
Rushabh Mehta
5aa4b20587 bumped to version 7.2.13 2017-01-24 18:51:31 +06:00
rohitwaghchaure
c02df70d13 Merge pull request #2631 from KanchanChauhan/unsubscribe-url-fix
[Fix] Unsubscribe url fix
2017-01-24 17:48:00 +05:30
rohitwaghchaure
4cd17a4c44 Merge pull request #2632 from KanchanChauhan/permission-fix
[Fix] Permission fix
2017-01-24 17:47:43 +05:30
Kanchan Chauhan
18708df454 [Fix] Permission manager fix 2017-01-24 17:31:41 +05:30
Kanchan Chauhan
07d33c5c8e [Fix] Unsubscribe url fix 2017-01-24 17:18:25 +05:30
robert schouten
ac0c83c77d [fix] print format settings off by default to align with standard (#2627) 2017-01-24 14:36:59 +05:30
Makarand Bauskar
4c95e3e5ef [minor] auth log for login and logout feed (#2624)
* [minor] Authentication log for login & logout

* [minor] added test cases for authentication log
2017-01-24 14:35:52 +05:30
rohitwaghchaure
5b88228d0e [Fix] Email alert not sent to all recipients (#2623) 2017-01-24 10:57:29 +05:30
Rushabh Mehta
fd506d3c12 [minor] Change Google Analytics preference 2017-01-23 15:04:34 +05:30
Nabin Hait
94c3af5815 Merge branch 'hotfix' 2017-01-20 15:26:01 +05:30
Nabin Hait
3fc6390e2a bumped to version 7.2.12 2017-01-20 15:56:01 +06:00
Nabin Hait
7e8106bff0 Merge pull request #2617 from vjFaLk/message-id-fix
[fix] add brackets to message-id
2017-01-20 14:59:36 +05:30
Valmik Jangla
d222f1140a [fix] add brackets to message-id 2017-01-20 00:12:59 -08:00
Saurabh
d294082122 [fix] remove dropbox backup from hooks, backup call is handled by integration service (#2572)
* [fix] remove dropbox backup from hooks, backup call is handled by integration service

* [fix] test case fix for Integration Service scheduler events
2017-01-20 12:28:47 +05:30
Makarand Bauskar
4246dddcd2 [minor] setup fields to fetch (#2611) 2017-01-19 11:45:16 +05:30
Nabin Hait
de323ff1c9 Merge pull request #2608 from paurosello/patch-1
Update form_links translation
2017-01-18 17:40:20 +05:30