Commit graph

12 commits

Author SHA1 Message Date
Anand Doshi
c079e27d3f Moved Backup Manager and Social Login keys to the new Integrations Module, prepared frappe for Mandrill Integration 2015-08-11 12:03:13 +05:30
Anand Doshi
f6cdd4a655 Merge remote-tracking branch 'frappe/develop' into v5.0
Conflicts:
	frappe/__version__.py
	frappe/core/doctype/communication/communication.py
	frappe/core/page/desktop/desktop.js
	frappe/hooks.py
	frappe/translations/ar.csv
	frappe/translations/es.csv
	frappe/translations/fr.csv
	frappe/translations/hr.csv
	frappe/translations/id.csv
	frappe/translations/ja.csv
	frappe/translations/nl.csv
	frappe/translations/pl.csv
	frappe/translations/pt-BR.csv
	frappe/translations/ru.csv
	frappe/translations/tr.csv
	frappe/translations/zh-cn.csv
	frappe/translations/zh-tw.csv
	frappe/utils/email_lib/html2text.py
	setup.py
2015-02-24 18:06:16 +05:30
Anand Doshi
f3b37df2dd [fix] Added unicode_literals if missing in py files 2015-02-24 12:24:20 +05:30
Anand Doshi
a1290bbdab Website Theme 2015-02-23 22:13:38 +05:30
Rushabh Mehta
3e58c29904 wip 2014-12-26 12:51:42 +05:30
Rushabh Mehta
94b9f819fb [cleanup] remove website group 2014-12-26 12:50:44 +05:30
Rushabh Mehta
0a7da0795b start #807 2014-09-03 17:39:25 +05:30
Rushabh Mehta
07fa6d1971 [route] redesigned 2014-08-20 11:50:37 +05:30
Anand Doshi
022a912ecd Moved Social Login Keys doctype to Website module 2014-08-13 18:42:53 +05:30
Anand Doshi
b5032cf51e Fixed moduleview language issue 2014-05-08 11:43:11 +05:30
Rushabh Mehta
f3810ae532 rename Profile to User frappe/frappe#470 2014-03-11 16:14:47 +05:30
Anand Doshi
2ff4d34fba DocType Social Login Keys, to make it easy for setting up Social Logins. Fixes in Module View for Setup 2014-03-04 11:14:24 +05:30