Commit graph

10447 commits

Author SHA1 Message Date
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
Rushabh Mehta
a292810202 [minor] add hours to add_to_date 2016-08-23 10:40:14 +05:30
Rushabh Mehta
ae8381f022 [fixes] for in-app help; 2016-08-22 18:47:50 +05:30
Nabin Hait
03b29500d7 Merge pull request #1999 from nabinhait/match_condition_fix
[fix] Set user as session user if not mentioned in match conditions
2016-08-22 18:28:52 +05:30
Nabin Hait
f050cb27e3 [fix] Set user as session user if not mentioned in match conditions 2016-08-22 18:21:00 +05:30
RobertSchouten
61bea65950 fix disable write sharing if you dont have write perm (#1996) 2016-08-22 16:02:22 +05:30
Nabin Hait
7bfaf90fd8 Merge pull request #1997 from nabinhait/change_log_v7
Change logs for v7
2016-08-22 15:56:39 +05:30
Nabin Hait
4dd59498d4 Change logs for v7 2016-08-22 15:51:22 +05:30
Rushabh Mehta
e8f377faa3 [minor] added add_indicator in dashboard 2016-08-22 15:21:22 +05:30
Faris Ansari
e0a22a98bf Help feature (#1966)
* [feature] help search modal

* add symlinks for docs assets

* update help links

* [ui] fix help dropdown in mobile view

* replaced {index} tags in help content, api for fetching help content

* help links open in help modal

* moved help content logic to py
2016-08-22 14:32:43 +05:30
Rushabh Mehta
55d17a6aed [fix] cleanup chart 2016-08-19 13:10:01 +05:30
Rushabh Mehta
e6a35946ec [minor] added option to show failed jobs in background_jobs 2016-08-19 12:24:01 +05:30
Rushabh Mehta
8a10c642a0 [minor] in background jobs, show current jobs and not failed 2016-08-18 18:45:22 +05:30
Rushabh Mehta
b6bee64370 [enhance] minor fixes + background jobs 2016-08-18 18:26:15 +05:30
Nabin Hait
f284668af5 Merge branch 'hotfix' 2016-08-18 16:07:04 +05:30
Nabin Hait
18e192d561 bumped to version 7.0.25 2016-08-18 16:37:04 +06:00
Nabin Hait
c1bab9d5d0 Currency of total row in reports 2016-08-18 16:02:03 +05:30
Nabin Hait
346bdce263 Merge branch 'develop' 2016-08-18 15:58:03 +05:30
Nabin Hait
0ecf529512 bumped to version 7.0.24 2016-08-18 16:28:03 +06:00
Nabin Hait
49012ebcd0 Merge pull request #1987 from nabinhait/is_mobile
Is mobile function shifted to common.js
2016-08-18 14:23:42 +05:30
Nabin Hait
65e000db67 Merge pull request #1988 from mbauskar/develop
[minor] allowed to render the charts if only single record is available
2016-08-18 14:23:31 +05:30