CBSNexora/cbsnexora-backend
4
0
Fork 0
Code Issues Pull Requests Actions 10 Packages Projects Releases Wiki Activity
3,559 Commits 21 Branches 0 Tags
299b52ca45105a7138cf8acb54c3c19b262fa11a
Commit Graph
100 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
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
Vishwas Babu A J 1796310558 Merge pull request #1183 from openMF/revert-1182-develop 
Revert "Test Cases for Office API. "
 2014-12-11 06:17:09 -08:00
Vishwas Babu A J 243893240c Revert "Test Cases for Office API. " 2014-12-11 06:17:00 -08:00
Vishwas Babu A J 020c11c89a Merge pull request #1176 from AJLiu/develop 
Added missing @Test annotation and clarified method names
 2014-12-10 08:24:51 -08:00
Vishwas Babu A J 50db06a5f3 Merge pull request #1178 from binnygopinath/MIFOSX-1735 
MIFOSX-1735 - sub-status of Client to be fetched during read operations
 2014-12-10 08:22:17 -08:00
Vishwas Babu A J 0d21a6d60d MIFOSX-1738 should include unit test cases 2014-12-10 07:47:44 -08:00
Vishwas Babu A J ea53d0ca7c MIFOSX-1738 2014-12-10 06:29:06 -08:00
Vishwas Babu A J 95d74ac11b commenting out failing client test: 2014-12-10 04:42:30 -08:00
Vishwas Babu A J 81973c0da9 Merge pull request #1179 from openMF/revert-1177-develop 
Revert "Integration Test Suite for Office API."
 2014-12-10 04:39:39 -08:00
Vishwas Babu A J a3da63b760 Revert "Integration Test Suite for Office API." 2014-12-10 04:39:25 -08:00
Vishwas Babu A J 38bb259f65 updating install.md 2014-12-09 19:10:09 -08:00
Vishwas Babu A J 97ba2321ac Merge pull request #1175 from dragonkoko/patch-1 
Updating Mifos Installation Platform
 2014-12-09 19:05:59 -08:00
Vishwas Babu A J f63bd6c2cf Merge pull request #1173 from pramodn02/develop 
MIFOSX-1709 : added test cases and api documentation
 2014-12-09 02:01:47 -08:00
Vishwas Babu A J 3d399eba10 MIFOSX-1728 2014-12-08 17:50:14 -08:00
Vishwas Babu A J 7c64de0a1c renaming ambiguously named test helper methos 2014-12-08 15:23:50 -08:00
Vishwas Babu A J 3d020eb6f5 Merge pull request #1147 from chandrikamohith/MIFOSX-1639 
MIFOSX-1639 Adding field createStandingInstructionAtDisbursement in  Mod...
 2014-12-08 01:05:28 -08:00
Vishwas Babu A J af6c9e2ed6 MIFOSX-1727 2014-12-07 19:47:19 -08:00
Vishwas Babu A J 452d97cfb0 updates to MIFOSX-1700 2014-12-07 13:59:10 -08:00
Vishwas Babu A J 002ef06d51 MIFOSX-1700 2014-12-06 21:49:20 -08:00
Vishwas Babu A J 990cab63cf remove warnings 2014-12-06 10:37:39 -08:00
Vishwas Babu A J cb48a79e24 formatting savings classes 2014-12-06 10:23:22 -08:00
Vishwas Babu A J c7f3f416ad updates to CalendarInstance Repository 2014-12-05 22:30:24 -08:00
Vishwas Babu A J 9f78554972 Merge pull request #1164 from Nayan/MIFOSX-1680 
#MIFOSX-1680 Option to change center meeting frequency and intervals
 2014-12-05 22:14:50 -08:00
Vishwas Babu A J 7105d688bc sql patch for client statuses 2014-12-05 00:45:11 -08:00
Vishwas Babu A J 642b45def8 Merge pull request #1168 from binaryking/MIFOSX-1550 
MIFOSX-1550 Check for null principal amount when creating journal entry for loan write-off
 2014-12-05 00:31:50 -08:00
