vassili/seitime-frappe
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 4
8029 commits 1 branch 0 tags 587 MiB
Commit graph

48 commits

Author SHA1 Message Date
Anand Doshi
0f00c63801 [major fix] Restrict apply user permissions if user permissions list if empty. Fixes frappe/erpnext#3194 2015-09-07 14:58:53 +05:30
Anand Doshi
c9782e23e4 Merge remote-tracking branch 'frappe/develop' into v6-wip 
Conflicts:
	frappe/__version__.py
	frappe/core/doctype/communication/communication.json
	frappe/hooks.py
	frappe/model/document.py
	frappe/public/css/form.css
	frappe/public/less/form.less
	requirements.txt
	setup.py
 2015-08-17 12:22:02 +05:30
Rushabh Mehta
748cac0d99 [enhancement] added 'assigned by me' in todo list 2015-08-14 12:19:35 +05:30
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
8d55cad71b Merge pull request #1236 from nabinhait/develop 
Set workflow state on cancellation
 2015-08-10 11:26:23 +05:30
Nabin Hait
337c730e34 Set workflow state on cancellation 2015-08-05 14:42:07 +05:30
Anand Doshi
5a7155ffc2 [minor] don't pop when message_log is empty 2015-08-05 11:46:42 +05:30
Anand Doshi
d70968dbc5 [feature] Share with Everyone 2015-07-17 19:41:32 +05:30
Anand Doshi
398336bd64 [fix] Linked With - also remove msgprint when catching PermissionError 2015-06-12 18:03:44 -04:00
Anand Doshi
48f7311c8f [fix] link assignment comment to ToDo 2015-06-08 12:35:13 -04:00
Pratik Vyas
bdc0625037 [fix] Custom script in custom DocType 2015-06-08 08:41:14 +05:30
Pratik Vyas
3294dfa226 [fix] Don't load code for custom doctype 2015-06-01 11:53:36 +05:30
Rushabh Mehta
9874370563 [minor] add html templates in doctypes 2015-05-26 15:06:19 +05:30
Rushabh Mehta
6ba4baecef [cache-redesign] meta cache 2015-05-08 12:16:16 +05:30
Anand Doshi
d6ecd920d4 [fix + patch] Comment Type 2015-05-06 23:15:08 -07:00
Rushabh Mehta
eb21f50c0f [cleanup] frappe.get_user() 2015-05-01 10:33:23 +05:30
Rushabh Mehta
251f3dcecf [ui] fixed list permission footer #1050 2015-04-30 12:54:21 +05:30
Rushabh Mehta
08bcb1e283 [minor] fixes in todo and communication 2015-04-24 14:44:41 +05:30
Rushabh Mehta
3adcad64c3 [minor] is_custom_field in Customize Form, page_name editable in Blog Post and other 2015-04-24 11:40:54 +05:30
Rushabh Mehta
b8a07a0323 [translation] bad strings, fixes frappe/erpnext#3067 2015-04-14 14:39:57 +05:30
Anand Doshi
7112acf3d4 fixed website theme, load comments and login 2015-03-31 11:55:44 +05:30
Anand Doshi
f70f409a64 Merge remote-tracking branch 'frappe/develop' into v5.0 
Conflicts:
	frappe/__version__.py
	frappe/hooks.py
	frappe/translations/ar.csv
	frappe/translations/bs.csv
	frappe/translations/ca.csv
	frappe/translations/de.csv
	frappe/translations/el.csv
	frappe/translations/es.csv
	frappe/translations/fr.csv
	frappe/translations/hi.csv
	frappe/translations/hr.csv
	frappe/translations/it.csv
	frappe/translations/ja.csv
	frappe/translations/kn.csv
	frappe/translations/nl.csv
	frappe/translations/pt-BR.csv
	frappe/translations/pt.csv
	frappe/translations/ru.csv
	frappe/translations/sr.csv
	frappe/translations/ta.csv
	frappe/translations/th.csv
	frappe/translations/vi.csv
	frappe/translations/zh-cn.csv
	frappe/translations/zh-tw.csv
	requirements.txt
	setup.py
 2015-03-06 17:41:22 +05:30
Anand Doshi
b620cab412 Update recent documents for user 2015-03-04 17:21:09 +05:30
Anand Doshi
2995f02f3b Web Notes to Frappe, better alerts, css fixes, fixed splash 2015-03-03 15:09:34 +05:30
Rushabh Mehta
3de9225a3a [fixes] for share frappe/erpnext#2859 2015-03-02 18:07:51 +05:30
Rushabh Mehta
756af9af97 [share] completes #992 2015-02-05 17:26:23 +05:30
Rushabh Mehta
9a649a4a3d [share] added share permission and patch #992 2015-02-05 15:51:31 +05:30
Rushabh Mehta
532fb936a9 [feature] print format builder #977 2015-01-27 18:15:59 +05:30
Rushabh Mehta
090e9ac48c [ui] workflow and listview 2015-01-08 14:28:24 +05:30
Rushabh Mehta
b3254acf1b [ui] [listviews] commonified indicators 2015-01-06 18:07:20 +05:30
Rushabh Mehta
f1dbce8ee0 [merge] v5-design 2014-12-31 14:41:55 +05:30
Rushabh Mehta
112887dc0e [ui] minor changes 2014-12-30 18:06:08 +05:30
Nabin Hait
a4d45cce6f Renamed table fieldnames 2014-12-26 13:17:18 +05:30
Rushabh Mehta
cc275ba7f9 [feature] Custom DocTypes fixes #649 2014-11-26 14:43:16 +05:30
Rushabh Mehta
99d3966cd6 [merge] conflicts 2014-10-21 12:34:57 +05:30
Rushabh Mehta
f61ea57dbf Merge pull request #871 from ssiegel/parentlink 
Include the parent record in the "Linked With" dialog
 2014-10-16 16:09:01 +05:30
Rushabh Mehta
6a75d7fc7b Merge pull request #876 from rmehta/get-all 
[api] frappe.get_all
 2014-10-07 12:12:47 +05:30
Nabin Hait
500f971a33 [merge] 4.x to 5.0 2014-10-06 13:00:20 +05:30
Stefan Siegel
ea2d213fff Include the parent record in the "Linked With" dialog 2014-10-03 00:11:18 +02:00
Rushabh Mehta
4b519bdada [api] frappe.get_all 2014-09-30 17:44:41 +05:30
Rushabh Mehta
a3ee77fd98 [merge] manually update from develop 2014-09-29 12:46:58 +05:30
Rushabh Mehta
5bbefc0728 [fix] linked with 2014-09-29 12:40:26 +05:30
Rushabh Mehta
75c5543ed5 [tests] added test cases 2014-09-29 12:21:57 +05:30
Rushabh Mehta
4d4f146fc8 added attachements, fixed issues #561 2014-09-29 12:21:56 +05:30
Rushabh Mehta
5e88c11159 [email] refactor #561 2014-09-29 12:21:56 +05:30
Rushabh Mehta
27440ab7a0 [mailbox] frappe/erpnext#561: 2014-09-29 12:21:56 +05:30
Rushabh Mehta
2485f2b34f [refactor] 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