Commit graph

798 commits

Author SHA1 Message Date
Nabin Hait
ae18969f1e bumped to version 10.0.5 2017-12-28 20:11:26 +06:00
Nabin Hait
7920309056 bumped to version 10.0.4 2017-12-28 13:42:22 +06:00
Nabin Hait
7c2782e594 bumped to version 10.0.3 2017-12-26 19:03:00 +06:00
Nabin Hait
8a78f40f21 bumped to version 10.0.2 2017-12-25 19:44:33 +06:00
Nabin Hait
289b48fcdf bumped to version 10.0.1 2017-12-25 18:56:17 +06:00
Nabin Hait
70ee7e8d32 bumped to version 10.0.0 2017-12-25 15:54:01 +06:00
Nabin Hait
8a09f915e9 Merge branch 'master' into develop 2017-12-25 13:30:48 +05:30
Nabin Hait
4ebe337e07 bumped to version 9.2.25 2017-12-25 14:00:48 +06:00
Nabin Hait
2e46b1d70c Merge branch 'master' into develop 2017-12-15 12:52:55 +05:30
Nabin Hait
b41bc5c1f9 bumped to version 9.2.24 2017-12-15 13:22:54 +06:00
Manas Solanki
520bfc2ae4 New data import (#4601)
* created/moved the files

* added the model for the downloading the data

* add the file with the error data

* changes added other changes and fix codacy

* changes in the config and utils files

* fixed the test cases

* minor changes in the data keys dict

* changed the test file location

* fixed the tests

* set the route in the list view and show only erors

* minor fixes in the childtable import and log tables rendering

* Refactor Download dialog to use MultiCheck
2017-12-15 12:17:24 +05:30
Nabin Hait
7506c49dc4 Fixed Merge conflict 2017-12-12 19:08:53 +05:30
Nabin Hait
f8936c724e bumped to version 9.2.23 2017-12-12 19:35:50 +06:00
Nabin Hait
48585dbc91 Merge branch 'master' into develop 2017-12-07 11:54:13 +05:30
Nabin Hait
7909f9a08c bumped to version 9.2.22 2017-12-07 12:24:13 +06:00
Nabin Hait
b7acbcdeb2 Merge branch 'master' into develop 2017-12-06 14:16:03 +05:30
Nabin Hait
83a08130ab bumped to version 9.2.21 2017-12-06 14:46:03 +06:00
Saurabh
930ea958bc Merge branch 'master' into develop 2017-12-01 16:19:17 +05:30
Saurabh
42ac72a995 bumped to version 9.2.20 2017-12-01 16:49:16 +06:00
Saurabh
cd8da87907 Merge branch 'master' into develop 2017-11-30 16:40:45 +05:30
Saurabh
a9801ba8e3 bumped to version 9.2.19 2017-11-30 17:10:44 +06:00
Saurabh
c042980765 Merge branch 'master' into develop 2017-11-29 11:14:05 +05:30
Saurabh
e8d965452e bumped to version 9.2.18 2017-11-29 11:44:04 +06:00
Saurabh
91a87da6fb Merge branch 'master' into develop 2017-11-28 11:04:57 +05:30
Saurabh
866e0a3b42 bumped to version 9.2.17 2017-11-28 11:34:57 +06:00
Saurabh
20fff6e874 Merge branch 'master' into develop 2017-11-22 18:02:53 +05:30
Saurabh
5cd220dd0a bumped to version 9.2.16 2017-11-22 18:32:53 +06:00
Saurabh
4bd0fb2638 Merge branch 'master' into develop 2017-11-17 14:00:08 +05:30
Saurabh
f91a0c57ce bumped to version 9.2.15 2017-11-17 14:30:07 +06:00
Nabin Hait
347df7942a Merge branch 'master' into develop 2017-11-15 14:07:44 +05:30
Nabin Hait
36027ad6c6 bumped to version 9.2.14 2017-11-15 14:37:43 +06:00
Nabin Hait
8e9304041d Merge branch 'master' into develop 2017-11-14 14:15:37 +05:30
Nabin Hait
5363b9ab29 bumped to version 9.2.13 2017-11-14 14:45:37 +06:00
Nabin Hait
4b5893509a Fixed Merge Conflict 2017-11-14 13:56:42 +05:30
Nabin Hait
cf12fff0b8 bumped to version 9.2.12 2017-11-14 14:21:36 +06:00
Rushabh Mehta
b1c3c070ee [fix] #4465 2017-11-13 17:33:01 +05:30
Nabin Hait
a3c6497f00 Merge branch 'master' into develop 2017-11-13 15:09:07 +05:30
Nabin Hait
2e1b2d2dad bumped to version 9.2.11 2017-11-13 15:39:06 +06:00
Saurabh
9615619710 [fix] merge-conflicts 2017-11-10 13:12:09 +05:30
Saurabh
84cfd7c682 bumped to version 9.2.10 2017-11-10 13:39:42 +06:00
Saurabh
d1db1ec5ab Merge branch 'master' into develop 2017-11-08 15:10:28 +05:30
Saurabh
46e0566a56 bumped to version 9.2.9 2017-11-08 15:40:28 +06:00
Saurabh
ea2442c402 Merge branch 'master' into develop 2017-11-08 12:08:34 +05:30
Saurabh
7150c7b997 bumped to version 9.2.8 2017-11-08 12:38:34 +06:00
Saurabh
8f07515b45 Merge branch 'master' into develop 2017-11-08 12:03:43 +05:30
Saurabh
8ef42b4ed6 bumped to version 9.2.7 2017-11-08 12:33:43 +06:00
ci2014
254043171e Add no_letterhead to form_dict (#4444)
no_letterhead in form_dict was missing
2017-11-08 11:37:56 +05:30
Saurabh
9a6424bfdb Merge branch 'master' into develop 2017-11-03 17:01:07 +05:30
Saurabh
e8efebf1c4 bumped to version 9.2.6 2017-11-03 17:31:07 +06:00
Saurabh
8c350f8578 Merge branch 'master' into develop 2017-11-03 11:52:59 +05:30