Vishwas Babu A J 27b8761011 cleaning up client lifecycle additions 2014-12-05 00:30:23 -08:00
Vishwas Babu A J 6515d18b73 Merge branch 'Nagaraj12-clientReject' into develop 2014-12-04 17:27:42 -08:00
Vishwas Babu A J 2212618256 fix failing integration tests due to enabling optimistic locking on loans 2014-12-04 17:26:46 -08:00
Vishwas Babu A J 8acb08c526 Merge branch 'clientReject' of git://github.com/Nagaraj12/mifosx into Nagaraj12-clientReject 2014-12-04 16:23:57 -08:00
Vishwas Babu A J 09e2d04a6e Merge pull request #1163 from pramodn02/develop 
MIFOSX-1709 : corrected condition to add and delete guarantor
 2014-12-04 08:35:43 -08:00
Vishwas Babu A J 34a9ec41c5 missing response data parameters for code values 2014-12-04 01:14:46 -08:00
Vishwas Babu A J 64c642656f enable optimistic locking for m_loan 2014-12-04 01:12:21 -08:00
Vishwas Babu A J 8298a8f86a Merge pull request #1161 from pramodn02/develop 
MIFOSX-1709 : guarantor on hold funds functionality
 2014-12-03 22:52:11 -08:00
Vishwas Babu A J f197fe572a Ignore failing test case on Jenkins 2014-12-03 21:36:46 -08:00
Vishwas Babu A J d5ce6f2c98 Merge pull request #1146 from emmanuelnnaa/MIFOSX-1671 
commit for MIFOSX-1671 (User with 'ALL_FUNCTIONS_READ' permission does not have access to /users/{userId} resource)
 2014-12-03 20:54:28 -08:00
Vishwas Babu A J 2fc3c9c7ee Merge pull request #1155 from MithunKashyap/MIFOSX-1674 
MIFOSX-1674:The description field added to m_code_value can be edited/en...
 2014-12-03 20:51:34 -08:00
Vishwas Babu A J 4ec1173bc3 Merge pull request #1159 from vorburger/MariaDB4jUpgrade 
Upgraded MariaDB4j from v2.1.0 to v2.1.1
 2014-12-03 20:47:29 -08:00
Vishwas Babu A J 4f67c8bf7f Merge pull request #1160 from vorburger/ReactivateMariaD4jSpringBootServerLoginTest 
Un-@Igore SpringBootServerLoginTest
 2014-12-03 20:47:11 -08:00
Vishwas Babu A J 8ef61f3275 MIFOSX-1704 2014-12-03 12:31:59 -08:00
Vishwas Babu A J 4c6ea532e9 Merge pull request #1157 from binaryking/MIFOSX-1533 
MIFOSX-1533: Fix advanced search exception
 2014-12-03 09:29:40 -08:00
Vishwas Babu A J 466a691e56 Merge pull request #1154 from MegaAlex/bug/MIFOSX-1575 
MIFOSX-1575 Add optional 'comments' parameter to Journal Reverse command
 2014-12-03 08:37:00 -08:00
Vishwas Babu A J 07052f983e cath database errors related to savings withdrawals 2014-12-02 17:33:19 -08:00
Vishwas Babu A J f58fc1c116 add optimistic locking for savings account 2014-12-02 13:24:55 -08:00
Vishwas Babu A J 78b6f2a3e6 updating licences 2014-12-02 08:35:59 -08:00
Vishwas Babu A J 637f062ce3 MIFOSX-1511 custom formats for client, loan and savings account numbers 2014-12-02 08:34:08 -08:00
Vishwas Babu A J 06dfb9d732 Merge pull request #1149 from pramodn02/latest 
MIFOSX-1676 : changed AppUser to nullable in savings transactions
 2014-11-25 19:58:43 +05:30
Vishwas Babu A J f93bb4a7ba Merge pull request #1148 from pramodn02/develop 
MIFOSX-1675 : Added support to capture guarantor funding details for loan account
 2014-11-24 19:17:56 +05:30
