Anand Doshi
|
b23f836abd
|
Merge branch 'website-hierarchy' into 4.0.0-wip
Conflicts:
webnotes/auth.py
webnotes/handler.py
webnotes/model/bean.py
webnotes/webutils.py
|
2014-02-06 14:00:57 +05:30 |
|
Rushabh Mehta
|
21c3eeb52a
|
added splash for frappe:
|
2014-02-06 11:03:28 +05:30 |
|
Anand Doshi
|
1e6f58daf2
|
Website Group rendering (#421)
|
2014-02-03 20:23:14 +05:30 |
|
Rushabh Mehta
|
5514364c27
|
bugfix in bulk mail
|
2014-01-31 14:49:36 +05:30 |
|
Rushabh Mehta
|
70167f795b
|
updated boostrap to 3.1
|
2014-01-31 13:10:09 +05:30 |
|
Nabin Hait
|
6154712b85
|
Merge branch 'develop' of github.com:webnotes/wnframework into 4.0.0-wip
Conflicts:
config.json
webnotes/build.py
webnotes/translate.py
|
2014-01-30 13:03:17 +05:30 |
|
Rushabh Mehta
|
f78fb6d410
|
ux fixes #1344, #1210, #1163, #1284
|
2014-01-24 15:25:39 +05:30 |
|
Rushabh Mehta
|
563e70727e
|
redesigned additional permissions via hooks and implemented in Event:
|
2014-01-23 16:26:44 +05:30 |
|
Rushabh Mehta
|
adc5bbd0fa
|
added new restricted permission to force explict users
|
2014-01-22 17:54:14 +05:30 |
|
Rushabh Mehta
|
51b14f8684
|
updated bootstrap
|
2014-01-22 12:44:01 +05:30 |
|
Rushabh Mehta
|
ce38c4ea98
|
webnotes/wnframework#193
|
2014-01-21 16:21:42 +05:30 |
|
Rushabh Mehta
|
36be63afe1
|
filters are not autocompletes webnotes/erpnext#1306
|
2014-01-21 15:41:02 +05:30 |
|
Nabin Hait
|
af041d7713
|
Fixed conflict while merging with develop branch
|
2014-01-20 17:01:01 +05:30 |
|
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 |
|