Commit graph

307 commits

Author SHA1 Message Date
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
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
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
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
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
Anand Doshi
c80fb24ec3 [in import] shifted global variable to webnotes 2013-04-19 16:14:48 +05:30
Anand Doshi
507c1c643a Merge branch 'master' into edge 2013-04-19 11:38:37 +05:30
Anand Doshi
72a4b83cb6 [data import tool] filter empty columns during import, if the exist at the end 2013-04-18 19:31:03 +05:30
Rushabh Mehta
28d632a634 [upload] [feature] using filereader, added to rich text editor for drag and drop 2013-04-11 14:22:40 +05:30
Rushabh Mehta
614ecc59a7 [upload] [new design] using filereader and ajax to upload files, no more iframes 2013-04-11 12:36:30 +05:30
Anand Doshi
29a0011d20 Merge branch 'master' into edge
Conflicts:
	core/doctype/doctype/doctype.py
2013-04-10 19:47:51 +05:30
Anand Doshi
4b23bbf408 Merge branch 'master' of github.com:webnotes/wnframework 2013-04-10 15:29:13 +05:30
Anand Doshi
e0f8cf3e8a [permission manager] [fix] if match exists of type fieldname:user and no user property exists for that fieldname, set user default for that fieldname as webnotes.session.user when loading defaults 2013-04-10 15:27:52 +05:30
Rushabh Mehta
30d6a4efc9 [files] [cleanup/redesign] removed the old file_list structure and also added file listing in setup 2013-04-10 13:54:11 +05:30
Nabin Hait
515119c56d [fixes] auto addition of amended_from and file_list field 2013-04-10 13:44:08 +05:30
Rushabh Mehta
b7bd4d258c [files] [patch] dropped file_list property and moved links to 2013-04-10 11:08:48 +05:30
Nabin Hait
11b70a0f83 role added in some pages 2013-04-09 11:49:42 +05:30
Nabin Hait
00437f60e0 add file_list field only if documnet is saved 2013-04-08 18:52:17 +05:30
Rushabh Mehta
ffd7dd5599 Merge branch 'master' of github.com:webnotes/wnframework 2013-04-03 16:37:19 +05:30
Anand Doshi
bdabb1a00d [update manager] [usability] show progress bar when updating 2013-04-03 15:36:02 +05:30
Rushabh Mehta
3211552c06 [framework] [cleanup] desktop, todo, messages, modules setup moved to framework 2013-04-03 15:21:42 +05:30
Rushabh Mehta
7a154abf4c [desktop] [cleanup] moved to framework 2013-04-03 11:41:01 +05:30
Rushabh Mehta
eb90343bdb [data-import] [fix] removed separators 2013-04-03 10:45:24 +05:30
Rushabh Mehta
214353c483 [doctype] [validation] don't convert link: type selects by mistake 2013-04-03 10:28:11 +05:30
Nabin Hait
5459eca72e [data import][validation] removed validation for no options for select fields 2013-04-02 14:55:50 +05:30
Anand Doshi
4b189d497e [setup] [update manager] renamed update-this-app page to update-manager 2013-04-01 16:51:33 +05:30
Anand Doshi
3aaea724b2 [setup] [feature] Update Manager for self hosted applications based on wnframework 2013-04-01 16:40:19 +05:30
Rushabh Mehta
56e0504cd0 [data-import] [fix] changed template to remove -- separators that get removed for some reason 2013-03-30 11:56:13 +05:30
Rushabh Mehta
9eeb10dead [website] [cleanup] selectable images will now be relative urls (files/..) or full urls (http:..) 2013-03-28 16:26:10 +05:30
Rushabh Mehta
c344569be9 [patch] [fix] 2013-03-26 17:20:31 +01:00
Anand Doshi
2d07b48ee6 Merge branch 'master' of github.com:webnotes/wnframework 2013-03-26 18:43:25 +05:30
Anand Doshi
7f8334f70e fixes in test cases 2013-03-26 18:42:40 +05:30
Rushabh Mehta
2cd026a23e [rename] [feature] added merge feature to rename_doc 2013-03-26 17:15:49 +05:30
Rushabh Mehta
598ef69629 [profile] [fix] on_trash 2013-03-26 14:56:48 +05:30
Rushabh Mehta
be8f589c16 [profile/email] [feature] added option not to send print as email body. fix in profile delete 2013-03-25 17:52:13 +05:30
Rushabh Mehta
76e8569081 [website] [fix] signup permissions 2013-03-22 13:02:06 +05:30
Rushabh Mehta
97790d0e8f added permissions for server side print 2013-03-21 17:23:54 +05:30
Rushabh Mehta
b4489e44f9 added website pages for orders, tickets and added sales invoice print format 2013-03-21 17:12:24 +05:30
Rushabh Mehta
6d3c96da00 added my account 2013-03-19 17:59:48 +05:30
Rushabh Mehta
aa8ef4cc14 fix to login 2013-03-19 14:35:19 +05:30
Rushabh Mehta
a9bf6061cd print format standard - start 2013-03-19 13:02:46 +05:30
Rushabh Mehta
094e46797c added server side print format 2013-03-19 12:05:09 +05:30
Rushabh Mehta
c7ffbb53c5 webshop login, logout 2013-03-19 11:12:20 +05:30