seitime-frappe/webnotes
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
..
core Merge remote-tracking branch 'webnotes/4.0.0-wip' into permissions 2013-12-26 19:12:35 +05:30
data Merge remote-tracking branch 'webnotes/4.0.0-wip' into permissions 2013-12-26 19:12:35 +05:30
model Merge remote-tracking branch 'webnotes/4.0.0-wip' into permissions 2013-12-26 19:12:35 +05:30
modules Merge remote-tracking branch 'webnotes/4.0.0-wip' into permissions 2013-12-26 19:12:35 +05:30
public Merge remote-tracking branch 'webnotes/4.0.0-wip' into permissions 2013-12-26 19:12:35 +05:30
templates Added languages and minor fixes 2013-12-26 14:42:26 +05:30
tests Merge remote-tracking branch 'webnotes/4.0.0-wip' into permissions 2013-12-26 19:12:35 +05:30
translations Added languages and minor fixes 2013-12-26 14:42:26 +05:30
utils Merge remote-tracking branch 'webnotes/4.0.0-wip' into permissions 2013-12-26 19:12:35 +05:30
website Merge remote-tracking branch 'webnotes/4.0.0-wip' into permissions 2013-12-26 19:12:35 +05:30
widgets Merge remote-tracking branch 'webnotes/4.0.0-wip' into permissions 2013-12-26 19:12:35 +05:30
.no_timestamps moved directory structure 2012-09-24 19:18:30 +05:30
__init__.py Merge remote-tracking branch 'webnotes/4.0.0-wip' into permissions 2013-12-26 19:12:35 +05:30
app.py Merged with develop 2013-12-26 10:36:37 +05:30
auth.py Translations redesigned webnotes/wnframework#351 2013-12-19 18:27:00 +05:30
boot.py Implemented use of report, import, export, email and print rights of DocPerm 2013-12-23 20:01:14 +05:30
build.py 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
cli.py Added languages and minor fixes 2013-12-26 14:42:26 +05:30
client.py Merged with develop 2013-12-26 10:36:37 +05:30
country_info.json Add BRL Currency to Brasil 2013-12-12 11:21:54 -02:00
country_info.py [copyright] added Contributors 2013-11-20 12:58:35 +05:30
db.py Merge remote-tracking branch 'webnotes/4.0.0-wip' into permissions 2013-12-26 19:12:35 +05:30
defaults.py Merge remote-tracking branch 'webnotes/4.0.0-wip' into permissions 2013-12-26 19:12:35 +05:30
desktop.json Added Applications page and fixed issues in translations and hooks 2013-12-23 16:08:25 +05:30
handler.py Added Applications page and fixed issues in translations and hooks 2013-12-23 16:08:25 +05:30
hooks.txt Added Applications page and fixed issues in translations and hooks 2013-12-23 16:08:25 +05:30
installer.py 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
memc.py Install fixes, started to rewrite translate.py webnotes/wnframework#351 2013-12-17 17:03:45 +05:30
middlewares.py fixed template loader webnotes/wnframework#351 2013-12-12 13:57:27 +05:30
modules.txt step 0: install 2013-12-11 15:31:32 +05:30
permissions.py Implemented use of report, import, export, email and print rights of DocPerm 2013-12-23 20:01:14 +05:30
profile.py Merge remote-tracking branch 'webnotes/4.0.0-wip' into permissions 2013-12-26 19:12:35 +05:30
pythonrc.py fixes to translations, added building of translation assets 2013-12-20 12:19:54 +05:30
sessions.py Merged with develop 2013-12-26 10:36:37 +05:30
test_runner.py fix running single app tests 2013-12-24 12:10:01 +05:30
translate.py Added languages and minor fixes 2013-12-26 14:42:26 +05:30
webutils.py Redesigned templates. Now all templates must be inside templates/pages templates/generators 2013-12-25 15:18:48 +05:30