Commit graph

35 commits

Author SHA1 Message Date
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
Rushabh Mehta
491af45225 commonified comments, now can be added on any generator 2013-09-25 16:07:18 +05:30
Anand Doshi
ef6f1aafa6 [minor] [fix] hide no_cache pages in sitemap 2013-09-25 14:30:59 +05:30
Anand Doshi
5d0f4bb910 [minor] [fix] exclude + from page_name, encode page_name in sitemap 2013-09-25 13:07:06 +05:30
Rushabh Mehta
49b1d17777 [merge] 2013-09-24 18:38:10 +05:30
Rushabh Mehta
115e185131 [autocomplete] Now prefetching using typeahead webnotes/erpnext#861 2013-09-24 18:36:16 +05:30
Anand Doshi
cd67dad3c5 [minor] fixes for import conf 2013-09-24 17:17:38 +05:30
Rushabh Mehta
d2f28555b9 [website] [minor] 2013-09-24 14:35:14 +05:30
Rushabh Mehta
00247a7bcf [minor] added typeahead 2013-09-24 12:59:00 +05:30
Rushabh Mehta
bd6db9f0c2 [profile] Always use link verification for new user 2013-09-18 12:08:23 +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
0f5df7291e [fix] [minor] [website] 2013-09-17 15:28:58 +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
3483280acd [fixes] [minor] fixed sitemap / rss 2013-09-17 13:00:59 +05:30
Rushabh Mehta
ca5d492d8d [wsgi] [minor] replace os.environ by webnotes.get_request_header 2013-09-17 10:49:50 +05:30
Anand Doshi
ce28ccc657 Merge branch 'website-wip' of github.com:webnotes/wnframework into website-wip
Conflicts:
	core/doctype/profile/profile.py
	website/js/website.js
2013-09-16 19:34:28 +05:30
Anand Doshi
5f3fd5184d [fix] [minor] [website] 2013-09-16 19:28:06 +05:30
Rushabh Mehta
3eab31b9a9 [password] reset via link, added update page for portal user 2013-09-16 15:42:40 +05:30
Rushabh Mehta
ffae2a5d7a added requirements 2013-09-13 16:49:22 +05:30
Rushabh Mehta
f808bf4b42 Merge branch 'website-wip' of github.com:webnotes/wnframework into website-wip 2013-09-12 17:02:14 +05:30
Rushabh Mehta
467c36ef08 [minor] install fixes 2013-09-12 17:01:51 +05:30
Anand Doshi
d3eebd5d0a [minor] [fix] [website] sitemap and rss 2013-09-12 11:52:27 +05:30
Anand Doshi
f4602f15aa Merge branch 'website-wip' of github.com:webnotes/wnframework into website-wip 2013-09-11 18:58:45 +05:30
Anand Doshi
4014c2d336 [website] [minor] moving to framework 2013-09-11 18:58:19 +05:30
Rushabh Mehta
940c52798c [minor] [merge] 2013-09-11 16:29:54 +05:30
Rushabh Mehta
224aa2442b [minor] changes to make new app friendly 2013-09-11 16:07:25 +05:30
Anand Doshi
1be588ca5f [website] [minor] moving to framework 2013-09-11 15:31:58 +05:30
Anand Doshi
5eed6ccbcc [website] [minor] moving to framework 2013-09-10 18:29:37 +05:30
Anand Doshi
6a55de6299 [website] [minor] moving to framework 2013-09-10 13:46:14 +05:30
Rushabh Mehta
386cd883b3 [website] [minor] moving to framework 2013-09-10 12:18:57 +05:30
Rushabh Mehta
fb8c63b2bb [website] [minor] moving to framework 2013-09-09 17:31:18 +05:30
Rushabh Mehta
841bfc1c22 [website] [minor] moving to framework 2013-09-09 12:46:33 +05:30