Commit graph

349 commits

Author SHA1 Message Date
Rushabh Mehta
9a4eaea365 [query report] fixed toolbar, now add_field in appframe 2013-05-31 12:14:47 +05:30
Rushabh Mehta
19f332583e Merge branch 'responsive' of github.com:webnotes/wnframework into responsive 2013-05-29 13:16:40 +05:30
Rushabh Mehta
f8dc279ca4 [form] [docinfo] added new concept called docinfo to make cleaner architecture to handle not core info like comments, attachments, assignments and close #140 2013-05-29 12:49:57 +05:30
Anand Doshi
0faa76aefa [communication] [fix] removed msgprint of fields 2013-05-29 12:42:34 +05:30
Anand Doshi
ff8b2bce54 Merge branch 'master' of github.com:webnotes/wnframework into responsive 2013-05-29 12:28:30 +05:30
Nabin Hait
8375a949b1 [data import][fix] for handling exception 2013-05-28 18:51:42 +05:30
Anand Doshi
e8e2c68124 Merge branch 'webshop' of github.com:webnotes/wnframework into responsive 2013-05-28 17:44:56 +05:30
Rushabh Mehta
2b846cfd0a [form] usability fixes 2013-05-28 17:01:32 +05:30
Rushabh Mehta
c4afec1371 [comment] fix creation, deltion, close #131 2013-05-28 13:09:22 +05:30
Rushabh Mehta
7fbfcc6ef7 [merge] merge with master 2013-05-24 16:09:12 +05:30
Rushabh Mehta
5226d474a9 [ui] fixed #83, #103, #114, #116 and other minor ui issues, upgraded to jquery 1.9 2013-05-23 16:03:47 +05:30
Anand Doshi
834a959b09 Merge branch 'edge' of github.com:webnotes/wnframework into webshop 2013-05-23 15:17:07 +05:30
Rushabh Mehta
4930036629 [desktop] fixed notification overlay 2013-05-22 15:07:09 +05:30
Anand Doshi
aa87a3a9ae Merge branch 'edge' of github.com:webnotes/wnframework into webshop 2013-05-21 19:36:12 +05:30
Nabin Hait
4b86a41bd2 [patch] update lead, contact in support ticket 2013-05-21 17:17:36 +05:30
Nabin Hait
fd332e47a2 [fixes] set lead, contact and company on support ticket 2013-05-21 16:53:30 +05:30
Nabin Hait
3bfb3b5b8a [updates][data-import] call validate after importing child tables data 2013-05-20 18:03:36 +05:30
Rushabh Mehta
d65070f739 [docs] added ability to add static pages in docs folder and README.md in modules and doctypes 2013-05-20 13:19:46 +05:30
Anand Doshi
1a9bbb38db Merge branch 'edge' of github.com:webnotes/wnframework into webshop 2013-05-15 21:17:10 +05:30
Anand Doshi
2c67a15c02 [data import tool] [fix] clear output area on consecutive uploads 2013-05-15 12:21:31 +05:30
Anand Doshi
c3678ac137 [scheduler log] [usability] show method name in list view 2013-05-15 12:21:13 +05:30
Anand Doshi
abea2f2139 [data import] [fix] shifted common functions to datautils, so as not to cause permission error for role restricted whitelist methods when importing 2013-05-14 19:23:07 +05:30
Anand Doshi
57f81fa29e [profile] [signup] check max users only when adding System User and not for Partner User (website login) 2013-05-14 16:07:25 +05:30
Anand Doshi
91894c8051 Merge branch 'edge' of github.com:webnotes/wnframework into webshop 2013-05-10 18:08:48 +05:30
Anand Doshi
3133f11261 [profile] [fix] send welcome mail via user\'s mail id if not administrator or guest 2013-05-10 14:18:58 +05:30
Anand Doshi
8fcb4819e7 [modules setup] [fix] check modules when not in hidden modules or if hidden modules list does not exist 2013-05-09 23:16:36 +05:30
Anand Doshi
c1946ea886 [defaults] [fix] if default value is None, do not add it in defaults cache 2013-05-09 22:48:48 +05:30
Anand Doshi
b5960f2fb6 [rename] [fix] merge related fixes 2013-05-09 13:21:12 +05:30
Anand Doshi
b1ad44c13d [rename] [fix] merge should be passed to on_rename method of controller for further processing 2013-05-09 12:45:18 +05:30
Rushabh Mehta
563fa266e3 merge 2013-05-09 11:42:35 +05:30
Nabin Hait
7dd30a22d9 [validation] renamed profile should be valid email 2013-05-07 16:37:59 +05:30
Nabin Hait
b780ef5ff3 [fixes][attachment deletion] 2013-05-06 11:33:29 +05:30
Rushabh Mehta
fe9bc2427b [form] [controls] finished controls and script manager - 1st cut 2013-05-03 14:27:29 +05:30
Rushabh Mehta
4724006109 [conflicts] [merged] 2013-05-02 16:00:36 +05:30
Anand Doshi
6eaaa0cbbc Merge branch 'edge' of github.com:webnotes/wnframework into webshop 2013-05-01 14:44:53 +05:30
Nabin Hait
b28190870a Merge branch 'master' of github.com:webnotes/wnframework 2013-04-30 18:09:12 +05:30
Nabin Hait
77b8d34964 [report] add total row 2013-04-30 18:08:43 +05:30
Rushabh Mehta
1858c9cf44 [form] [comments] fixed 2013-04-30 16:50:46 +05:30
Anand Doshi
b47d1e275b [profile] [email notification] sender should be the session user 2013-04-30 16:24:53 +05:30
Anand Doshi
b8dd5d4bdb [data import tool] [fix] fix in passing of additional input fields as params 2013-04-30 13:48:51 +05:30
Anand Doshi
661766f22f [data import tool] [fixes] fixes due to changes in the new upload widget + minor newline fix in errprint messages in handler.py 2013-04-30 13:12:11 +05:30
Anand Doshi
56e4a95a74 [file data] [fix] removed msgprint 2013-04-29 15:21:11 +05:30
Rushabh Mehta
e19d69ffde [form] [workflow] fixed ui, added default workflow_status if missing 2013-04-29 12:41:50 +05:30
Anand Doshi
454c94b411 Merge branch 'master' of github.com:webnotes/wnframework into webshop
Conflicts:
	core/page/data_import_tool/data_import_tool.py
2013-04-24 11:48:37 +05:30
Rushabh Mehta
a811290fcd [merge] fix 2013-04-24 10:03:56 +05:30
Anand Doshi
dc63fdbbfe Merge branch 'master' into edge
Conflicts:
	core/page/data_import_tool/data_import_tool.py
2013-04-22 14:06:22 +05:30
Rushabh Mehta
b6fd32d62b Merge branch 'master' into responsive 2013-04-22 12:14:39 +05:30
Anand Doshi
23e6cc11c7 [data import tool] [fix] use get_field method of model/doctype.py 2013-04-22 12:01:03 +05:30
Anand Doshi
72212c9038 Merge branch 'master' into edge 2013-04-22 11:36:39 +05:30
Anand Doshi
42dc68b138 [data import tool] [fix] empty columns logic 2013-04-22 11:30:54 +05:30