Commit graph

41 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
Nabin Hait
c2a2128bad removed duplicate download backup link 2015-05-26 16:45:53 +05:30
Rushabh Mehta
b354ab9b58 [minor] messages on permission, website etc 2015-03-25 13:59:06 +05:30
Rushabh Mehta
c94033013d [link] add doctype option in customize 2015-03-04 12:06:45 +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
Anand Doshi
a1290bbdab Website Theme 2015-02-23 22:13:38 +05:30
Rushabh Mehta
2ad5612b56 [fixes] various 2015-02-21 14:38:34 +05:30
Rushabh Mehta
756af9af97 [share] completes #992 2015-02-05 17:26:23 +05:30
Rushabh Mehta
cf3074a20b [print-format] completed print format builder 2015-01-30 17:08:12 +05:30
Rushabh Mehta
f44b004ad4 [desktop] icons using octicons 2014-12-31 14:38:58 +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
27440ab7a0 [mailbox] frappe/erpnext#561: 2014-09-29 12:21:56 +05:30
Rushabh Mehta
acae2214f8 [refactor] added note, feed, activity 2014-09-29 12:21:12 +05:30
Rushabh Mehta
5a0a9aac66 [refactor] frappe.widgets > frappe.desk 2014-09-29 12:21:12 +05:30
Rushabh Mehta
0a7da0795b start #807 2014-09-03 17:39:25 +05:30
81552433qqcom
cf82903609 permission_manager.js translation
doclistview, no {0} found.
setup.py, translated.

Issue exists: read, write etc translation doesn't show.(note, not sure if it is case sensitive)

Conflicts:
	frappe/core/page/permission_manager/permission_manager.js
2014-08-27 15:08:52 +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
Rushabh Mehta
2aa0e3d1b6 cleaned up print (js) and added print settings 2014-07-25 13:01:47 +05:30
Rushabh Mehta
b9f6bc3423 added email alerts 2014-07-15 14:50:49 +05:30
Rushabh Mehta
6083999f8a added standard reply fixes frappe/erpnext#1819 2014-06-19 15:16:56 +05:30
Anand Doshi
0eb5e8120f Fixes for apply user permissions and momentjs 2014-06-04 18:12:57 +05:30
Anand Doshi
11259e8eaa Role and User Permissions 2014-06-04 17:52:50 +05:30
Anand Doshi
82d2a2fda1 Permission relogication continued 2014-06-04 17:52:49 +05:30
Anand Doshi
fec15666f4 Started permission relogication 2014-06-04 17:52:17 +05:30
Nabin Hait
e6ad4830a9 traslation issue fixed in desktop 2014-05-16 19:58:43 +05:30
Anand Doshi
b5032cf51e Fixed moduleview language issue 2014-05-08 11:43:11 +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
Rushabh Mehta
bd097072c9 created System Settings and update to language setup 2014-04-17 18:47:48 +05:30
Anand Doshi
c709b48a03 Auto set Select values for new documents, other minor fixes 2014-04-15 16:19:20 +05:30
Rushabh Mehta
e11b737591 frappe/frappe#478 fix and added print heading 2014-04-03 15:04:19 +05:30
Anand Doshi
b5aa26b7bc Updated margins for ul li, ol li elements, Changed Tools to Help in Toolbar, Moved Download Backup to Setup > System > Download Backup 2014-03-14 15:09:25 +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
Anand Doshi
ebd825e0c7 Outgoing Email Settings as part of Frappe, fix in copy doc 2014-03-03 20:30:50 +05:30
Anand Doshi
2946cbd1f5 Fix to User Restriction (accept Blank value), Permission Manager Help cleanup 2014-03-03 19:30:11 +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