Commit graph

10877 commits

Author SHA1 Message Date
Nabin Hait
2772fbd12d Merge branch 'master' into develop 2016-11-01 12:38:50 +05:30
Nabin Hait
c0edd95eb9 Merge branch 'hotfix' 2016-11-01 12:38:50 +05:30
Nabin Hait
4f4dd9c51c bumped to version 7.1.4 2016-11-01 13:08:50 +06:00
Nabin Hait
f68b9ed738 Merge pull request #2239 from webonyx/fix-2221
Fix 'engine' attribute error
2016-11-01 10:59:15 +05:30
Saurabh
050e456335 Merge pull request #2240 from saurabh6790/hotfix
[path][fix] paypal integration
2016-10-31 20:22:17 +05:30
Saurabh
427a97774e [path][fix] paypal integration 2016-10-31 20:20:43 +05:30
Viet Pham
2016841924 Fix 'engine' attribute error 2016-10-31 20:36:32 +07:00
Nabin Hait
9ecfebd38c Merge branch 'master' into develop 2016-10-31 15:05:37 +05:30
Nabin Hait
d329ee3156 Merge branch 'hotfix' 2016-10-31 15:05:37 +05:30
Nabin Hait
e68c2658e7 bumped to version 7.1.3 2016-10-31 15:35:36 +06:00
Nabin Hait
e5b47eab16 Merge pull request #2231 from netchampfaris/ui-fixes
[ui] z-index fix and filter-dashboard css cleanup
2016-10-31 15:02:35 +05:30
Nabin Hait
6c798d8530 Merge pull request #2237 from netchampfaris/hotfix
z-index fix
2016-10-31 15:00:56 +05:30
Faris Ansari
bebf211ed8 [ui] z-index fix 2016-10-31 13:10:01 +05:30
Nabin Hait
f4ef826bbb Merge pull request #2234 from saurabh6790/hotfix
[minor][fix] path fixes for manual dropbox backup
2016-10-31 13:09:07 +05:30
Saurabh
371d9d1f75 [minor][fix] path fixes for manual dropbox backup 2016-10-31 11:41:55 +05:30
Faris Ansari
8a5f214963 [ui] cleanup filter dashboard css 2016-10-29 22:05:43 +05:30
Faris Ansari
67a376cd70 [ui] fix z-index problem 2016-10-29 20:48:25 +05:30
Nabin Hait
4f7a737024 Merge pull request #2230 from shreyasp/bulk_update_validation
[Minor] Added validation to bulk update in case user does not specify value field
2016-10-29 14:36:47 +05:30
Faris Ansari
49b677a77c [ui] z-index fix, added compiled css 2016-10-28 18:21:37 +05:30
Faris Ansari
2cbab3e6da [ui] fix datepicker z-index 2016-10-28 18:14:34 +05:30
shreyas
7fc4c4a82a [Minor] Added validation to bulk update in case user does not specify value field 2016-10-28 17:37:27 +05:30
Nabin Hait
7c4f40b631 fixed conflict 2016-10-27 19:13:44 +05:30
Nabin Hait
9f93076394 Merge branch 'hotfix' 2016-10-27 19:07:25 +05:30
Nabin Hait
c7ebe79330 bumped to version 7.1.2 2016-10-27 19:37:25 +06:00
Nabin Hait
8cd4702dc4 Merge pull request #2223 from saurabh6790/hotfix
[fix] add get_query via individual _tree
2016-10-27 15:36:42 +05:30
Saurabh
a940923e75 [fix] add get_query via individual _tree 2016-10-27 15:21:47 +05:30
Nabin Hait
6956f8d1f2 Merge pull request #2220 from netchampfaris/hotfix
[ui] datepicker z-index fix
2016-10-27 12:51:38 +05:30
Faris Ansari
2002d097c8 [fix] datepicker z-index 2016-10-27 12:49:00 +05:30
Nabin Hait
37614ed43b Merge branch 'master' into develop 2016-10-27 12:38:27 +05:30
Nabin Hait
563e061876 Merge branch 'hotfix' 2016-10-27 12:38:27 +05:30
Nabin Hait
a2f2340f25 bumped to version 7.1.1 2016-10-27 13:08:27 +06:00
Nabin Hait
f93e93d7f1 Merge pull request #2219 from nabinhait/hotfix
minor fix in patch
2016-10-27 12:37:21 +05:30
Nabin Hait
a6405995ee minor fix in patch 2016-10-27 12:36:12 +05:30
Nabin Hait
bdebbe1a19 Merge pull request #2217 from saurabh6790/hotfix
[fix][patch] refactor integration service setup
2016-10-27 12:15:26 +05:30
Saurabh
a9f8ac34fb [fix][patch] refactor integration service setup 2016-10-27 12:13:20 +05:30
Rushabh Mehta
8f6d3d9a11 [fix] in_standard_filter should be in docfield, not doctype 2016-10-26 19:33:04 +05:30
Rushabh Mehta
f124354250 [fix] default value for check 2016-10-26 19:33:04 +05:30
Rushabh Mehta
aece05a792 [fix] default for checks in db_insert and show top 20 filter values 2016-10-26 19:33:04 +05:30
Rushabh Mehta
603f163dd8 [minor] fix style for no data 2016-10-26 19:33:04 +05:30
Rushabh Mehta
424f99e6f3 [cleanup] dashboard filters 2016-10-26 19:33:04 +05:30
robert schouten
01a4845ce7 assorted cleanup and v7.1 fixes 2016-10-26 19:33:04 +05:30
robert schouten
f0464dbdf1 updating sidebar stats to list_sidebar 2016-10-26 19:33:04 +05:30
robert schouten
5c07b355fe filter_dashboard 2016-10-26 19:33:04 +05:30
robert schouten
074f0fcc0b tag catagories 2016-10-26 19:33:04 +05:30
Nabin Hait
25608cccc8 Merge branch 'develop' 2016-10-26 17:51:25 +05:30
Nabin Hait
e0f09fe3dd bumped to version 7.1.0 2016-10-26 18:21:25 +06:00
Nabin Hait
a5abf3d6b4 Update __init__.py 2016-10-26 17:50:24 +05:30
Nabin Hait
c837deff60 Merge branch 'develop' 2016-10-26 17:46:25 +05:30
Nabin Hait
f212851380 bumped to version 7.2.0 2016-10-26 18:16:25 +06:00
Nabin Hait
926ee60c6d [translations] 2016-10-26 17:44:31 +05:30