Commit graph

256 commits

Author SHA1 Message Date
Anand Doshi
3b75743738 [minor] fallback for conf.py paths 2013-09-26 18:11:39 +05:30
Anand Doshi
b4be1cf18e Merge branch 'wsgi' of github.com:webnotes/wnframework into wsgi 2013-09-26 15:57:05 +05:30
Anand Doshi
4cccb9a7ae [minor] wnf refactor, fixes in demo 2013-09-26 15:56:54 +05:30
Pratik Vyas
1e22f94905 get_site_name without the port 2013-09-26 12:25:15 +05:30
Anand Doshi
459bd6b764 Merge install and perpetual inventory accounting 2013-09-25 20:04:56 +05:30
Anand Doshi
aa8331e6ea Merge branch 'master' of github.com:webnotes/wnframework into wsgi
Added webnotes.in_test check in too many writes check

Conflicts:
	public/js/wn/form/control.js
	webnotes/utils/file_manager.py
	webnotes/webutils.py
	website/sitemap.py
	wnf.py
2013-09-25 19:57:13 +05:30
Anand Doshi
f8474c940c [minor] make conf, install, build 2013-09-25 18:46:06 +05:30
Rushabh Mehta
491af45225 commonified comments, now can be added on any generator 2013-09-25 16:07:18 +05:30
Pratik Vyas
a78e68426e refactor site_path 2013-09-25 12:39:30 +05:30
Anand Doshi
ccc5b5bd49 Merge branch 'wsgi' of github.com:webnotes/wnframework into wsgi 2013-09-24 21:23:34 +05:30
Anand Doshi
7b5f1b2a19 [minor] fixed get_path, destroy and build 2013-09-24 21:23:19 +05:30
Pratik Vyas
b508d4983f [minor] more path fixes 2013-09-24 17:48:00 +05:30
Anand Doshi
cd67dad3c5 [minor] fixes for import conf 2013-09-24 17:17:38 +05:30
Pratik Vyas
fc690f5c93 Merge Rushabh's webutils fixes to wsgi
Conflicts:
	webnotes/app.py
2013-09-24 15:22:59 +05:30
Rushabh Mehta
d2f28555b9 [website] [minor] 2013-09-24 14:35:14 +05:30
Pratik Vyas
01abf65b1f Differentiate between base_path and storage_base_path 2013-09-24 13:39:19 +05:30
Pratik Vyas
927a697ef6 conf migration part 1 2013-09-21 15:13:18 +05:30
Anand Doshi
fabf6798d0 [fix] [minor] [file manager] pass utf-8 encoded strings to os.remove and os.path.exists 2013-09-20 11:44:20 +05:30
Pratik Vyas
126198621b Merge remote-tracking branch 'upstream/website-wip' into wsgi
Conflicts:
	webnotes/handler.py
2013-09-17 19:19:33 +05:30
Anand Doshi
0f1ed64b60 [minor] removed webclient.py 2013-09-17 17:35:33 +05:30
Anand Doshi
60c8c79a25 [fix] [minor] get_url and fixes due to addition of create permission check 2013-09-17 16:51:40 +05:30
Anand Doshi
0f5df7291e [fix] [minor] [website] 2013-09-17 15:28:58 +05:30
Rushabh Mehta
d723c95257 [wsgi] [minor] fixed request host name 2013-09-17 15:28:08 +05:30
Rushabh Mehta
b46679b2ce [wsgi] [minor] fixed request host name 2013-09-17 15:22:09 +05:30
Rushabh Mehta
696479d217 Merge branch 'website-wip' of github.com:webnotes/wnframework into wsgi 2013-09-17 15:16:15 +05:30
Rushabh Mehta
382ef961c4 [wsgi] [minor] fixed request host name 2013-09-17 15:16:01 +05:30
Anand Doshi
7e4e339512 [fix] [minor] [website] 2013-09-17 13:46:49 +05:30
Rushabh Mehta
ca5d492d8d [wsgi] [minor] replace os.environ by webnotes.get_request_header 2013-09-17 10:49:50 +05:30
Rushabh Mehta
e831439d8b [minor] added ignore_links in data_import_tool 2013-09-13 15:29:21 +05:30
Rushabh Mehta
4d55677114 [minor] [fix] [import] 2013-09-12 18:36:26 +05:30
Rushabh Mehta
467c36ef08 [minor] install fixes 2013-09-12 17:01:51 +05:30
Rushabh Mehta
6501239a46 [minor] [install] added install fixtures 2013-09-11 19:36:46 +05:30
Rushabh Mehta
224aa2442b [minor] changes to make new app friendly 2013-09-11 16:07:25 +05:30
Rushabh Mehta
7923f9de71 [website] [minor] moving to framework 2013-09-09 12:17:45 +05:30
Anand Doshi
f73ae8775f [fix] [minor] [receive] if no date in email, use current date 2013-09-06 15:48:08 +05:30
Anand Doshi
0f95ac3a72 [fix] [minor] attach portal links in footer on server-side, fixes in email validation 2013-09-05 15:44:45 +05:30
Anand Doshi
d76d8d3b7e Merge branch 'customer-login' 2013-09-05 12:21:26 +05:30
Anand Doshi
a9a151c090 [fix] [minor] check for basestring before using encode/decode 2013-09-04 18:07:27 +05:30
Anand Doshi
2ae59c312d [minor] added is_html function 2013-09-04 16:45:32 +05:30
Rushabh Mehta
799665f4b6 [minor] webnotes/erpnext#790 2013-09-04 16:25:35 +05:30
Rushabh Mehta
695e0cd61b [minor] communication, webnotes/erpnext#790 2013-09-04 16:20:16 +05:30
Rushabh Mehta
517f2b390b Merge branch 'master' of github.com:webnotes/wnframework 2013-09-04 14:43:03 +05:30
Rushabh Mehta
b178ed7dd2 [bug] [minor] fix #790 2013-09-04 14:42:36 +05:30
Anand Doshi
3ef51a236a [fix] [email] [minor] invalid recipient error message 2013-09-04 11:56:54 +05:30
Anand Doshi
7228f671dd [fix] [minor] decode subject as utf-8 if no encoding specified in the received mail 2013-08-29 13:58:21 +05:30
Rushabh Mehta
e55fb97b5c [demo] New ERPNext Demo 2013-08-26 16:17:50 +05:30
Maxwell
7890bc0d18 Update bulk.py
Correction of var getting in bulk emails, the correct var name is "auto_email_id" but the code uses "auto_mail_id" in line 53
2013-08-21 12:37:34 -03:00
Nabin Hait
173c81e975 [fix] [minor] return blank from datetime_in_user_format if date is null 2013-08-20 10:51:20 +05:30
Anand Doshi
90f6e36fc3 [fix] [minor] _round function - implement round halfs to nearest even number 2013-08-19 19:58:22 +05:30
Nabin Hait
cbdaa47a35 [minor] [validation] ledger can not have a child 2013-08-08 12:42:17 +05:30