CBSNexora/cbsnexora-backend
4
0
Fork 0
Code Issues Pull Requests Actions 28 Packages Projects Releases Wiki Activity
3,574 Commits 19 Branches 0 Tags
f72a5efb526ff54db89f7f2841c0a2f28059715a
Commit Graph
3574 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
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
Chandrika 114dcb21c4 MIFOSX-1766 Table entry is now being made for savingsOfficer in assignment history table after Approval 2014-12-17 16:55:21 -05: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
Mohammed Nafees 7ab8a7bf8e Add missing license headers to fix TravisCI build. 2014-12-17 21:03:30 +05:30
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
Chandrika fcff48ffdc MIFOSX-1662 fix for integration test ClientTest and removing warnings 2014-12-17 10:13:36 -05: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
Pramod Nuthakki 651da79697 MIFOSX-1760 : corrected start date calculation for approval 2014-12-17 15:22:29 +05:30
Nayan 11ba1f5301 Allow to modifiy frequncy and intervals if calendar is NOT synced with any active entity 2014-12-17 15:01:19 +05:30
Pramod Nuthakki a174469d19 MIFOSX-1744 : added portion of recovery incase guarantee is more than 100% 2014-12-17 12:50:34 +05:30
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
Alex Ivanov 9160fb5f57 MIFOSX-1747 Don't register the basic auth filter before Spring's filter chain 2014-12-16 21:06:14 +02: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
Michael Vorburger 9ec0d7acd5 .travis.yml config to cache Gradle/Maven repos (~/.m2 & .gradle) 
This will lead to faster PR builds, and more importantly more reliable ones, as we should have
less bad PRs due to spurious build failures due to unreachable http://repository.pentaho.org.
With Doc + cache APT too (just as an example for later NPM builds)
 2014-12-16 19:34:33 +01:00
Chandrika 88a7ffd75a MIFOSX-1662 Corrected Code Names for Reject and Withdraw. 2014-12-16 13:31:17 -05:00
Michael Vorburger 45790c3a60 Merge pull request #1189 from MegaAlex/MIFOSX-1701 
MIFOSX-1701 Add option to display only active group members
 2014-12-16 19:18:32 +01:00
Michael Vorburger ba52924e2f Added missing license headers which made all the PRs fail on Travis. 2014-12-16 19:02:53 +01: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
Chandrika d24839267f MIFOSX-1717,MIFOSX-1662 Test case for account number preferences and Code Refactoring for Client status. 2014-12-15 18:29:30 -05:00
Alex Ivanov 312f016a56 MIFOSX-1701 Add option to display only active group members 
Complete documentation for the retrieving group call
 2014-12-15 21:59:57 +02: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
Michael Vorburger 2c511e8e28 Merge pull request #1187 from binaryking/MIFOSX-969 
MIFOSX-969 Missing API Documentation for Collection Sheets
 2014-12-13 19:01:11 +01:00
Mohammed Nafees 8192e55942 MIFOSX-969 Missing API Documentation for Collection Sheets 2014-12-13 23:14:26 +05:30
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
Chandrika 64e78540d9 MIFOSX-1717 Integration test cases for Account Number Preferences. 2014-12-12 14:56:40 -05: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
Markus Geiß c1d7f4a744 Merge pull request #1182 from varunVNnayar/develop 
Closed (y)
 2014-12-11 10:50:51 +01:00
varunVNnayar f16ae302d2 License Header Added. 2014-12-11 14:55:03 +05:30
varunVNnayar 7a2dec9987 Renaming to .java 2014-12-11 13:55:41 +05:30
varunVNnayar 632fac4d5b Test Cases for Office API. (Reformatted Code) 2014-12-11 13:49:29 +05:30
varunVNnayar fa20a9ccb3 Test cases for Office API. 2014-12-11 13:38:36 +05:30
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
varunVNnayar f9a57a53ba Test case 1 for Office creation. 2014-12-10 18:43:40 +05:30
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
Markus Geiß 9e7ce7afeb Merge pull request #1177 from varunVNnayar/develop 
closed
 2014-12-10 12:57:09 +01:00