Commit graph

4368 commits

Author SHA1 Message Date
Anand Doshi
54a6a01be8 Merge pull request #393 from pdvyas/hotfix-mysql
pin mysql-python to 1.2.4
2014-01-06 22:36:15 -08:00
Pratik Vyas
87fa6bee40 pin mysql-python to 1.2.4 2014-01-07 12:00:30 +05:30
Nabin Hait
1027351269 Merge pull request #391 from nabinhait/hotfix
Fixes in reportview filter conditions
2014-01-06 03:04:31 -08:00
Nabin Hait
fc6d904c9a Fixes in reportview filter conditions 2014-01-06 16:29:01 +05:30
Pratik Vyas
ee15674874 Merge branch 'develop' 2014-01-02 17:11:55 +05:30
Pratik Vyas
2a004e8755 bumped to version 3.4.3 2014-01-02 17:41:55 +06:00
Nabin Hait
d4d05f3e07 Merge pull request #388 from nabinhait/hotfix
Load extra doctypes while building filter conditions
2014-01-02 03:03:36 -08:00
Nabin Hait
8e1a96e6de Load extra doctypes while building filter conditions 2014-01-02 16:08:43 +05:30
Nabin Hait
46dced5f3d Merge pull request #387 from anandpdoshi/hotfix-autosuggest
Autosuggest should be rendered above all, just like Date Picker
2014-01-02 00:34:41 -08:00
Anand Doshi
a388f10065 Autosuggest should be rendered above all, just like Date Picker 2014-01-02 13:54:24 +05:30
Pratik Vyas
60093c845b Merge branch 'develop' 2013-12-30 19:34:33 +05:30
Pratik Vyas
26f47936c3 bumped to version 3.4.2 2013-12-30 20:04:33 +06:00
Pratik Vyas
8d8d8191ab Merge pull request #382 from anandpdoshi/hotfix-reportview-filters
[hotfix] Reportview Filters
2013-12-30 06:03:32 -08:00
Anand Doshi
82298a2f26 [hotfix] Reportview Filters 2013-12-30 19:30:43 +05:30
Pratik Vyas
614b623d3a Merge branch 'develop' 2013-12-30 18:57:58 +05:30
Pratik Vyas
83b47d9fb4 bumped to version 3.4.1 2013-12-30 19:27:58 +06:00
Pratik Vyas
c99feef3cf Merge pull request #381 from anandpdoshi/hotfix-reportview-filters
Reportview Filters null value fix
2013-12-30 05:26:47 -08:00
Anand Doshi
2b0c2595c7 Reportview Filters null value fix 2013-12-30 18:55:51 +05:30
Pratik Vyas
bd38aafa37 Merge branch 'develop' 2013-12-30 17:47:57 +05:30
Pratik Vyas
27efedc601 bumped to version 3.4.0 2013-12-30 18:17:57 +06:00
Nabin Hait
0079e085a2 Merge pull request #371 from nabinhait/hotfix
Fixes in Filter conditions in reportview to handle null values
2013-12-30 03:44:34 -08:00
Nabin Hait
a701dd9472 Fixes in filter_conditions, null issue 2013-12-27 18:06:33 +05:30
Nabin Hait
b83cd0291e Small fixes in query report 2013-12-27 17:38:46 +05:30
Nabin Hait
19d375a20b Call validate form update_after_submit 2013-12-27 17:38:16 +05:30
Nabin Hait
3feaa9fd43 Fixes in Filter conditions in reportview to handle null values 2013-12-25 14:49:24 +05:30
Nabin Hait
df62a9fc1a Fixes in Filter conditions in reportview to handle null values 2013-12-25 14:49:24 +05:30
Nabin Hait
55003f860c Merge pull request #370 from akhileshdarjee/hotfix
[fix] [minor] improved month_start and month_end
2013-12-24 03:47:51 -08:00
Akhilesh Darjee
86bacfe901 [fix] [minor] improved month_start and month_end 2013-12-24 14:34:44 +05:30
Pratik Vyas
ac4d34d635 Merge branch 'develop' 2013-12-23 17:31:19 +05:30
Pratik Vyas
1ef54e062c bumped to version 3.3.2 2013-12-23 18:01:18 +06:00
Pratik Vyas
ed97d6afaa Merge pull request #366 from anandpdoshi/hotfix-localstorage
[fix] Browser's LocalStorage initialisation
2013-12-23 04:00:48 -08:00
Nabin Hait
5c36107f52 Merge pull request #369 from nabinhait/develop
set filters in query report through route options
2013-12-23 03:41:38 -08:00
Nabin Hait
f886e0082e set filters in query report through route options 2013-12-23 17:08:49 +05:30
Anand Doshi
d0f1e37bcb [fix] Browser's LocalStorage initialisation 2013-12-19 16:54:54 +05:30
Pratik Vyas
005ec6197a Merge branch 'develop' 2013-12-18 12:19:22 +05:30
Pratik Vyas
e37ec51814 bumped to version 3.3.1 2013-12-18 12:49:22 +06:00
Nabin Hait
e77c182f94 Merge pull request #365 from anandpdoshi/hotfix
[fix] get modules path
2013-12-17 20:14:56 -08:00
Anand Doshi
73b3163bac [fix] get modules path 2013-12-18 07:52:56 +05:30
Pratik Vyas
221bdaddfd Merge branch 'develop' 2013-12-17 18:02:59 +05:30
Pratik Vyas
464e0b9440 bumped to version 3.3.0 2013-12-17 18:32:59 +06:00
Anand Doshi
850da5628f Merge pull request #363 from nabinhait/reports
Reports
2013-12-17 04:27:52 -08:00
Anand Doshi
1e76a3eb5f Merge pull request #364 from pdvyas/rename-doc
[minor] add rename to client
2013-12-17 03:06:21 -08:00
Pratik Vyas
0a446410f9 [minor] make docs mergable via client using rename_doc 2013-12-17 16:34:33 +05:30
Pratik Vyas
59e2bef91b [minor] add rename to client 2013-12-17 16:11:23 +05:30
Nabin Hait
7daf3d1194 Merge branch 'develop' of github.com:webnotes/wnframework into reports 2013-12-17 16:10:19 +05:30
Anand Doshi
ea150e0ad2 Merge pull request #355 from pdvyas/hotfix-head-request
[fix] [minor ] do not 404 HEAD request on a website page
2013-12-16 22:21:34 -08:00
Pratik Vyas
edeada8bf7 Merge pull request #356 from anandpdoshi/hotfix-website-banner
[minor] [website] show banner in container
2013-12-16 22:17:34 -08:00
Pratik Vyas
c949615997 Merge pull request #362 from anandpdoshi/hotfix-allow-roles
[minor] [fix] only for
2013-12-16 03:17:07 -08:00
Anand Doshi
034eae66f4 [minor] [fix] only for 2013-12-16 16:43:27 +05:30
Nabin Hait
45c1b584b5 Merge branch 'develop' of github.com:webnotes/wnframework into reports 2013-12-16 15:44:44 +05:30