Commit graph

7920 commits

Author SHA1 Message Date
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
Nabin Hait
b96558172e Update grid.js 2015-08-20 17:04:05 +05:30
Anand Doshi
59db22d587 Merge branch 'develop' 2015-08-20 13:01:09 +05:30
Anand Doshi
915307dde3 bumped to version 6.0.2 2015-08-20 13:31:09 +06:00
Anand Doshi
38ecee919e [fix] set Communication status as Linked or Open during insert, deduplication in timeline, get_user_room in socketio 2015-08-20 12:57:28 +05:30
Anand Doshi
c87befc876 [fix] realtime comments 2015-08-20 12:57:28 +05:30
Anand Doshi
32707ae433 Merge branch 'develop' 2015-08-20 11:47:18 +05:30
Anand Doshi
01eec50d85 bumped to version 6.0.1 2015-08-20 12:17:18 +06:00
Anand Doshi
fe72e05c6f Merge pull request #1263 from rmehta/editor-fix
[fixes] added template and small toolbar if in grid
2015-08-19 16:14:13 +05:30
Anand Doshi
b9f846f266 Merge branch 'develop' 2015-08-19 13:43:50 +05:30
Anand Doshi
d2920dc638 bumped to version 6.0.0 2015-08-19 14:13:49 +06:00
Anand Doshi
05e28de833 [fix] changed version back to v5.4.2 to prepare for v6 release 2015-08-19 13:43:05 +05:30
Anand Doshi
b309963bb4 Merge branch 'develop' 2015-08-19 13:33:11 +05:30
Anand Doshi
7b82af2fd1 bumped to version 7.0.0 2015-08-19 14:03:11 +06:00
Anand Doshi
9c987d381e [change-log] for v6.0.0 2015-08-19 13:32:06 +05:30
Rushabh Mehta
c89d595906 [fixes] added template and small toolbar if in grid 2015-08-19 12:58:27 +05:30
Anand Doshi
b75dd31220 [fix] ignore permissions when deleting linked ToDos and Comments, and unlink Communication instead of deleting them 2015-08-19 12:51:18 +05:30
Anand Doshi
ee6e5c96ea [fix] typo for socket 2015-08-19 12:37:31 +05:30
Anand Doshi
374b015f8f [fix] duplicate comment in realtime 2015-08-19 12:18:15 +05:30
Anand Doshi
a936716125 [fix] doc subscribe shouldn't be done for open docs or new doc 2015-08-19 12:18:15 +05:30
Rushabh Mehta
4ca2d16a98 [minor] don't notify if table 2015-08-19 10:32:04 +05:30
Anand Doshi
86322e7ce2 Merge pull request #1262 from rmehta/realtime
[realtime] cleanup & auto-refresh doc
2015-08-18 17:44:42 +05:30
Rushabh Mehta
7713e191a9 [enhancement] list autorefresh 2015-08-18 17:34:34 +05:30
Anand Doshi
7b74c1fe9b [minor] don't create feed for single doctypes 2015-08-18 17:32:35 +05:30
Rushabh Mehta
a15af7882b [realtime] clear doc locally if updated 2015-08-18 16:52:23 +05:30
Rushabh Mehta
15c2925cbb [minor] cleanup to print (auto-trigger) for frappe/erpnext#3853 2015-08-18 15:18:55 +05:30
Anand Doshi
a96a756d55 [fix] rename breadcrumbs 2015-08-18 12:05:39 +05:30
Anand Doshi
868e6c47a8 [minor] Always show decimals for Float in reports 2015-08-18 11:43:05 +05:30
Rushabh Mehta
6d08f862b0 [cleanup] realtime 2015-08-17 18:22:27 +05:30
Anand Doshi
915bd7f17c [minor] changed no_async to disable_async for consistency 2015-08-17 16:01:58 +05:30
Anand Doshi
20fecb76c0 [minor] remove unicode_literals warning in click 2015-08-17 15:52:04 +05:30
Anand Doshi
31027c5ba3 Merge pull request #1256 from anandpdoshi/append-to-communication
[fix] Allow appending to communication, don't pull sent email
2015-08-17 14:15:53 +05:30
Anand Doshi
0ca64cd1a6 Merge branch 'rmehta-commit-only-on-write' into develop 2015-08-17 14:15:26 +05:30
Anand Doshi
9a9790a78c Merge branch 'commit-only-on-write' of https://github.com/rmehta/frappe into rmehta-commit-only-on-write
Conflicts:
	frappe/website/doctype/web_page/web_page.json
2015-08-17 14:14:10 +05:30
Anand Doshi
91f4e663a0 Merge pull request #1250 from anandpdoshi/print-format-custom-or-builder
Use custom HTML code if Custom Format is checked, else try using Print Format builder format
2015-08-17 14:11:10 +05:30
Anand Doshi
f2ccbc864f [fix] Allow appending to communication, don't pull sent email 2015-08-17 14:07:29 +05:30
Anand Doshi
687f424ccf [minor] remove gevent-socketio requirement 2015-08-17 14:04:18 +05:30