Vishwas Babu A J
3416a8dc8e
Merge branch 'MIFOSX-1875' of git://github.com/Musoni/mifosx into Musoni-MIFOSX-1875
...
Conflicts:
mifosng-provider/src/main/java/org/mifosplatform/commands/domain/CommandWrapper.java
mifosng-provider/src/main/java/org/mifosplatform/commands/service/CommandWrapperBuilder.java
mifosng-provider/src/main/java/org/mifosplatform/commands/service/SynchronousCommandProcessingService.java
2015-03-27 01:14:59 +05:30
Vishwas Babu A J
cc010e5b37
cleaning up -MIFOSX-1877
2015-03-26 22:38:17 +05:30
Vishwas Babu A J
3b71c90773
Merge branch 'MIFOSX-1877' of git://github.com/Musoni/mifosx into Musoni-MIFOSX-1877
2015-03-26 21:34:15 +05:30
Vishwas Babu A J
a687c49eb1
cleaning up MIFOSX-1897
2015-03-26 18:29:56 +05:30
Vishwas Babu A J
392e94f6bf
Merge branch 'MIFOSX-1897' of git://github.com/Musoni/mifosx into Musoni-MIFOSX-1897
2015-03-26 18:06:52 +05:30
Vishwas Babu A J
1098923689
cleaning up MIFOSX-1868
2015-03-26 16:57:32 +05:30
Vishwas Babu A J
9a55b3ffa8
Merge branch 'MIFOSX-1868' of git://github.com/Musoni/mifosx into Musoni-MIFOSX-1868
2015-03-26 15:53:22 +05:30
Vishwas Babu A J
5624da89ea
Merge pull request #1316 from sachinkulkarni12/MIFOSX-1839
...
MIFOSX-1839:fix for show payment details
2015-03-23 17:51:34 +05:30
Vishwas Babu A J
0fabff864c
Merge pull request #1313 from MithunKashyap/MIFOSX-1905
...
MIFOSX-1905: Consistency w.r.t spelling principalThresholdForLastInstalment for loan products
2015-03-23 17:47:21 +05:30
Vishwas Babu A J
5227b48e23
Merge pull request #1315 from sachinkulkarni12/MIFOSX-1885_client_dissasociate
...
MIFOSX-1885:fix for client dissasociate
2015-03-23 17:28:10 +05:30
sachinkulkarni12
1db9345669
MIFOSX-1839:fix for show payment details
2015-03-23 15:47:50 +05:30
sachinkulkarni12
b8930cb831
MIFOSX-1885:fix for client dissasociate
2015-03-23 15:40:48 +05:30
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
MithunKashyap
2833318fd3
MIFOSX-1905: Consistency w.r.t spelling principalThresholdForLastInstalment for loan products
2015-03-23 13:25:55 +05:30
Pramod Nuthakki
cb1510463d
MIFOSX-1884 : corrected test cases
2015-03-23 11:25:56 +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
Pramod Nuthakki
c923cc2723
MIFOSX-1884 : corrected principal moratorium
2015-03-20 16:39:53 +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
venkatconflux
0710ef964b
MIFOSX-1911:CodeFormated
2015-03-19 21:27:45 +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
sachinkulkarni12 and Vishwas Babu A J
89377a23b4
MIFOSX-1885
...
Conflicts:
mifosng-provider/src/main/java/org/mifosplatform/portfolio/group/service/GroupingTypesWritePlatformServiceJpaRepositoryImpl.java
2015-03-19 16:57:35 +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
Pramod Nuthakki
9813e097c3
overdue charge lock issue fix
2015-03-19 13:28:06 +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
Pramod Nuthakki
0d1439afea
schedule correction for payments after maturity date
2015-03-18 10:11:00 +05:30
Michael Vorburger
48ee0c9739
Merge pull request #1291 from vorburger/MIFOSX-1758_apps_git_submodule
...
MIFOSX-1758 Make dist ZIP include community-app in apps/ via Git submodule
2015-03-17 23:31:25 +01:00
Michael Vorburger
ac75cc9ba6
MIFOSX-1758 Make the dist ZIP include the community-app in apps/ via Git submodule
...
Root build.sh, for both back-end and front-end
Added -Penv=dev to incl. MariaDBj4
Include apps/**/* in ZIP, fixed UI URL in launcher, some doc
Set submodule Git rev to one that actually exists on remote
Don't use 'git submodule update --remote' but foreach ..
build-cloudbees.sh makes npm available
Better logging, and trying dev and prod dist UI
2015-03-17 23:22:43 +01:00
Chandrika
7f95e4bf20
MIFOSX-1808 Group hierarchy updation issue corrected.Center summary is now getting updated properly.
2015-03-16 19:16:42 -04:00
Vishwas Babu A J
7fcdb77f36
git push origin develop
2015-03-16 02:26:49 +05:30
Terence Denzil Monteiro
968ddcd8de
Release script to set version and releasedate
2015-03-13 20:25:44 +04:00
Michael Vorburger
2a800bf367
Merge pull request #1295 from channagayan/licenceError
...
ConcurrencyIntegrationTest licenceIssue fixed
2015-03-13 09:04:40 +01:00
Channa Gayan
cbe6d672e8
ConcurrencyIntegrationTest licenceIssue fixed
2015-03-13 13:19:07 +05:30
andrew-dzak
a38d3d565d
MIFOSX-1897 ability to see journals entries for specific loans and savings
2015-03-12 16:04:56 +01:00
andrew-dzak
fdd84097ea
MIFOSX-1877 ability to edit working days by clients and added license text to ConcurrencyIntegrationTest file
2015-03-12 14:08:41 +01:00
Michael Vorburger
f440f294ad
Merge pull request #1226 from vorburger/MIFOSX-1756_UseAppsInsteadWebAndDocUpdate
...
MIFOSX-1756 Follow-up, switched to using (existing) /apps/ instead /web/...
2015-03-10 12:20:23 +01:00
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
Pramod Nuthakki
4e7f9031be
interest recalculation performance issue fixes
2015-03-08 15:56:10 +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