Commit graph

9648 commits

Author SHA1 Message Date
Anand Doshi
7801d940c8 Merge pull request #1731 from MaxMorais/patch-18
Enable translation of Capitalized Keywords
2016-04-27 12:30:05 +05:30
Maxwell Morais
68fa6cd9d0 Enable translation of Capitalized Keywords
The regex checkin only lower letters, dont allow the translation of things like

- VAT
- NPV
- IRR
- PV
- PMT
2016-04-26 14:27:36 -03:00
Rushabh Mehta
fe330d3209 [cleanup] frappe.require 2016-04-26 12:58:30 +05:30
Nabin Hait
b03a37eee9 Merge pull request #1729 from nabinhait/graph
Show graphs using c3js
2016-04-26 12:33:10 +05:30
Rushabh Mehta
da7075beb2 Merge pull request #1728 from vjFaLk/command-docs
Added / Updated command documentation
2016-04-26 09:23:36 +05:30
Nabin Hait
ada61be19c Show graphs using c3js 2016-04-25 18:51:22 +05:30
Valmik Jangla
b55fd7ace5 Added / Updated command documentation 2016-04-25 18:13:32 +05:30
Rushabh Mehta
6f2b58c095 [fix] control.js for read only values 2016-04-25 17:53:13 +05:30
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