Commit graph

6838 commits

Author SHA1 Message Date
Nabin Hait
9b217ecaeb Merge branch 'v5.0' of https://github.com/frappe/frappe into v5.0 2015-02-26 15:19:21 +05:30
Nabin Hait
a78b037dec Fixed conflict 2015-02-26 15:14:23 +05:30
Rushabh Mehta
489833fd35 filters and doctype fix 2015-02-26 15:00:19 +05:30
Rushabh Mehta
9c9b2a50d0 [fix] catch and retry tagit wtf 2015-02-26 15:00:18 +05:30
Pratik Vyas
058a2410bb Merge branch 'develop' 2015-02-26 12:08:43 +05:30
Pratik Vyas
6c605e97f3 bumped to version 4.12.2 2015-02-26 12:38:43 +06:00
Anand Doshi
eb6b952dcf Show recent when focus is on awesomebar 2015-02-25 18:51:39 +05:30
Nabin Hait
2a82b9abf3 Merge pull request #1031 from nabinhait/fix1
minor fix in permissions
2015-02-25 18:35:24 +05:30
Nabin Hait
3935479b22 minor fix in permissions 2015-02-25 18:33:44 +05:30
Anand Doshi
969b827657 Multi-select checkboxes in listview 2015-02-25 17:31:28 +05:30
Anand Doshi
ed31f0f452 Animate scroll to grid, fold and comments, fixes frappe/erpnext#2766 2015-02-25 16:56:02 +05:30
Anand Doshi
d47dab97a0 [minor] commonified text-ellipsis 2015-02-25 15:58:43 +05:30
Anand Doshi
dbfca38ca6 [minor] remove flicker when refreshing list 2015-02-25 15:45:50 +05:30
Anand Doshi
2a0bca72fc Format checkbox using icon-ok and icon-remove. Fixes frapp/erpnext#2652 2015-02-25 15:14:00 +05:30
Rushabh Mehta
583cb4d155 [grid] render_on_display 2015-02-25 15:08:28 +05:30
Anand Doshi
2e53a15bda Fieldname validation, fixes frappe/erpnext#2608 2015-02-25 15:06:18 +05:30
Anand Doshi
bfdfcac1ed Fixed test cases and allow dict to be passed to frappe.ui.form.on(doctype, {}) 2015-02-25 14:05:39 +05:30
Anand Doshi
75881851bc [hotfix] website theme 2015-02-25 14:05:39 +05:30
Rushabh Mehta
6d064fc1c7 [minor] notifications and style 2015-02-25 12:04:24 +05:30
Anand Doshi
fe964de0b4 [hotfix] blog category 2015-02-25 11:50:00 +05:30
Anand Doshi
936a4bc4b9 [hotfix] removed unicode literals from minify.py 2015-02-24 22:30:42 +05:30
Anand Doshi
0072aeb3bb [hotfix] removed unicode literals from minify.py 2015-02-24 22:30: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
56ce1af598 [minor] fixes in Website Theme 2015-02-24 17:52:00 +05:30
Rushabh Mehta
f6e02227c3 [fixes] [minor] 2015-02-24 16:48:28 +05:30
Rushabh Mehta
f1c7f5966b [calendar] added filters, fixes in datetime 2015-02-24 14:40:39 +05:30
Anand Doshi
85522e7077 Merge pull request #1028 from anandpdoshi/anand-feb-24
[fix] Added unicode_literals if missing in py files
2015-02-24 14:16:02 +05:30
Anand Doshi
8aee4ebc80 [fix] quote unicode urls 2015-02-24 13:03:31 +05:30
Anand Doshi
d234939cee [fix] changed Text Editor's mysql type to longtext 2015-02-24 12:48:49 +05:30
Anand Doshi
f3b37df2dd [fix] Added unicode_literals if missing in py files 2015-02-24 12:24:20 +05:30
Pratik Vyas
224bf33f3d Merge pull request #1023 from pdvyas/v5-lang
Translation changes
2015-02-23 23:51:01 +05:30
Anand Doshi
7f75e233a8 Website Listing 2015-02-23 22:30:03 +05:30
Anand Doshi
50f2d1b5cd Website Offcanvas Sidebar 2015-02-23 22:13:39 +05:30
Anand Doshi
a1290bbdab Website Theme 2015-02-23 22:13:38 +05:30
Rushabh Mehta
a955c658ca [fixes] minor 2015-02-23 20:17:30 +05:30
Rushabh Mehta
3bdd69fa61 [fix] export_json 2015-02-22 22:31:52 +05:30
Rushabh Mehta
7cad548270 [tests] 2015-02-21 22:37:35 +05:30
Rushabh Mehta
cf83e3c864 [fixes] usability 2015-02-21 17:34:50 +05:30
Rushabh Mehta
4976c0b220 [awesome bar] autofocus 2015-02-21 14:50:55 +05:30
Rushabh Mehta
2ad5612b56 [fixes] various 2015-02-21 14:38:34 +05:30
Rushabh Mehta
6a662e574a [fix] minor 2015-02-20 20:09:15 +05:30
Rushabh Mehta
cd276df8ff [export] download csv using html5 download tag 2015-02-20 16:43:32 +05:30
Rushabh Mehta
4fc661033a [section] [labels] 2015-02-20 16:03:27 +05:30
Pratik Vyas
be3ee116f5 fix make_dict_from_messages 2015-02-20 15:43:27 +05:30
Pratik Vyas
af662ec458 add Catalin and Bosnian language 2015-02-20 15:23:09 +05:30
Rushabh Mehta
229af8cad2 [api] moved frappe.get_all(doctype, filters, fields) to frappe.get_all(doctype, fields, filters) 2015-02-20 15:18:52 +05:30
Pratik Vyas
36a4da274d update translations and patch to new format 2015-02-20 15:05:00 +05:30
Pratik Vyas
08f8b0408e add line number to language csvs 2015-02-20 14:31:44 +05:30
Rushabh Mehta
21df7803d0 [updated] gantt 2015-02-20 13:06:45 +05:30
Rushabh Mehta
ffe1b9eacc [fix] naming frappe/erpnext#2794 2015-02-20 11:50:14 +05:30