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
Satish Sajjan
9b3f56f6f6
Role Functionality with test cases
2014-12-26 17:51:36 +05:30
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
Sughosh
54a45c5e41
update V197__updated_loan_running_balance_of_transactions.sql with a stored procedure
2014-12-19 14:06:10 +05:30
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
Alex Ivanov
9d07e9ad7a
MIFOSX-1739 Add option to show only active loan products
2014-12-19 00:32:59 +02: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
Chandrika
d7b6e22344
MIFOSX-1768 Corrected Spelling error
2014-12-18 17:12:01 -05: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
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
Vishwas Babu A J