Commit graph

5 commits

Author SHA1 Message Date
Anand Doshi
24f2445065 Merge remote-tracking branch 'webnotes/4.0.0-wip' into permissions
Conflicts:
	webnotes/__init__.py
	webnotes/core/doctype/docfield/docfield.txt
	webnotes/core/page/data_import_tool/data_import_tool.js
	webnotes/defaults.py
	webnotes/install_lib/install.py
	webnotes/model/bean.py
	webnotes/model/code.py
	webnotes/sessions.py
	webnotes/tests/test_nested_set.py
	webnotes/widgets/page.py
2013-12-26 19:12:35 +05:30
Pratik Vyas
81ac6eb7d4 update paths in fontawesome css 2013-12-26 17:03:36 +05:30
Rushabh Mehta
e9e427d54b Fixed bugs in default cache clearing, created new Attach field type for attachments and other minor fixes with file uploads 2013-12-24 18:50:39 +05:30
Rushabh Mehta
1243b71534 install, web serving, session booting 2013-12-12 19:11:07 +05:30
Rushabh Mehta
aebb3e8bd4 moved files inside webnotes 2013-12-11 10:54:35 +05:30