Commit graph

148 commits

Author SHA1 Message Date
Nabin Hait
e6358065ba Merged develop into v5 2015-03-17 10:57:01 +05:30
Pratik Vyas
2fbb92e7f4 bumped to version 4.13.2 2015-03-16 22:04:58 +06:00
Pratik Vyas
3eec31fa84 bumped to version 4.13.1 2015-03-06 17:11:58 +06:00
Nabin Hait
a78b037dec Fixed conflict 2015-02-26 15:14:23 +05:30
Pratik Vyas
7c28243e0e bumped to version 4.13.0 2015-02-26 15:15:21 +06:00
Pratik Vyas
6c605e97f3 bumped to version 4.12.2 2015-02-26 12:38:43 +06:00
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
Pratik Vyas
83eb74ee70 bumped to version 4.12.1 2015-02-17 16:28:36 +06:00
Pratik Vyas
d2ccb16df6 bumped to version 4.12.0 2015-02-16 12:47:38 +06:00
Pratik Vyas
29d10b7cf6 bumped to version 4.11.4 2015-02-10 15:14:56 +06:00
Pratik Vyas
280dd8be00 bumped to version 4.11.3 2015-02-09 14:50:32 +06:00
Pratik Vyas
065a979dd5 bumped to version 4.11.2 2015-02-06 16:56:53 +06:00
Pratik Vyas
54482941c9 bumped to version 4.11.1 2015-02-05 16:14:43 +06:00
Pratik Vyas
6170cabe8a bumped to version 4.11.0 2015-02-05 14:53:53 +06:00
Pratik Vyas
9b5803d7ea bumped to version 4.10.2 2015-01-28 17:31:22 +06:00
Pratik Vyas
b92b3df68b bumped to version 4.10.1 2015-01-23 16:45:12 +06:00
Pratik Vyas
2af212ffea bumped to version 4.10.0 2015-01-21 17:08:09 +06:00
Pratik Vyas
ebedab763a bumped to version 4.9.3 2015-01-12 12:44:03 +06:00
Pratik Vyas
da7b5d157f bumped to version 4.9.2 2014-12-31 13:10:01 +06:00
Pratik Vyas
f3cc20a62f bumped to version 4.9.1 2014-12-23 15:51:02 +06:00
Pratik Vyas
ad1fd7fb9a bumped to version 4.9.0 2014-12-19 18:41:06 +06:00
Pratik Vyas
c7b319cfdd bumped to version 4.8.0 2014-12-16 16:16:27 +06:00
Pratik Vyas
a281f9ab05 bumped to version 4.7.1 2014-12-12 17:21:36 +06:00
Pratik Vyas
50ce44fd45 bumped to version 4.7.0 2014-12-09 17:09:41 +06:00
Pratik Vyas
e4aa1ed277 bumped to version 4.6.1 2014-11-26 19:10:42 +06:00
Pratik Vyas
96c1b13d09 bumped to version 4.6.0 2014-11-25 11:45:26 +06:00
Pratik Vyas
06e7c67c15 bumped to version 4.5.9 2014-11-19 15:03:44 +06:00
Pratik Vyas
1349402648 bumped to version 4.5.8 2014-11-17 13:22:32 +06:00
Pratik Vyas
08317b8e0e bumped to version 4.5.7 2014-11-17 12:05:13 +06:00
Pratik Vyas
85e6f40909 bumped to version 4.5.6 2014-11-14 16:31:21 +06:00
Pratik Vyas
6b324f451b bumped to version 4.5.5 2014-11-14 15:57:00 +06:00
Pratik Vyas
0eb5bdc167 bumped to version 4.5.4 2014-11-10 13:07:44 +06:00
Pratik Vyas
923cff7fe3 bumped to version 4.5.3 2014-11-08 15:32:05 +06:00
Pratik Vyas
94d113baa7 bumped to version 4.5.2 2014-11-03 16:33:42 +06:00
Pratik Vyas
956a725f02 bumped to version 4.5.1 2014-10-30 14:51:37 +06:00
Pratik Vyas
9d1b41810e bumped to version 4.5.0 2014-10-22 14:48:09 +06:00
Pratik Vyas
b188fa45d8 bumped to version 4.4.6 2014-10-17 15:32:54 +06:00
Pratik Vyas
3b0cbc9be3 bumped to version 4.4.5 2014-10-14 13:04:42 +06:00
pdvyas
faa8361340 bumped to version 4.4.4 2014-10-07 17:34:45 +06:00
Pratik Vyas
f31c17ee23 bumped to version 4.4.3 2014-09-29 16:09:05 +06:00
Rushabh Mehta
5bb97f5ea3 [version] v5.0.0-alpha [fixes] email 2014-09-29 12:22:57 +05:30
Pratik Vyas
885c79a851 bumped to version 4.4.2 2014-09-26 17:19:23 +06:00
Pratik Vyas
34ce279e26 bumped to version 4.4.1 2014-09-17 22:01:05 +06:00
Pratik Vyas
d65aea390f bumped to version 4.4.0 2014-09-16 16:26:25 +06:00
Pratik Vyas
36b5720ac5 bumped to version 4.3.0 2014-09-09 15:39:17 +06:00
Anand Doshi
2b31bb4af6 Bumped to v4.1.0 2014-06-30 12:09:22 +05:30
Pratik Vyas
8ebe075397 keep version in separate file 2014-06-03 13:20:03 +05:30