Commit graph

10467 commits

Author SHA1 Message Date
Rushabh Mehta
80ca5fecad [minor] expire notification in popup note 2016-08-30 09:59:23 +05:30
Rushabh Mehta
05a1e55bf9 [fix] force to use valid language when syncing languages 2016-08-30 09:53:30 +05:30
Rushabh Mehta
e199d21664 [minor] [patch] import os for patches 2016-08-29 22:08:48 +05:30
Rushabh Mehta
407969b81f [fix] change_log 2016-08-29 17:03:53 +05:30
Rushabh Mehta
f20bf4ae25 [feature] show note to all users on popup (#2017) 2016-08-29 15:40:26 +05:30
Nabin Hait
ada195f853 Merge pull request #2015 from rohitwaghchaure/chinese_language_patch_fix
[Fix] Chinese language rename patch
2016-08-29 12:28:28 +05:30
Rohit Waghchaure
facf66cbb5 [Fix] Chinese language rename patch 2016-08-29 12:24:02 +05:30
Nabin Hait
032e893ced Fixed version conflict 2016-08-29 11:45:42 +05:30
Nabin Hait
5b83bb4d27 Merge branch 'hotfix' 2016-08-29 11:43:27 +05:30
Nabin Hait
bacd40be5f bumped to version 7.0.30 2016-08-29 12:13:27 +06:00
Rushabh Mehta
2491c3e335 [minor] fix for pdf print 2016-08-29 11:31:47 +05:30
Rushabh Mehta
6516f2dee0 [minor] remove patches for language 2016-08-26 17:19:07 +05:30
Rushabh Mehta
c8cdb3851d [patch] sync language doctype 2016-08-26 17:17:09 +05:30
Rushabh Mehta
a2e2c3652b [fix] ctrl+s and other keyboard fixes (#2012) 2016-08-26 15:46:26 +05:30
Rushabh Mehta
d5d5c3a565 [fix] [style] grid overflow fix 2016-08-26 12:45:01 +05:30
Nabin Hait
50d96413f9 Fixed merge conflict 2016-08-26 12:41:55 +05:30
Nabin Hait
88655111a7 Merge branch 'hotfix' 2016-08-26 12:41:05 +05:30
Nabin Hait
ac67e1d51e bumped to version 7.0.29 2016-08-26 13:11:05 +06:00
Rushabh Mehta
e05dd38598 [fix] paging issues in listview (#2011) 2016-08-26 12:06:39 +05:30
Rushabh Mehta
b0eef11570 New languages added:
frappe/translations/am.csv
       	frappe/translations/en-US.csv
       	frappe/translations/en.csv
       	frappe/translations/es-AR.csv
       	frappe/translations/es-CL.csv
       	frappe/translations/es-GT.csv
       	frappe/translations/es-MX.csv
       	frappe/translations/es-NI.csv
       	frappe/translations/fr-CA.csv
       	frappe/translations/ku.csv
       	frappe/translations/lo.csv
       	frappe/translations/lt.csv
       	frappe/translations/ps.csv
       	frappe/translations/rw.csv
       	frappe/translations/sr-SP.csv
       	frappe/translations/zh.csv
2016-08-25 15:22:22 +05:30
Rushabh Mehta
2a7c2f82e1 [languages] fix code for zh, zh-TW 2016-08-25 15:02:59 +05:30
Rushabh Mehta
5073369344 [languages] fix code for zh, zh-TW 2016-08-25 15:01:01 +05:30
Faris Ansari
788ad084b4 [fix] image view (#2009) 2016-08-25 14:39:38 +05:30
Rushabh Mehta
ede3a8ca05 [fix] get_visible_columns in jinja.py 2016-08-24 18:45:29 +05:30
Rushabh Mehta
b6d7a45392 [fix] sync languages after frappe install 2016-08-24 14:50:04 +05:30
Rushabh Mehta
cdac8794b9 [fix] [test] [translation] 2016-08-24 14:39:57 +05:30
Nabin Hait
3cd030df2a Fixed conflict 2016-08-24 13:04:11 +05:30
Nabin Hait
236cb697ee Merge branch 'hotfix' 2016-08-24 13:00:33 +05:30
Nabin Hait
ca4d9ad076 bumped to version 7.0.28 2016-08-24 13:30:33 +06:00
Rushabh Mehta
0c52823a8c [fix] for frappe/erpnext#6164 2016-08-24 12:59:07 +05:30
Rushabh Mehta
c7a5ffc2b7 [fix] for frappe/erpnext#6164 2016-08-24 12:55:14 +05:30
Rushabh Mehta
2ac7d4ac7e [fix] [versioning] 2016-08-24 12:51:30 +05:30
Rushabh Mehta
6157d7afc7 [fix] commands to setup help and version set as 7.1-beta 2016-08-24 12:44:04 +05:30
Rushabh Mehta
7ed7245564 [fix] tests 2016-08-24 12:04:30 +05:30
Rushabh Mehta
e91f5c8f7a [minor] added option to set mariadb password for setup help; 2016-08-23 18:47:26 +05:30
Rushabh Mehta
c034750708 [fix] for building help 2016-08-23 18:10:00 +05:30
Rushabh Mehta
8a32adcaf8 [command] bench setup-help will make the help db 2016-08-23 17:53:38 +05:30
Felipe Orellana
d07e6759a1 Added junit xml reporting capability to test_runner. Added new --junit-xml-output flag to frappe run-test bench command. Updated requirements file to include xmlrunner to generate junit xml reports. (#1995) 2016-08-23 16:49:08 +05:30
Faris Ansari
5683f1f5aa [enhance] app wise help documentation (#2002)
* [enhance] app wise help documentation

* [fix] data-path for contextual help links
2016-08-23 16:47:59 +05:30
KanchanChauhan
9590ec546f Added columns field to grid (#1998) 2016-08-23 16:47:51 +05:30
Rushabh Mehta
f30a6b8360 [refactor] Language is now a doctype (#2003) 2016-08-23 16:38:03 +05:30
Nabin Hait
4b978d3c3e Merge branch 'hotfix' 2016-08-23 16:31:51 +05:30
Nabin Hait
4153bcf279 Merge branch 'master' into develop 2016-08-23 16:31:51 +05:30
Nabin Hait
dbeecd0759 bumped to version 7.0.27 2016-08-23 17:01:50 +06:00
Nabin Hait
b8e12a8987 Merge pull request #2004 from nabinhait/last_selected_values
[fix] Remember last seleced value in Link field
2016-08-23 16:30:54 +05:30
Nabin Hait
f5952b6980 [fix] Remember last seleced value in Link field 2016-08-23 16:29:55 +05:30
Nabin Hait
b04634b947 Merge branch 'hotfix' 2016-08-23 12:09:57 +05:30
Nabin Hait
7d75ab63f9 Merge branch 'master' into develop 2016-08-23 12:09:57 +05:30
Nabin Hait
3135c5312c bumped to version 7.0.26 2016-08-23 12:39:57 +06:00
Rushabh Mehta
4fe7de6971 [minor] removed formatting for date time comparison in db_query.py 2016-08-23 10:48:42 +05:30