Vishwas Babu A J cd76d1d543 fixing failing Client integration tests 2014-11-22 03:10:49 +05:30
Vishwas Babu A J 1dee8c14ee fixing failing Client integration tests 2014-11-22 02:47:53 +05:30
Vishwas Babu A J c7a6d93bc4 fixing batch job failures 2014-11-22 00:54:22 +05:30
Vishwas Babu A J 9dadb669a4 resolving compilation issue and bumping up sql patch number 2014-11-20 06:15:48 +05:30
Vishwas Babu A J ff8f116b96 Merge branch 'binnygopinath-MIFOSX-1628' into develop 2014-11-20 06:09:27 +05:30
Vishwas Babu A J 555839df31 Merge branch 'MIFOSX-1628' of git://github.com/binnygopinath/mifosx into binnygopinath-MIFOSX-1628 2014-11-20 06:09:17 +05:30
Vishwas Babu A J 66c6ddc82e Merge branch 'MithunKashyap-ClientSubStatus_MIFOSX-1642' into develop 2014-11-20 06:07:01 +05:30
Vishwas Babu A J 094c205018 Merge branch 'ClientSubStatus_MIFOSX-1642' of git://github.com/MithunKashyap/mifosx into MithunKashyap-ClientSubStatus_MIFOSX-1642 2014-11-20 06:06:20 +05:30
Vishwas Babu A J e420a56986 Merge branch 'emmanuelnnaa-MIFOSX-1638' into develop 2014-11-20 06:00:55 +05:30
Vishwas Babu A J 5a21aa6bfd Merge branch 'MIFOSX-1638' of git://github.com/emmanuelnnaa/mifosx into emmanuelnnaa-MIFOSX-1638 
Conflicts:
	mifosng-provider/src/main/java/org/mifosplatform/portfolio/loanaccount/domain/Loan.java
 2014-11-20 06:00:32 +05:30
Vishwas Babu A J 1c83f181ab Merge pull request #1140 from Musoni/MIFOSX-1655 
fixed MIFOSX-1655 issue with updating a loan with a charge
 2014-11-20 04:15:33 +05:30
Vishwas Babu A J 180c49fce9 initial work around MIFOSX-1634 2014-11-19 03:17:34 +05:30
Vishwas Babu A J 61a096f33c Merge branch 'MIFOSX-1068' of git://github.com/Nayan/mifosx into Nayan-MIFOSX-1068 
Conflicts:
	mifosng-provider/src/main/java/org/mifosplatform/portfolio/loanaccount/api/LoansApiResource.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
 2014-11-13 21:35:54 +05:30
Vishwas Babu A J 7db8147f9d bump up gurantors sql 2014-11-13 21:13:40 +05:30
Vishwas Babu A J 77e08d11c8 fixing error messages for min days between loan disbursal and repayment 2014-11-13 21:10:16 +05:30
Vishwas Babu A J 95447d21b7 Merge branch 'develop' of git://github.com/pramodn02/mifosx into pramodn02-develop 
Conflicts:
	mifosng-provider/src/main/java/org/mifosplatform/portfolio/savings/domain/SavingsAccount.java
 2014-11-13 20:25:48 +05:30
Vishwas Babu A J 10f22ab3eb Merge branch 'MIFOSX-1639' of git://github.com/emmanuelnnaa/mifosx into emmanuelnnaa-MIFOSX-1639 
Conflicts:
	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/service/LoanReadPlatformServiceImpl.java
 2014-11-13 20:20:00 +05:30
Vishwas Babu A J 1573b5a6b3 cleaning up API docs for standing instructions 2014-11-13 20:05:45 +05:30
Vishwas Babu A J c4ef820ad0 fix failing test cases 2014-11-13 19:23:04 +05:30
Vishwas Babu A J 5f5f94d5f2 updates to nth day logic 2014-11-13 17:57:41 +05:30
Vishwas Babu A J 580eec5064 updates to nth day logic 2014-11-13 17:55:01 +05:30
Vishwas Babu A J 03898052a0 Merge branch 'develop' of github.com:openMF/mifosx into develop 2014-11-13 14:56:20 +05:30
Vishwas Babu A J 7218ac354e updating api docs with detail s of newly added parameter for loan products minimumDaysBetweenDisbursalAndFirstRepayment 2014-11-13 14:55:51 +05:30
Vishwas Babu A J dc72c8c5f0 fixing test failures due to minimum days between disbursal and first repayment parameter being introduced in integration tests 2014-11-13 14:27:55 +05:30
Vishwas Babu A J b8b45620b4 Merge pull request #1136 from Nayan/MIFOSX-1650 
Fix for client activation within a group and JLG loan 500 error #MIFOSX-1650 #MIFOSX-1647
 2014-11-13 12:15:11 +05:30
