Commit graph

7956 commits

Author SHA1 Message Date
Anand Doshi
70cb7e76de [fix] use print format file html if found 2015-08-27 15:52:16 +05:30
Anand Doshi
b14fc160fd [hotfix] show head html as blank if None 2015-08-27 11:12:29 +05:30
Anand Doshi
4c97d0c01b Merge branch 'develop' 2015-08-26 16:54:30 +05:30
Anand Doshi
b39ac01a97 bumped to version 6.0.8 2015-08-26 17:24:30 +06:00
Anand Doshi
7994e5732b [change-log] 2015-08-26 14:59:20 +05:30
Anand Doshi
840e46efd4 [fix] frappe.datetime.now_time() gives time using the timezone defined in System Settings 2015-08-26 14:53:10 +05:30
Anand Doshi
44f5cbb66c Merge pull request #1276 from anandpdoshi/head_html
[enhancement] head_html in Website Settings to add HTML tags in the head section of each web page
2015-08-26 12:36:50 +05:30
Anand Doshi
26586e245a Merge branch 'rmehta-unique-fix' into develop 2015-08-26 12:36:16 +05:30
Anand Doshi
34037345b3 [minor] added comment in show_unique_validation_message 2015-08-26 12:36:04 +05:30
Anand Doshi
b8e5619885 [fix] filters using route options 2015-08-26 12:33:14 +05:30
Anand Doshi
bf9ce00aea [enhancement] head_html in Website Settings to add HTML tags in the head section of each web page 2015-08-26 12:20:36 +05:30
Rushabh Mehta
c2ae663e3f [minor] fix message for unique (via support) 2015-08-26 10:28:35 +05:30
Anand Doshi
fbf1674987 [fix] filters using route options 2015-08-25 19:14:46 +05:30
Anand Doshi
8714ab6c97 Merge branch 'develop' 2015-08-24 16:52:46 +05:30
Anand Doshi
6419b715ab bumped to version 6.0.7 2015-08-24 17:22:46 +06:00
Anand Doshi
63d798cbc3 Merge pull request #1272 from rmehta/customize-fix
[minor] fix document_type in DocType and add 'name' and 'modified' to customize form sort options
2015-08-24 14:34:29 +05:30
Anand Doshi
8eccf13722 Merge pull request #1271 from anandpdoshi/bulk-flush-fix
catch specific smtp exceptions in bulk flush for future retry
2015-08-24 14:29:25 +05:30
Anand Doshi
12550a5729 Merge pull request #1270 from anandpdoshi/async_fix
Use from_async
2015-08-24 14:29:15 +05:30
Rushabh Mehta
616098ba0a [minor] fix document_type in DocType and add 'name' and 'modified' to customize form sort options 2015-08-24 14:28:17 +05:30
Anand Doshi
2c5ab62918 Merge pull request #1268 from rmehta/workflow-fix
[minor] workflow in non-single, non-table & get_query fix
2015-08-24 14:26:05 +05:30
Rushabh Mehta
2f7f4542e8 [minor] workflow in non-single, non-table & get_query fix 2015-08-24 13:51:13 +05:30
Anand Doshi
10d338d5b1 Merge pull request #1269 from rmehta/async-fix
[fix] session for async
2015-08-24 13:49:10 +05:30
Anand Doshi
ea79dc6f40 [fix] catch specific smtp exceptions in bulk flush for future retry 2015-08-24 13:36:39 +05:30
Anand Doshi
7cde7fa507 [minor] Use from_async 2015-08-24 13:35:37 +05:30
Anand Doshi
09ebb908ad [fix] use frappe.as_json in emit_via_redis 2015-08-24 12:39:02 +05:30
Rushabh Mehta
780afa4cb1 [fix] session for async 2015-08-24 11:21:08 +05:30
Rushabh Mehta
acc4252ce7 [fix] task via async 2015-08-21 23:37:58 +05:30
Nabin Hait
e23c2a7563 Merge branch 'develop' 2015-08-21 18:12:56 +05:30
Nabin Hait
7274ba4b00 bumped to version 6.0.6 2015-08-21 18:42:56 +06:00
Nabin Hait
02497792e9 Merge pull request #1267 from nabinhait/async
[fix] Removed async temporarily from importer
2015-08-21 18:05:56 +05:30
Nabin Hait
df5f27bee0 [fix] Fixed test case due to removal of async from data import tool 2015-08-21 18:00:26 +05:30
Nabin Hait
7d8f2eeaa1 [fix] Removed async temporarily from importer 2015-08-21 17:48:02 +05:30
Rushabh Mehta
b39c9a5318 [fix] move socket init inside app init 2015-08-21 17:06:09 +05:30
Rushabh Mehta
c6317148bc [fix] move socket init inside app init 2015-08-21 16:36:33 +05:30
Rushabh Mehta
8c41204877 [socket] fail if unable to connect 2015-08-21 16:29:31 +05:30
Anand Doshi
a64f129fff Merge branch 'develop' 2015-08-21 14:56:46 +05:30
Anand Doshi
bcec3eae6f bumped to version 6.0.5 2015-08-21 15:26:46 +06:00
Anand Doshi
c05997a19f [minor] click disable warning 2015-08-21 14:50:42 +05:30
Anand Doshi
5a03cefb96 Merge pull request #1266 from anandpdoshi/fix-socket-new-doc
bind form-rename to subscribe doc after rename of a new doc
2015-08-21 14:37:01 +05:30
Anand Doshi
d8f12f3e05 [fix] bind form-rename to subscribe doc after rename of a new doc 2015-08-21 14:36:39 +05:30
Anand Doshi
1877fc88d2 Merge pull request #1265 from rmehta/socket-fix
[socket] get host using frappe.urllib.get_base_url
2015-08-21 14:34:21 +05:30
Rushabh Mehta
0984050df7 [socket] get host using frappe.urllib.get_base_url 2015-08-21 14:10:57 +05:30
Anand Doshi
f19a0e2a9e Merge branch 'develop' 2015-08-21 12:58:10 +05:30
Anand Doshi
51635ff11f bumped to version 6.0.4 2015-08-21 13:28:10 +06:00
Anand Doshi
65bc63f031 [fix] document refresh notification for same user in different tabs/sessions 2015-08-21 12:56:48 +05:30
Anand Doshi
46f9e75356 [minor] form headline alert margin 2015-08-21 12:13:51 +05:30
Rushabh Mehta
e30ab8d2bb [minor] reset dashboard on refresh 2015-08-21 11:09:01 +05:30
Anand Doshi
127134e700 [fix] request success callback 2015-08-20 19:25:19 +05:30
Anand Doshi
dceec690ad Merge branch 'develop' 2015-08-20 18:46:50 +05:30
Anand Doshi
dd78dec846 bumped to version 6.0.3 2015-08-20 19:16:50 +06:00