Anand Doshi
0ce600b2f9
Merge branch 'KanchanChauhan-WebsiteChanges' into develop
2016-04-22 18:53:00 +05:30
Anand Doshi
9c5e1199de
[css] cleanup + moved products and homepage to erpnext + [fix] get_js
2016-04-22 18:52:47 +05:30
Kanchan Chauhan
0e0789ae00
Website Changes
2016-04-22 17:46:48 +05:30
Rushabh Mehta
144efb6499
[cleanup] control get_value for dialog fields
2016-04-22 17:21:48 +05:30
Rushabh Mehta
44b0dec6e1
[enhancement] sort selector
2016-04-22 13:22:45 +05:30
Anand Doshi
006d289b98
Merge branch 'master' into develop
2016-04-22 12:47:42 +05:30
Anand Doshi
eecd537cef
Merge branch 'hotfix'
2016-04-22 12:47:41 +05:30
Anand Doshi
01aa272db6
bumped to version 6.27.14
2016-04-22 13:17:41 +06:00
Anand Doshi
e055ad221f
[fix] Load private files having non-ascii characters when using Nginx's X-Accel-Redirect system
2016-04-22 12:45:15 +05:30
Rushabh Mehta
cc6e39e44f
Merge pull request #1721 from anandpdoshi/feature/redirect-to-message
...
[feature] Redirect to message page with a detailed message
2016-04-21 22:07:04 +05:30
Anand Doshi
bc4ab6bb71
[feature] Redirect to message page with a detailed message
2016-04-21 20:42:11 +05:30
Rushabh Mehta
72522de80c
[fix] regex
2016-04-21 19:07:36 +05:30
Rushabh Mehta
b902d1e8cc
[enhancements] now can {% include %} in page js files and also write jinja like tags in js templates
2016-04-21 19:00:07 +05:30
Anand Doshi
41f972c588
[fix] context frappe.local.request
2016-04-21 18:45:09 +05:30
Anand Doshi
8bf6151dd9
[fix] css for blog and set context.path = request.path if available
2016-04-21 18:18:39 +05:30
Anand Doshi
4f93c976a7
[fix] If precision > 6, use Decimal(21,9) to allow for 12 digits before the decimal dot like in (18,6)
2016-04-21 16:38:36 +05:30
Rushabh Mehta
ba8416054c
[fix] full width for pages with sidebar
2016-04-21 14:17:55 +05:30
Anand Doshi
102546b064
Merge branch 'RobertSchouten-patch-5' into develop
2016-04-21 13:53:40 +05:30
Anand Doshi
6612161c5d
[fix] outlook email as attachment
...
fixes to pull request #1564
2016-04-21 13:53:31 +05:30
robertschouten
2d84d0a73a
Create incoming-4.raw
2016-04-21 13:53:31 +05:30
robertschouten
6f5d75cd23
Create incoming-3.raw
2016-04-21 13:53:31 +05:30
robertschouten
03c6b3a40c
adding test for attached email message
2016-04-21 13:53:31 +05:30
robertschouten
c2198c9e8d
email receive improvement
...
Hi,
fix for attached emails sent from outlook not appearing:
fix adds the headers into the body and then adds the body (if needed depending on the outlook version)
issues with outlook version 14.0.6023.1000:
only sends attached email in plain text not html for plain/text emails
meaning the body is ignored
issues with outlook version 14.0.7165.500:
has additional layers in mime formatting before the message start and headers compared to older versions but has both plain and html versions of body.
2016-04-21 13:53:31 +05:30
Rushabh Mehta
e9847476d1
[cleanup] [web] styles
2016-04-21 13:10:33 +05:30
Anand Doshi
c693686c54
Merge pull request #1720 from shreyasp/drop-site-cmd
...
[Minor] Archiving sites on bench to custom path instead of default path
2016-04-21 12:04:05 +05:30
Rushabh Mehta
876fc6a885
[fix] [test] test_email
2016-04-21 11:57:24 +05:30
shreyas
da1fa84c74
[Minor] Archiving sites on bench to custom path instead of default path
2016-04-21 11:52:49 +05:30
Rushabh Mehta
49768bf86a
Merge pull request #1697 from KanchanChauhan/UXChanges
...
[WIP] Do not merge
2016-04-21 11:36:05 +05:30
Rushabh Mehta
345d3c60f4
Merge pull request #1687 from KanchanChauhan/webform-perm
...
Web form permission update
2016-04-21 11:29:00 +05:30
Anand Doshi
f025f1540f
Merge branch 'master' into develop
2016-04-20 20:12:35 +05:30
Anand Doshi
cdddec08a3
Merge branch 'hotfix'
2016-04-20 20:12:34 +05:30
Anand Doshi
9f66e0faaf
bumped to version 6.27.13
2016-04-20 20:42:34 +06:00
Anand Doshi
9a330ab58f
[hot] [fix] X-Original-From set_header
2016-04-20 20:11:01 +05:30
Anand Doshi
a6243744d3
Merge branch 'master' into develop
2016-04-20 19:40:20 +05:30
Anand Doshi
ae3ee24504
Merge branch 'hotfix'
2016-04-20 19:40:20 +05:30
Anand Doshi
ded3c11f76
bumped to version 6.27.12
2016-04-20 20:10:20 +06:00
Anand Doshi
e8879454e8
[hot] [fix] Add X-Original-From header when replacing sender
2016-04-20 19:38:54 +05:30
Rushabh Mehta
671f22f269
[style] [cleanup]
2016-04-20 18:45:27 +05:30
Anand Doshi
c121cccac1
[fix] import has_gravatar
2016-04-20 17:39:32 +05:30
Anand Doshi
b4d2f01adb
[fix] after merge
2016-04-20 17:13:17 +05:30
Anand Doshi
4bf0e8fce7
Merge branch 'master' into develop
2016-04-20 16:30:31 +05:30
Kanchan Chauhan
1119a82cdb
Changes 4
2016-04-20 16:23:10 +05:30
Kanchan Chauhan
1e7ddf4404
Changes 3
2016-04-20 16:23:09 +05:30
Kanchan Chauhan
b1b3c17b2d
Changes 2
2016-04-20 16:23:09 +05:30
Kanchan Chauhan
ca4c64fd8a
Changes
2016-04-20 16:23:09 +05:30
Kanchan Chauhan
110ec335b8
[WIP] Do not merge
2016-04-20 16:23:09 +05:30
Anand Doshi
1e854f1ef0
Merge branch 'hotfix'
2016-04-20 16:11:01 +05:30
Anand Doshi
92b4fdcf88
bumped to version 6.27.11
2016-04-20 16:41:01 +06:00
Anand Doshi
b289ff7004
[change log]
2016-04-20 16:05:38 +05:30
Anand Doshi
3fa056565c
Merge pull request #1711 from neilLasrado/disable-roles
...
Ability to Disable a role
2016-04-20 15:57:25 +05:30