Vishwas Babu A J b27e0a9581 Merge branch 'MIFOSX-1461' of git://github.com/cgninan/mifosx into cgninan-MIFOSX-1461 
Conflicts:
	mifosng-provider/src/main/java/org/mifosplatform/portfolio/loanaccount/domain/Loan.java
	mifosng-provider/src/main/java/org/mifosplatform/portfolio/loanaccount/loanschedule/domain/DefaultScheduledDateGenerator.java
	mifosng-provider/src/main/java/org/mifosplatform/portfolio/loanaccount/loanschedule/domain/ScheduledDateGenerator.java
 2014-11-11 18:53:09 +05:30
Vishwas Babu A J 99b3bf1b4d bumping up sql patch number 2014-11-06 00:00:21 +05:30
Vishwas Babu A J f1e9c2800b cleaning up MIFOSX-1584 2014-11-05 23:58:03 +05:30
Vishwas Babu A J a8c733100b Merge branch 'MIFOSX-1584' of git://github.com/Nayan/mifosx into Nayan-MIFOSX-1584 2014-11-05 18:53:31 +05:30
Vishwas Babu A J 1c49096881 updates to accounting section of api-docs 2014-11-05 18:09:46 +05:30
Vishwas Babu A J b2e9ab4a9c Merge branch 'MIFOSX-1175' of git://github.com/Musoni/mifosx into Musoni-MIFOSX-1175 
Conflicts:
	mifosng-provider/src/main/java/org/mifosplatform/portfolio/group/domain/Group.java
	mifosng-provider/src/main/java/org/mifosplatform/portfolio/group/service/GroupingTypesWritePlatformServiceJpaRepositoryImpl.java
 2014-11-05 17:33:49 +05:30
Vishwas Babu A J 16d974ded7 Update Contributing.md 2014-11-05 10:56:03 +05:30
Vishwas Babu A J c5c34138a7 cleaning up MIFOSX-1463 2014-11-04 19:05:03 +05:30
Vishwas Babu A J 2b93590c5c Merge pull request #1124 from pramodn02/develop 
changed future installments date not to use rest frequency
 2014-11-04 18:01:38 +05:30
Vishwas Babu A J 80dfd752d7 issues with latest sql patch name, removing few deprecated statement calls and other warnings 2014-11-04 16:03:21 +05:30
Vishwas Babu A J 630694c133 Merge pull request #1123 from sughosh88/ReportPermissions 
Added all reports in permission table
 2014-11-04 14:22:14 +05:30
Vishwas Babu A J 34fb6acc44 fixing null pointer exception during client creation 2014-11-04 12:18:20 +05:30
Vishwas Babu A J 702ecd480f cleaning up group validations 2014-11-03 21:09:02 +05:30
Vishwas Babu A J 7d0ac6bf29 Merge branch 'MIFOSX-1566' of git://github.com/Nayan/mifosx into Nayan-MIFOSX-1566 2014-11-03 14:13:49 +05:30
Vishwas Babu A J 642417166c moving all config files directly under config folder 2014-11-03 09:48:10 +05:30
Vishwas Babu A J 9072556925 Merge pull request #1116 from Nayan/MIFOSX-1619 
#MIFOSX-1619 Added MifosX Eclipse preferences file into source control
 2014-11-03 09:44:23 +05:30
Vishwas Babu A J 9174a9406c updating database dump 2014-11-02 19:25:01 +05:30
Vishwas Babu A J 2aa18a32da Update INSTALL.md 2014-11-02 17:03:53 +05:30
Vishwas Babu A J f05b3585e1 Update INSTALL.md 
adding emphasis
 2014-11-02 16:56:01 +05:30