 Vishwas Babu A J
|
03a5bb57ce
|
Merge pull request #1312 from pramodn02/develop
MIFOSX-1884 : corrected test cases
|
2015-03-23 14:55:55 +05:30 |
|
|
Vishwas Babu A J
|
d91c6a0b64
|
Merge pull request #1309 from pramodn02/develop
MIFOSX-1884 : corrected principal moratorium
|
2015-03-20 19:16:08 +05:30 |
|
|
Vishwas Babu A J
|
259a9c43c4
|
Merge branch 'develop' of github.com:openMF/mifosx into develop
|
2015-03-20 10:13:56 +05:30 |
|
|
Vishwas Babu A J
|
ef43bbc5b1
|
fixing compilation issues
|
2015-03-19 21:58:59 +05:30 |
|
|
Vishwas Babu A J
|
1a50bd0d47
|
Merge pull request #1308 from venkatconflux/MIFOSX-1911
MIFOSX-1911:Deposit Account On Hold Transactions
|
2015-03-19 21:30:30 +05:30 |
|
|
Vishwas Babu A J
|
a6e764279b
|
MIFOSX-1914
|
2015-03-19 21:24:58 +05:30 |
|
|
Vishwas Babu A J
|
c5e4f22826
|
Merge pull request #1296 from terencemo/release-script
Release script to set version and releasedate
|
2015-03-19 17:09:56 +05:30 |
|
|
Vishwas Babu A J
|
94dff21a97
|
Merge pull request #1297 from chandrikamohith/1808
MIFOSX-1808 Group hierarchy updation issue corrected.Center summary is n...
|
2015-03-19 15:46:12 +05:30 |
|
|
Vishwas Babu A J
|
c8391d119f
|
Merge pull request #1303 from pramodn02/develop
overdue charge lock issue fix
|
2015-03-19 13:46:31 +05:30 |
|
|
Vishwas Babu A J
|
44e08dd2e6
|
Update Contributing.md
|
2015-03-19 11:52:27 +05:30 |
|
|
Vishwas Babu A J
|
9f92e5cb7e
|
Update Contributing.md
|
2015-03-19 11:52:04 +05:30 |
|
|
Vishwas Babu A J
|
4c5d194766
|
Merge pull request #1299 from pramodn02/develop
schedule correction for payments after maturity date
|
2015-03-18 17:25:13 +05:30 |
|
|
Vishwas Babu A J
|
7fcdb77f36
|
git push origin develop
|
2015-03-16 02:26:49 +05:30 |
|
|
Vishwas Babu A J
|
19021dd18b
|
Merge pull request #1289 from pramodn02/develop
interest recalculation performance issue fixes
|
2015-03-09 00:11:25 +05:30 |
|
|
Vishwas Babu A J
|
eaa32e9465
|
sorting out concurrency issues with loans -1
|
2015-03-05 20:32:38 +05:30 |
|
|
Vishwas Babu A J
|
221cb1c17d
|
fixing more failing test cases
|
2015-03-04 23:39:03 +05:30 |
|
|
Vishwas Babu A J
|
d00f793f99
|
Merge branch 'develop' of github.com:openMF/mifosx into develop
|
2015-03-04 23:30:14 +05:30 |
|
|
Vishwas Babu A J
|
942eca1243
|
fix for MifosX-1859
|
2015-03-04 23:29:23 +05:30 |
|
|
Vishwas Babu A J
|
d393812cfe
|
Merge pull request #1272 from chandrikamohith/MIFOSX-1864
MIFOSX-1864 Able to delete/add mapping fees and penalties during Edit
|
2015-03-04 23:14:52 +05:30 |
|
|
Vishwas Babu A J
|
5262bb6478
|
Merge pull request #1287 from MithunKashyap/MIFOSX-1737_New
MIFOSX-1737 : Bug fix for center staff assignment history
|
2015-03-04 23:11:57 +05:30 |
|
|
Vishwas Babu A J
|
12746ebc0f
|
Merge branch 'develop' of github.com:openMF/mifosx into develop
|
2015-03-04 22:44:14 +05:30 |
|
|
Vishwas Babu A J
|
a16265eb92
|
fix failing test cases
|
2015-03-04 22:41:44 +05:30 |
|
|
Vishwas Babu A J
|
3d7ef79d3d
|
Merge pull request #1286 from sachinkulkarni12/accountmapping
Financial Account Mapping Changes Updated.
|
2015-03-04 21:22:58 +05:30 |
|
|
Vishwas Babu A J
|
d9ce1745da
|
buping sql patch number
|
2015-03-03 20:07:17 +05:30 |
|
|
Vishwas Babu A J
|
95acad7cf4
|
Merge branch 'latest' of git://github.com/pramodn02/mifosx into develop
|
2015-03-03 20:06:35 +05:30 |
|
|
Vishwas Babu A J
|
ab4e97821c
|
fixing issue with patch number 244
|
2015-03-03 19:14:09 +05:30 |
|
|
Vishwas Babu A J
|
0c75d323eb
|
Merge pull request #1283 from karan173/MIFOSX-1847-datatable-delete-fix
MIFOSX-1847. Deleting non empty Datatables now causes an exception
|
2015-03-03 18:07:53 +05:30 |
|
|
Vishwas Babu A J
|
d47070a5c2
|
Merge pull request #1284 from MithunKashyap/MIFOSX-1737_New
MIFOSX-1737: Center Staff Assignment History
|
2015-03-03 18:04:15 +05:30 |
|
|
Vishwas Babu A J
|
e5ccac0ca2
|
fixing test case failures due to work on tranche loans improvement
|
2015-03-03 17:36:08 +05:30 |
|
|
Vishwas Babu A J
|
445a98d225
|
deleting duplicate sql patches and bumping patch numbers
|
2015-03-03 08:50:54 +05:30 |
|
|
Vishwas Babu A J
|
05fdf84981
|
Merge branch 'chandrikamohith-TrancheDisbursal' into develop
|
2015-03-03 08:43:26 +05:30 |
|
|
Vishwas Babu A J
|
495126b754
|
Merge branch 'TrancheDisbursal' of git://github.com/chandrikamohith/mifosx into chandrikamohith-TrancheDisbursal
|
2015-03-03 08:43:14 +05:30 |
|
|
Vishwas Babu A J
|
0adc4fae19
|
Merge pull request #1280 from MithunKashyap/New_MIFOSX-1828
Mifosx 1828: Entity to entity mapping feature
|
2015-03-02 07:06:52 +05:30 |
|
|
Vishwas Babu A J
|
98e9c3d084
|
fixing failing test case
|
2015-03-02 07:00:31 +05:30 |
|
|
Vishwas Babu A J
|
7ba9a81e53
|
Merge pull request #1271 from emmanuelnnaa/MIFOSX-1878
commit for MIFOSX-1878 (Savings account timeline does not include the data of the user that activated the account)
|
2015-02-11 16:06:33 +05:30 |
|
|
Vishwas Babu A J
|
1e4b4911e0
|
Merge pull request #1268 from bharathc27/test1
guaranterdomainserviceissue
|
2015-02-10 02:37:49 -08:00 |
|
|
Vishwas Babu A J
|
8b2843cabd
|
Merge pull request #1264 from chandrikamohith/MIFOSX-1860
MIFOSX-1860 Second tranche loan can be disbursed if disbursed on date is...
|
2015-02-04 09:39:04 -08:00 |
|
|
Vishwas Babu A J
|
7d887a4e0a
|
Merge pull request #1267 from bharathc27/test1
MIFOSX-1464: fixed testcases of loanintegration which was assigned by vi...
|
2015-02-04 09:38:24 -08:00 |
|
|
Vishwas Babu A J
|
c4a21a8f87
|
Merge pull request #1265 from chandrikamohith/roundOff
MIFOSX-1464 spelling mistakes corrected
|
2015-02-03 05:13:58 -08:00 |
|
|
Vishwas Babu A J
|
88edeb8ee3
|
changing sql patch number for fixed emi changes
|
2015-02-03 00:42:58 -08:00 |
|
|
Vishwas Babu A J
|
13e3c0c605
|
Merge branch 'TestCases' of git://github.com/bharathc27/mifosx into bharathc27-TestCases
Conflicts:
api-docs/apiLive.htm
mifosng-provider/src/main/java/org/mifosplatform/portfolio/loanaccount/data/LoanAccountData.java
mifosng-provider/src/main/java/org/mifosplatform/portfolio/loanaccount/domain/Loan.java
mifosng-provider/src/main/java/org/mifosplatform/portfolio/loanaccount/loanschedule/domain/LoanApplicationTerms.java
mifosng-provider/src/main/java/org/mifosplatform/portfolio/loanaccount/loanschedule/service/LoanScheduleAssembler.java
mifosng-provider/src/main/java/org/mifosplatform/portfolio/loanproduct/LoanProductConstants.java
mifosng-provider/src/main/java/org/mifosplatform/portfolio/loanproduct/data/LoanProductData.java
mifosng-provider/src/main/java/org/mifosplatform/portfolio/loanproduct/domain/LoanProduct.java
mifosng-provider/src/main/java/org/mifosplatform/portfolio/loanproduct/serialization/LoanProductDataValidator.java
mifosng-provider/src/main/java/org/mifosplatform/portfolio/loanproduct/service/LoanProductReadPlatformServiceImpl.java
|
2015-02-03 00:05:00 -08:00 |
|
|
Vishwas Babu A J
|
b4c354b224
|
Merge branch 'MIFOSX-1613' of git://github.com/pramodn02/mifosx into pramodn02-MIFOSX-1613
Conflicts:
api-docs/apiLive.htm
mifosng-provider/src/main/java/org/mifosplatform/portfolio/loanproduct/data/LoanProductData.java
mifosng-provider/src/main/java/org/mifosplatform/portfolio/loanproduct/domain/LoanProduct.java
mifosng-provider/src/main/java/org/mifosplatform/portfolio/loanproduct/serialization/LoanProductDataValidator.java
mifosng-provider/src/main/java/org/mifosplatform/portfolio/loanproduct/service/LoanProductReadPlatformServiceImpl.java
|
2015-01-29 19:24:43 -08:00 |
|
|
Vishwas Babu A J
|
3f6d90e7d4
|
updating sql patch number
|
2015-01-28 15:33:29 -08:00 |
|
|
Vishwas Babu A J
|
b490a42dcf
|
Merge branch 'MIFOSX-1846' of git://github.com/MithunKashyap/mifosx into MithunKashyap-MIFOSX-1846
|
2015-01-28 15:32:44 -08:00 |
|
|
Vishwas Babu A J
|
371d38e1c9
|
bumping up sql patch number
|
2015-01-28 15:27:24 -08:00 |
|
|
Vishwas Babu A J
|
f3c306ffbb
|
Merge branch 'displayNameFix' of git://github.com/MegaAlex/mifosx into MegaAlex-displayNameFix
|
2015-01-28 15:24:42 -08:00 |
|
|
Vishwas Babu A J
|
1d66c3e897
|
Merge pull request #1257 from AJLiu/develop
Fixed Failing Test Case
|
2015-01-20 22:09:58 -08:00 |
|
|
Vishwas Babu A J
|
19e6c28b5f
|
Merge pull request #1255 from pramodn02/MIFOSX-1844
MIFOSX-1844 : added config to manage last transaction
|
2015-01-20 19:23:11 -08:00 |
|
|
Vishwas Babu A J
|
2ec7d2eb22
|
Merge pull request #1256 from sangameshn/patch-1
Update INSTALL.md
|
2015-01-20 05:10:20 -08:00 |
|
|
Vishwas Babu A J
|
69d1edff32
|
Merge pull request #1251 from pramodn02/MIFOSX-1742
MIFOSX-1742 : added collection sheet for individuals
|
2015-01-16 01:56:16 -08:00 |
|
|
Vishwas Babu A J
|
ea51f9fceb
|
Merge pull request #1252 from pramodn02/MIFOSX-1481
MIFOSX-1481 : changed the validation to allow writeoff on last repayment...
|
2015-01-16 01:52:06 -08:00 |
|
|
Vishwas Babu A J
|
bc38cf4ff9
|
build failing on jenkins
|
2015-01-14 10:13:07 -08:00 |
|
|
Vishwas Babu A J
|
20f292d329
|
MIFOSX-1841
|
2015-01-14 09:29:42 -08:00 |
|
|
Vishwas Babu A J
|
bd689bc008
|
MIFOSX-1838
|
2015-01-13 15:41:26 -08:00 |
|
|
Vishwas Babu A J
|
bdbd1a85ed
|
Merge pull request #1248 from chandrikamohith/MIFOSX-1776
MIFOSX-1776 Sync repayment dates with meeting dates for group loan
|
2015-01-13 11:14:33 -08:00 |
|
|
Vishwas Babu A J
|
19c7ef1f32
|
Merge pull request #1249 from MegaAlex/licenseFix
Add license headers
|
2015-01-13 11:13:56 -08:00 |
|
|
Vishwas Babu A J
|
f9d4af7d2f
|
bump version number
|
2015-01-13 11:11:09 -08:00 |
|
|
Vishwas Babu A J
|
593ba64eac
|
Merge branch 'MIFOSX-1786' of git://github.com/binaryking/mifosx into binaryking-MIFOSX-1786
|
2015-01-13 11:10:16 -08:00 |
|
|
Vishwas Babu A J
|
fe9b3437d4
|
Merge branch 'openingbalances' of git://github.com/binnygopinath/mifosx into binnygopinath-openingbalances
Conflicts:
mifosng-provider/src/main/java/org/mifosplatform/accounting/journalentry/service/JournalEntryWritePlatformServiceJpaRepositoryImpl.java
|
2015-01-08 06:32:58 -08:00 |
|
|
Vishwas Babu A J
|
e979bdf6b7
|
resolving version number conflict with sql patch
|
2015-01-07 22:57:28 -08:00 |
|
|
Vishwas Babu A J
|
7d059acd83
|
Merge branch 'MIFOSX-1809' of git://github.com/chandrikamohith/mifosx into chandrikamohith-MIFOSX-1809
|
2015-01-07 22:56:28 -08:00 |
|
|
Vishwas Babu A J
|
0acf7c1498
|
Merge pull request #1237 from chandrikamohith/MIFOSX-1776
MIFOSX-1776 Sync repayment dates with meeting dates for Group Loan appli...
|
2015-01-07 22:50:45 -08:00 |
|
|
Vishwas Babu A J
|
653c534514
|
Merge pull request #1234 from satish-conflux/MIFOSX-1817
MIFOSX-1870 : Added Currency Type
|
2015-01-07 21:39:05 -08:00 |
|
|
Vishwas Babu A J
|
cfcc2654d4
|
Merge pull request #1238 from MithunKashyap/MIFOSX-1823
MIFOSX-1823: Report file and upgrade script for Savings Transaction Receipt
|
2015-01-07 21:29:25 -08:00 |
|
|
Vishwas Babu A J
|
d0bb7c7ae3
|
failing test cases fix
|
2015-01-07 17:51:32 -08:00 |
|
|
Vishwas Babu A J
|
f46875fcb7
|
fix compilatin issues
|
2015-01-04 21:30:27 -08:00 |
|
|
Vishwas Babu A J
|
6f16786aa8
|
updating migration script v_230 as a aworkaround for a flyway bug
|
2014-12-28 07:42:48 -08:00 |
|
|
Vishwas Babu A J
|
8e52dd2a1e
|
Merge pull request #1219 from satish-conflux/MIFOSX-1670-1
Role Functionality with test cases
|
2014-12-28 05:36:19 -08:00 |
|
|
Vishwas Babu A J
|
a19d345d88
|
release number bumped up for 1.26 release
|
2014-12-23 09:26:02 -08:00 |
|
|
Vishwas Babu A J
|
dc979da263
|
schema update was missed out for 1.26 release
|
2014-12-23 09:18:52 -08:00 |
|
|
Vishwas Babu A J
|
6f0d24ee98
|
Update CHANGELOG.md
|
2014-12-23 08:44:48 -08:00 |
|
|
Vishwas Babu A J
|
fe0438a2ac
|
Update CHANGELOG.md
fixing typos
|
2014-12-22 01:12:31 -08:00 |
|
|
Vishwas Babu A J
|
26c8ce6cbe
|
Update CHANGELOG.md
for 1.26 release
|
2014-12-22 01:09:57 -08:00 |
|
|
Vishwas Babu A J
|
da79d20049
|
Update CHANGELOG.md
for 1.26 release
|
2014-12-22 01:07:50 -08:00 |
|
|
Vishwas Babu A J
|
827e6bdbfb
|
Merge pull request #1211 from openMF/revert-1210-develop
Revert "update V197__updated_loan_running_balance_of_transactions.sql wi...
|
2014-12-19 04:28:59 -08:00 |
|
|
Vishwas Babu A J
|
38ffaba65b
|
Revert "update V197__updated_loan_running_balance_of_transactions.sql with a stored procedure"
|
2014-12-19 04:28:47 -08:00 |
|
|
Vishwas Babu A J
|
b783bc5fad
|
Merge pull request #1210 from sughosh88/develop
update V197__updated_loan_running_balance_of_transactions.sql with a stored procedure
|
2014-12-19 01:14:04 -08:00 |
|
|
Vishwas Babu A J
|
436bdfd538
|
Merge pull request #1209 from MegaAlex/MIFOSX-1739
MIFOSX-1739 Add option to show only active loan products
|
2014-12-18 19:05:10 -08:00 |
|
|
Vishwas Babu A J
|
532425626e
|
remove compilation warnings furing gradle build
|
2014-12-18 19:00:53 -08:00 |
|
|
Vishwas Babu A J
|
a665beb1b7
|
bump sql patch
|
2014-12-18 18:51:29 -08:00 |
|
|
Vishwas Babu A J
|
7acc549a01
|
Merge branch 'cash_mgmt_revised' of git://github.com/binnygopinath/mifosx into binnygopinath-cash_mgmt_revised
|
2014-12-18 18:46:22 -08:00 |
|
|
Vishwas Babu A J
|
19b2ce6def
|
Merge pull request #1208 from chandrikamohith/MIFOSX-1768
MIFOSX-1768 Corrected Spelling error
|
2014-12-18 14:28:53 -08:00 |
|
|
Vishwas Babu A J
|
f72a5efb52
|
Merge pull request #1198 from pramodn02/MIFOSX-1744
MIFOSX-1744 : added portion of recovery incase guarantee is more than 100%
|
2014-12-17 17:34:22 -08:00 |
|
|
Vishwas Babu A J
|
c4068df9f4
|
Merge pull request #1206 from chandrikamohith/MIFOSX-1766
MIFOSX-1766 Table entry is now being made for savingsOfficer in assignme...
|
2014-12-17 17:23:15 -08:00 |
|
|
Vishwas Babu A J
|
2cef6cfd9a
|
Merge pull request #1204 from binaryking/develop
Add missing license headers to fix TravisCI build
|
2014-12-17 07:35:54 -08:00 |
|
|
Vishwas Babu A J
|
73d0017540
|
Merge pull request #1203 from chandrikamohith/TestCase-fix
MIFOSX-1662 fix for integration test ClientTest and removing warnings
|
2014-12-17 07:16:23 -08:00 |
|
|
Vishwas Babu A J
|
90ac626fc1
|
Merge pull request #1200 from pramodn02/MIFOSX-1760
MIFOSX-1760 : corrected start date calculation for approval
|
2014-12-17 06:42:43 -08:00 |
|
|
Vishwas Babu A J
|
d8ed1b685f
|
Merge pull request #1199 from Nayan/MIFOSX-1680
#MIFOSX-1680 Allow to modifiy frequncy and intervals if calendar is NOT synced with any active entity
|
2014-12-17 06:34:16 -08:00 |
|
|
Vishwas Babu A J
|
18dba2fe2c
|
bumping up sql patch number
|
2014-12-16 20:45:08 -08:00 |
|
|
Vishwas Babu A J
|
dac4c63632
|
Merge pull request #1169 from binnygopinath/branch_specific_products_and_charges
Branch Specific Products and Charges - initial commit
|
2014-12-16 18:33:14 -08:00 |
|
|
Vishwas Babu A J
|
299b52ca45
|
Merge branch 'develop' of git://github.com/michaeldk-miagstan/mifosx into michaeldk-miagstan-develop
Conflicts:
mifosng-provider/src/integrationTest/java/org/mifosplatform/integrationtests/common/loans/LoanTransactionHelper.java
mifosng-provider/src/main/java/org/mifosplatform/commands/service/SynchronousCommandProcessingService.java
mifosng-provider/src/main/java/org/mifosplatform/portfolio/account/service/PortfolioAccountReadPlatformService.java
mifosng-provider/src/main/java/org/mifosplatform/portfolio/loanaccount/data/LoanAccountData.java
mifosng-provider/src/main/java/org/mifosplatform/portfolio/loanaccount/domain/Loan.java
mifosng-provider/src/main/java/org/mifosplatform/portfolio/loanaccount/domain/LoanAccountDomainServiceJpa.java
mifosng-provider/src/main/java/org/mifosplatform/portfolio/loanaccount/service/LoanReadPlatformService.java
mifosng-provider/src/main/java/org/mifosplatform/portfolio/loanaccount/service/LoanWritePlatformService.java
|
2014-12-16 18:29:31 -08:00 |
|
|
Vishwas Babu A J
|
0b9b2bb6f6
|
Merge pull request #1194 from MegaAlex/MIFOSX-1747
MIFOSX-1747 Don't register the basic auth filter before Spring's filter ...
|
2014-12-16 11:46:53 -08:00 |
|
|
Vishwas Babu A J
|
66cce837b5
|
Merge pull request #1193 from chandrikamohith/1662
MIFOSX-1662 Corrected Code Names for Reject and Withdraw.
|
2014-12-16 10:42:51 -08:00 |
|
|
Vishwas Babu A J
|
f98edc8781
|
Merge pull request #1191 from chandrikamohith/TestCase
MIFOSX-1717,MIFOSX-1662 Test case for account number preferences and Cod...
|
2014-12-15 18:31:29 -08:00 |
|
|
Vishwas Babu A J
|
a9850c50da
|
removing merge conflicts introduced in https://github.com/openMF/mifosx/pull/1174
|
2014-12-14 23:36:10 -08:00 |
|
|
Vishwas Babu A J
|
9e6f8a8e40
|
Merge pull request #1174 from MithunKashyap/MIFOSX-1663_New
Mifos-1663:added more flexibilty for center/group meeting reschedule
|
2014-12-14 23:26:53 -08:00 |
|
|
Vishwas Babu A J
|
c94a59c66f
|
formatting test cases
|
2014-12-13 09:38:43 -08:00 |
|
|
Vishwas Babu A J
|
5d5d79d46c
|
Merge branch 'chandrikamohith-TestCase' into develop
|
2014-12-13 09:32:23 -08:00 |
|
|
Vishwas Babu A J
|
6e07b83075
|
Merge pull request #1181 from Nagaraj12/clientReject
MIFOSX-1662:Adding new statuses to Client lifecyle
|
2014-12-11 11:01:54 -08:00 |
|
|
Vishwas Babu A J
|
a72ad7eef3
|
ignore failing test case
|
2014-12-11 08:07:30 -08:00 |
|