Commit graph

8554 commits

Author SHA1 Message Date
Rushabh Mehta
d2097b5d3e Merge branch 'develop' 2015-11-30 12:02:07 +05:30
Rushabh Mehta
30486ca9a6 bumped to version 6.10.3 2015-11-30 12:32:07 +06:00
Rushabh Mehta
3313622e1c [minor] translation fix 2015-11-30 11:29:57 +05:30
Rushabh Mehta
cfb8c9cab3 [minor] validate file is attached 2015-11-30 10:50:45 +05:30
Rushabh Mehta
d0baea0d4b [fix] remove not-implemented feature convert_to in Communication 2015-11-30 10:31:01 +05:30
Anand Doshi
2498df464d Merge branch 'develop' 2015-11-27 14:58:36 +05:30
Anand Doshi
4ac2030573 bumped to version 6.10.2 2015-11-27 15:28:36 +06:00
Anand Doshi
f535d6306e Merge pull request #1437 from rmehta/upload-grid
[minor] date formatting for bulk grid upload
2015-11-27 14:46:05 +05:30
Rushabh Mehta
a549bffac2 [minor] date formatting for bulk grid upload 2015-11-27 11:59:41 +05:30
Anand Doshi
bcc6de2bda Merge branch 'develop' 2015-11-26 18:11:19 +05:30
Anand Doshi
2e01b030de bumped to version 6.10.1 2015-11-26 18:41:19 +06:00
Anand Doshi
175ed78f8a [hotfix] catch exception during thumbnail generation 2015-11-26 18:09:21 +05:30
Rushabh Mehta
0917ed9cb0 [minor] date picker fixes, t=today, fixes #3830, #4380 2015-11-26 15:41:24 +05:30
Rushabh Mehta
46d9ac0977 [minor] [fix] website.js 2015-11-26 15:39:59 +05:30
Anand Doshi
bab459a4e0 Merge pull request #1422 from anandpdoshi/fix/catch-pop3-exceptions
Catch 2 exceptions in pop3 receive
2015-11-26 14:14:16 +05:30
Anand Doshi
32b9cfc31b Merge pull request #1436 from rmehta/email-alert-comment
[enhancement] ability to add comments in email alerts
2015-11-26 13:15:57 +05:30
Anand Doshi
6177d09b18 [fix] In pop3 receive, catch authentication and timeout errors while connecting, disable incoming emails and assign the email account to system managers 2015-11-26 13:12:33 +05:30
Rushabh Mehta
097eb0a4b5 [enhancement] ability to add comments in email alerts 2015-11-26 13:07:32 +05:30
Anand Doshi
f53b6e4b21 Merge branch 'develop' 2015-11-26 12:41:06 +05:30
Anand Doshi
4ad5a022ba bumped to version 6.10.0 2015-11-26 13:11:06 +06:00
Anand Doshi
6ca836001e [translations] 2015-11-26 12:40:26 +05:30
Rushabh Mehta
7594d13479 [minor] [typo] heading 3 typo in rich text editor 2015-11-26 12:19:21 +05:30
Anand Doshi
1347a0eed5 Merge pull request #1435 from rmehta/catch-thumbnail-error
[minor] catch missing file error and just show message while making thumbnail
2015-11-26 11:04:12 +05:30
Rushabh Mehta
d38a954766 [minor] catch missing file error and just show message while making thumbnail 2015-11-26 10:29:00 +05:30
Rushabh Mehta
caac8209c8 [minor] default print format for developer 2015-11-26 09:02:38 +05:30
Anand Doshi
b7023cf832 Merge pull request #1434 from anandpdoshi/fix/thumbnail-without-extn
[fix] handle the case when the image used for thumbnail generation does not have an extension
2015-11-25 19:28:07 +05:30
Anand Doshi
4c21450dc0 Merge pull request #1433 from anandpdoshi/fix/int-float-not-null-patch
[fix] alter column for int, float not null
2015-11-25 19:27:25 +05:30
Rushabh Mehta
49ef4130be [minor] allow administrator to edit Page (for role) 2015-11-25 18:24:08 +05:30
Rushabh Mehta
bf24fc9661 [fix] [minor] set correct doctype for filter in saved report 2015-11-25 18:03:50 +05:30
Anand Doshi
c14e8b7def [fix] handle the case when the image used for thumbnail generation does not have an extension 2015-11-25 17:54:04 +05:30
Anand Doshi
a8ed449ff3 Merge pull request #1424 from anandpdoshi/fix/print-hide-if-0
[fix] Ability to hide a field in print if its value is 0
2015-11-25 17:28:43 +05:30
Anand Doshi
e5a2524820 [fix] Ability to hide a field in print if its value is 0 2015-11-25 16:33:37 +05:30
Anand Doshi
bcf43d51aa [fix] alter column for int, float not null 2015-11-25 15:50:17 +05:30
Rushabh Mehta
cf6e85d4db [apps] removed user apps (for now) 2015-11-25 12:15:02 +05:30
Anand Doshi
cf05af9444 Merge pull request #1426 from anandpdoshi/fix/validate-upload-size-in-js
[fix] Validate max file size before upload
2015-11-25 11:46:35 +05:30
Anand Doshi
318efd268d Merge pull request #1428 from ccfiel/patch-3
typo error
2015-11-25 11:44:50 +05:30
Anand Doshi
874f30dbdd Merge pull request #1429 from ccfiel/patch-4
Attach Image
2015-11-25 11:44:34 +05:30
Anand Doshi
e168a97fe8 Merge pull request #1430 from ccfiel/patch-5
reload after change site_config.json
2015-11-25 11:44:04 +05:30
Anand Doshi
57d42989ac Merge pull request #1417 from rmehta/app-store
[enhancement] App Installer
2015-11-25 11:42:59 +05:30
Chris Ian Fiel
f1f6ceb4af reload after change site_config.json
Made changes base conversation with @anandpdoshi  https://github.com/frappe/frappe/pull/1427
2015-11-24 20:35:48 +08:00
Chris Ian Fiel
70481f7ff1 Attach Image
Change Image field type to Attach Image and remove Image view field.
2015-11-24 20:17:50 +08:00
Anand Doshi
abf04d1d05 Merge pull request #1425 from ccfiel/patch-1
typo error
2015-11-24 17:27:26 +05:30
Chris Ian Fiel
eed3d172a7 typo error
list to let
2015-11-24 19:55:08 +08:00
Anand Doshi
3ffbe7555a [fix] thumbnail generation when the image url doesn't have an extension 2015-11-24 17:17:44 +05:30
Anand Doshi
7ddb80fd0c [fix] Validate max file size before upload 2015-11-24 17:06:07 +05:30
Chris Ian Fiel
1cf4fbf0ac typo error
typo error 'onwer' to 'owner'
2015-11-24 19:35:13 +08:00
Anand Doshi
fb72f4d2f6 Merge pull request #1423 from anandpdoshi/fix/web-form-customization
Apply docfield customization in webforms based on fieldname, don't add custom fields, translate labels in webforms
2015-11-24 13:19:01 +05:30
Anand Doshi
15ffac514c [fix] Apply docfield customization in webforms based on fieldname, don't add custom fields, translate labels in webforms 2015-11-23 18:43:59 +05:30
Anand Doshi
6906ab5d99 [fix] check if message_log has a message before pop 2015-11-23 14:46:43 +05:30
Anand Doshi
822b255f29 Merge pull request #1421 from anandpdoshi/fix/docfield-unique-validation
[fix] Validate if non-unique values exist if Unique is checked
2015-11-23 12:33:06 +05:30