Commit graph

4446 commits

Author SHA1 Message Date
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
ea77dd3a68 [fix] [minor] commit on web logout 2013-09-17 16:07:19 +05:30
Anand Doshi
ad5848d580 Merge branch 'master' of github.com:webnotes/wnframework into website-wip 2013-09-17 16:01:39 +05:30
Anand Doshi
10eddb7414 Merge pull request #257 from akhileshdarjee/master
[fix] [minor] company fetch from :Company
2013-09-17 03:30:52 -07:00
Rushabh Mehta
d05a39caa2 [wsgi] [minor] fixed request host name 2013-09-17 15:43:19 +05:30
Rushabh Mehta
35d19e3f7e [wsgi] [minor] fixed request host name 2013-09-17 15:41:23 +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
Nabin Hait
597c4b4c6d [fix] [minor] build report header 2013-09-17 15:18:45 +05:30
Rushabh Mehta
bceb3cec1a [wsgi] [minor] added init 2013-09-17 15:17:36 +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
8bea1abfb3 [minor] 2013-09-17 12:29:34 +05:30
Rushabh Mehta
b48aa2c587 Merge pull request #258 from pdvyas/wsgi
fixes
2013-09-16 23:30:49 -07:00
Pratik Vyas
63e64701b8 tabs|spaces 2013-09-17 11:57:40 +05:30
Pratik Vyas
dcf738f76b remove print statement 2013-09-17 11:55:30 +05:30
Pratik Vyas
54ba68cb0a Add static middleware 2013-09-17 11:55:14 +05:30
Rushabh Mehta
6a59a39006 [wsgi] [minor] 2013-09-17 11:42:45 +05:30
Anand Doshi
134fe5cfa5 Merge branch 'master' of github.com:webnotes/wnframework into website-wip 2013-09-17 10:59:53 +05:30
Rushabh Mehta
14c499cf4f [wsgi] [minor] replace os.environ by webnotes.get_request_header 2013-09-17 10:55:10 +05:30
Rushabh Mehta
ca5d492d8d [wsgi] [minor] replace os.environ by webnotes.get_request_header 2013-09-17 10:49:50 +05:30
Nabin Hait
3f21b3ad23 Merge branch 'master' into perpetual 2013-09-17 10:23:29 +05:30
Rushabh Mehta
9d11c3e76a [wsgi] [minor] send content as request.data 2013-09-16 22:25:39 +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
Anand Doshi
d935f35651 [fix] [minor] [grid] refresh and toggle_view 2013-09-16 19:04:37 +05:30
Rushabh Mehta
e32a0ee7bf wsgi started 2013-09-16 18:59:39 +05:30
Rushabh Mehta
3eab31b9a9 [password] reset via link, added update page for portal user 2013-09-16 15:42:40 +05:30
Akhilesh Darjee
54f5269787 Merge branch 'master' of github.com:webnotes/wnframework 2013-09-13 17:38:15 +05:30
Rushabh Mehta
ffae2a5d7a added requirements 2013-09-13 16:49:22 +05:30
Rushabh Mehta
e831439d8b [minor] added ignore_links in data_import_tool 2013-09-13 15:29:21 +05:30
Rushabh Mehta
300848740c [minor] added ignore_links in data_import_tool 2013-09-13 15:20:20 +05:30
Rushabh Mehta
e88b97b9e7 [minor] added ignore_links in data_import_tool 2013-09-13 15:16:00 +05:30
Rushabh Mehta
d74a13a4f1 [import/export] [minor] cleanup 2013-09-13 14:37:10 +05:30
Rushabh Mehta
1aac1f91dc Merge branch 'master' of github.com:webnotes/wnframework into website-wip 2013-09-13 13:16:54 +05:30
Rushabh Mehta
1b150683a6 merge 2013-09-13 13:16:45 +05:30
Nabin Hait
e42aa9d9d5 [fix] [minor] in data inport tool 2013-09-13 13:09:14 +05:30
Rushabh Mehta
c4296eca23 minors 2013-09-13 13:02:48 +05:30
Nabin Hait
59c25b4e2b [fix] [minor] in upload optional argument for overwrite 2013-09-13 12:00:52 +05:30
Anand Doshi
9e9e336224 Merge branch 'website-wip' of github.com:webnotes/wnframework into website-wip 2013-09-13 11:49:01 +05:30
Rushabh Mehta
49d833e72b [editor] [fix] [minor] 2013-09-13 10:21:19 +05:30
Nabin Hait
ec35e5d1f7 [fix] [minor] dont submit from import if doc is not submittable #853 2013-09-12 18:38:24 +05:30
Rushabh Mehta
4d55677114 [minor] [fix] [import] 2013-09-12 18:36:26 +05:30
Nabin Hait
9df394ca44 [fix] [minor] importing parent + children 2013-09-12 18:13:08 +05:30
Rushabh Mehta
f8f39958d8 [minor] check create permission separately 2013-09-12 17:09:17 +05:30
Anand Doshi
5d19c69e1c Merge branch 'master' of github.com:webnotes/wnframework into website-wip
Conflicts:
	core/page/data_import_tool/data_import_tool.py
2013-09-12 17:03:24 +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