Commit graph

9919 commits

Author SHA1 Message Date
Rushabh Mehta
da95b484db [fix] merge fixes and test 2016-06-22 13:10:23 +05:30
Rushabh Mehta
8a91f1a790 [rename] Bulk Email to Email Queue 2016-06-22 13:06:06 +05:30
Anand Doshi
acc4595fc7 Merge pull request #1794 from vjFaLk/frappe-limits
Added Miscellenous Frappe Subscription features
2016-06-22 12:53:58 +05:30
Valmik Jangla
0687eb145d Added misc Frappe Subscription features 2016-06-22 12:37:33 +05:30
Rushabh Mehta
f07d7d6bfe Merge pull request #1807 from KanchanChauhan/view-link-in-email
Option to include or not include document link in email body
2016-06-22 12:01:37 +05:30
Rushabh Mehta
a23f8ea17a Merge pull request #1790 from sbktechnology/develop
Attach file from existing file list in file upload popup
2016-06-22 12:00:16 +05:30
Kanchan Chauhan
0290b918e3 Label changed 2016-06-22 11:44:52 +05:30
Kanchan Chauhan
63cd3168b2 Option to include or not include document link in email body 2016-06-22 11:33:15 +05:30
Rushabh Mehta
2d7a9d2fe6 [minor] get chart date 2016-06-22 11:21:43 +05:30
Rushabh Mehta
9d8812e15b [minor] send standard print format if the name is old 2016-06-22 11:21:43 +05:30
Nabin Hait
e6a9f301b9 Merge branch 'master' into develop 2016-06-21 16:47:10 +05:30
Nabin Hait
739441e0f4 Merge branch 'hotfix' 2016-06-21 16:46:41 +05:30
Nabin Hait
5c10902ec2 bumped to version 6.27.22 2016-06-21 17:15:36 +06:00
Nabin Hait
097eddc340 Merge pull request #1800 from rohitwaghchaure/unable_to_view_communication_in_lead
[Fix] Unable to see the communication on LEAD time line, #WN-SUP18721
2016-06-21 16:36:51 +05:30
Anand Doshi
5feaf817db [fix] reconnect if mysql has gone away 2016-06-20 17:39:37 +05:30
Anand Doshi
8b8cacb52b Merge pull request #1799 from saurabh6790/image_view_default
[fix] set default value as 0 to image_view for doctype DocType
2016-06-16 18:34:47 +05:30
shubham7saxena
4099f0a343 fixed issues related to context resulting in loggin problems in portal 2016-06-16 18:33:47 +05:30
Anand Doshi
196f318ad0 Merge pull request #1798 from vjFaLk/drip-emails
New Command : add-bulk-email
2016-06-16 18:29:14 +05:30
Anand Doshi
19ece064cd Merge pull request #1802 from anandpdoshi/password-strength
[security] test password strength
2016-06-16 18:25:14 +05:30
Rushabh Mehta
c4721bf47f [style] use native system fonts for website 2016-06-16 18:03:13 +05:30
Anand Doshi
8d18bc484e [fix] show password strenght indicator in update password page 2016-06-16 17:42:07 +05:30
Rushabh Mehta
0ded47f5cf [fix] desktop icons, fixes frappe/erpnext#5489 2016-06-16 12:48:23 +05:30
Rushabh Mehta
7b0ce568c4 [fix] [image-view] fixes frappe/erpnext#5488 2016-06-16 12:10:35 +05:30
Anand Doshi
155d065807 [cleanup] remove celery from requirements.txt 2016-06-16 11:58:14 +05:30
Anand Doshi
f176555dd5 [security] test password strength 2016-06-15 19:22:18 +05:30
Anand Doshi
26f379e08b [fix] doc.get_password 2016-06-15 17:39:03 +05:30
Anand Doshi
a47580b3bc [fix] rename password field 2016-06-15 16:48:47 +05:30
Rushabh Mehta
ac6053b47f [fix] grid sorting 2016-06-15 16:44:33 +05:30
Rushabh Mehta
074de6e1c8 [enhancement] show reports in list view 2016-06-15 12:56:51 +05:30
Rohit Waghchaure
dc8fd8d364 [Fix] Unable to see the communication on LEAD time line, #WN-SUP18721 2016-06-15 12:44:00 +05:30
Saurabh
86733f8a75 [fix] set default value as 0 to image_view for doctype 2016-06-15 12:08:34 +05:30
Rushabh Mehta
ab3d1849bf [minor] 2016-06-14 18:09:07 +05:30
Valmik Jangla
8b61ced75a New Command : add-bulk-email 2016-06-14 16:42:41 +05:30
Rushabh Mehta
36ccd24b68 [fix] mins_to_first_response 2016-06-14 16:29:45 +05:30
Rushabh Mehta
3146910dae [minor] [feature] email.py updates mins_to_first_response if field exists 2016-06-14 15:54:05 +05:30
Rushabh Mehta
814a7869db Merge pull request #1796 from vjFaLk/import-doc-fix
Fix for import-doc
2016-06-14 10:53:17 +05:30
Valmik Jangla
15c4bbac8f Fix for import-doc 2016-06-14 10:49:31 +05:30
Anand Doshi
831c3021f3 [fix] letterhead and background-image url in pdf 2016-06-13 18:50:41 +05:30
Rushabh Mehta
55d6bb7ff6 [fix] [patch] password.py 2016-06-13 18:17:28 +05:30
Rushabh Mehta
adc5e877d5 [cleanups] fixes to v7 changes 2016-06-13 17:46:17 +05:30
Anand Doshi
bf93df0989 [patch] update auth based on new password system 2016-06-13 17:41:02 +05:30
Anand Doshi
b3c92997d0 Merge pull request #1795 from anandpdoshi/encrypted-passwords
[security] encrypt passwords that need to be retrievable, except User password which should be hashed
2016-06-13 17:28:51 +05:30
Anand Doshi
526e9ea2d7 [security] encrypt passwords that need to be retrievable, except User password which should be hashed 2016-06-13 17:18:59 +05:30
Anand Doshi
8df1c36a17 Merge pull request #1784 from vjFaLk/frappe-limits
[WIP] Move Frappe subscription features to Frappe App as Limits
2016-06-13 12:21:20 +05:30
Anand Doshi
278d2f84a4 Merge pull request #1791 from vjFaLk/lets-encrypt-doc
Updated let's encrypt doc
2016-06-13 12:19:52 +05:30
Rushabh Mehta
f435aafb92 [minor] msgprint as alert 2016-06-12 11:16:06 +05:30
Rushabh Mehta
b891f66507 [feature] a better msgprint 2016-06-12 11:02:32 +05:30
Valmik Jangla
bceda58833 Updated let's encrypt doc 2016-06-10 16:50:10 +05:30
shreyas
9511e14353 Move Frappe subscription features to Frappe App as Limits 2016-06-10 16:34:53 +05:30
sbkolate
f82917e54d Attach file from existing file list in file upload popup 2016-06-10 15:20:21 +05:30