Anand Doshi
4cccb9a7ae
[minor] wnf refactor, fixes in demo
2013-09-26 15:56:54 +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
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
Rushabh Mehta
5812e29a33
[minor] removed typeahead (for now)
2013-09-25 10:36:31 +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
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
Nabin Hait
71c90e350b
[fix] [minor] desktop notification if module exists
2013-09-19 16:59:15 +05:30
Pratik Vyas
dabc477b46
refactor for webnotes.conn.sql
2013-09-18 19:19:16 +05:30
Rushabh Mehta
74a38a1aaf
[install] [minor] ability to reinstall fixtures
2013-09-18 12:32:55 +05:30
Rushabh Mehta
72b2d4a3f1
[install] [minor] ability to reinstall fixtures
2013-09-18 12:28:58 +05:30
Rushabh Mehta
d33e276294
[profile] Always use link verification for new user
2013-09-18 12:11:05 +05:30
Rushabh Mehta
bd6db9f0c2
[profile] Always use link verification for new user
2013-09-18 12:08:23 +05:30
Pratik Vyas
84a406b562
Merge remote-tracking branch 'upstream/wsgi' into wsgi
...
Conflicts:
webnotes/handler.py
2013-09-18 00:45:13 +05:30
Rushabh Mehta
93ff8bf7f8
[wsgi] [minor] fixed request host name
2013-09-17 22:13:29 +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
60c8c79a25
[fix] [minor] get_url and fixes due to addition of create permission check
2013-09-17 16:51:40 +05:30
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
696479d217
Merge branch 'website-wip' of github.com:webnotes/wnframework into wsgi
2013-09-17 15:16:15 +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
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
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
1b150683a6
merge
2013-09-13 13:16:45 +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
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
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
Nabin Hait
ca54d30099
[fix] [minor] import parent + child data
2013-09-12 16:19:24 +05:30
Rushabh Mehta
6501239a46
[minor] [install] added install fixtures
2013-09-11 19:36:46 +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
21a63c41b7
Merge branch 'website-wip' of github.com:webnotes/wnframework into website-wip
2013-09-10 18:31:58 +05:30
