Commit graph

10 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
Rushabh Mehta
0dc8632063 [cli] search frappe, fix bench execute 2015-03-03 17:11:26 +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
Rushabh Mehta
f44b004ad4 [desktop] icons using octicons 2014-12-31 14:38:58 +05:30
Rushabh Mehta
acae2214f8 [refactor] added note, feed, activity 2014-09-29 12:21:12 +05:30
Nabin Hait
e6ad4830a9 traslation issue fixed in desktop 2014-05-16 19:58:43 +05:30
Rushabh Mehta
2f926f0136 fix to boilerplate, added Core module for Administrator and fixed layout in ControlImage in control.js 2014-05-06 17:17:40 +05:30
Anand Doshi
d6a0b951ae Module View, Removed Website Table of Contents 2014-03-03 15:04:03 +05:30
Rushabh Mehta
024ddfcc5b -webnotes +frappe 💥 2014-02-14 14:55:11 +05:30
Renamed from webnotes/config/desktop.py (Browse further)