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
|
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 |
|
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 |
|
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 |
|
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 |
|
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 |
|
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 |
|
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
|
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
|
1b150683a6
|
merge
|
2013-09-13 13:16:45 +05:30 |
|
Rushabh Mehta
|
c4296eca23
|
minors
|
2013-09-13 13:02:48 +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
|
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 |
|
Rushabh Mehta
|
467c36ef08
|
[minor] install fixes
|
2013-09-12 17:01:51 +05:30 |
|
Anand Doshi
|
37f1c27d4b
|
[website] [minor] fixes after moving website module
|
2013-09-12 16:59:12 +05:30 |
|
Akhilesh Darjee
|
fe73e9ca04
|
Merge branch 'master' of github.com:webnotes/wnframework
|
2013-09-12 16:55:35 +05:30 |
|
Nabin Hait
|
ca54d30099
|
[fix] [minor] import parent + child data
|
2013-09-12 16:19:24 +05:30 |
|
Akhilesh Darjee
|
a4f273f75d
|
[fix] [minor] company fetch from :Company
|
2013-09-12 14:00:27 +05:30 |
|
Anand Doshi
|
d9e075b2e4
|
[fix] [minor] reload test_module in test_runner
|
2013-09-12 11:53:54 +05:30 |
|
Anand Doshi
|
d3eebd5d0a
|
[minor] [fix] [website] sitemap and rss
|
2013-09-12 11:52:27 +05:30 |
|
Rushabh Mehta
|
6501239a46
|
[minor] [install] added install fixtures
|
2013-09-11 19:36:46 +05:30 |
|
Rushabh Mehta
|
5302d1e8e8
|
[minor] [install] sync doctypes for app
|
2013-09-11 17:38:05 +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
|
21a63c41b7
|
Merge branch 'website-wip' of github.com:webnotes/wnframework into website-wip
|
2013-09-10 18:31:58 +05:30 |
|
Anand Doshi
|
5eed6ccbcc
|
[website] [minor] moving to framework
|
2013-09-10 18:29:37 +05:30 |
|