forked from openMF/community-app
-
Notifications
You must be signed in to change notification settings - Fork 0
/
tatus
13774 lines (9177 loc) · 419 KB
/
tatus
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
148
149
150
151
152
153
154
155
156
157
158
159
160
161
162
163
164
165
166
167
168
169
170
171
172
173
174
175
176
177
178
179
180
181
182
183
184
185
186
187
188
189
190
191
192
193
194
195
196
197
198
199
200
201
202
203
204
205
206
207
208
209
210
211
212
213
214
215
216
217
218
219
220
221
222
223
224
225
226
227
228
229
230
231
232
233
234
235
236
237
238
239
240
241
242
243
244
245
246
247
248
249
250
251
252
253
254
255
256
257
258
259
260
261
262
263
264
265
266
267
268
269
270
271
272
273
274
275
276
277
278
279
280
281
282
283
284
285
286
287
288
289
290
291
292
293
294
295
296
297
298
299
300
301
302
303
304
305
306
307
308
309
310
311
312
313
314
315
316
317
318
319
320
321
322
323
324
325
326
327
328
329
330
331
332
333
334
335
336
337
338
339
340
341
342
343
344
345
346
347
348
349
350
351
352
353
354
355
356
357
358
359
360
361
362
363
364
365
366
367
368
369
370
371
372
373
374
375
376
377
378
379
380
381
382
383
384
385
386
387
388
389
390
391
392
393
394
395
396
397
398
399
400
401
402
403
404
405
406
407
408
409
410
411
412
413
414
415
416
417
418
419
420
421
422
423
424
425
426
427
428
429
430
431
432
433
434
435
436
437
438
439
440
441
442
443
444
445
446
447
448
449
450
451
452
453
454
455
456
457
458
459
460
461
462
463
464
465
466
467
468
469
470
471
472
473
474
475
476
477
478
479
480
481
482
483
484
485
486
487
488
489
490
491
492
493
494
495
496
497
498
499
500
501
502
503
504
505
506
507
508
509
510
511
512
513
514
515
516
517
518
519
520
521
522
523
524
525
526
527
528
529
530
531
532
533
534
535
536
537
538
539
540
541
542
543
544
545
546
547
548
549
550
551
552
553
554
555
556
557
558
559
560
561
562
563
564
565
566
567
568
569
570
571
572
573
574
575
576
577
578
579
580
581
582
583
584
585
586
587
588
589
590
591
592
593
594
595
596
597
598
599
600
601
602
603
604
605
606
607
608
609
610
611
612
613
614
615
616
617
618
619
620
621
622
623
624
625
626
627
628
629
630
631
632
633
634
635
636
637
638
639
640
641
642
643
644
645
646
647
648
649
650
651
652
653
654
655
656
657
658
659
660
661
662
663
664
665
666
667
668
669
670
671
672
673
674
675
676
677
678
679
680
681
682
683
684
685
686
687
688
689
690
691
692
693
694
695
696
697
698
699
700
701
702
703
704
705
706
707
708
709
710
711
712
713
714
715
716
717
718
719
720
721
722
723
724
725
726
727
728
729
730
731
732
733
734
735
736
737
738
739
740
741
742
743
744
745
746
747
748
749
750
751
752
753
754
755
756
757
758
759
760
761
762
763
764
765
766
767
768
769
770
771
772
773
774
775
776
777
778
779
780
781
782
783
784
785
786
787
788
789
790
791
792
793
794
795
796
797
798
799
800
801
802
803
804
805
806
807
808
809
810
811
812
813
814
815
816
817
818
819
820
821
822
823
824
825
826
827
828
829
830
831
832
833
834
835
836
837
838
839
840
841
842
843
844
845
846
847
848
849
850
851
852
853
854
855
856
857
858
859
860
861
862
863
864
865
866
867
868
869
870
871
872
873
874
875
876
877
878
879
880
881
882
883
884
885
886
887
888
889
890
891
892
893
894
895
896
897
898
899
900
901
902
903
904
905
906
907
908
909
910
911
912
913
914
915
916
917
918
919
920
921
922
923
924
925
926
927
928
929
930
931
932
933
934
935
936
937
938
939
940
941
942
943
944
945
946
947
948
949
950
951
952
953
954
955
956
957
958
959
960
961
962
963
964
965
966
967
968
969
970
971
972
973
974
975
976
977
978
979
980
981
982
983
984
985
986
987
988
989
990
991
992
993
994
995
996
997
998
999
1000
[33mcommit 08a9224742c46d536ce73b3632f1485662f2c7c1[m
Author: venkatconflux <venkata.conflux@confluxtechnologies.com>
Date: Thu Mar 19 19:47:52 2015 +0530
MIFOSX-1911
[33mcommit 4679a7696c92dc4330b5bb7e0a4cd83978b473c0[m
Merge: 982e732 318ec5b
Author: Vishwas Babu A J <vishwas@confluxtechnologies.com>
Date: Thu Mar 19 17:15:02 2015 +0530
Merge pull request #1275 from terencemo/RemoveHardcodedVersion
Moved hardcoded version, releasedate in MainController.js to release.json
[33mcommit 982e73202294a3fe3a3bf56a849759b2e08ffa72[m
Merge: e4cf52e 0278d82
Author: Vishwas Babu A J <vishwas@confluxtechnologies.com>
Date: Mon Mar 16 01:26:36 2015 +0530
Merge pull request #1270 from sachinkulkarni12/Mifox-new
MIFOSX-1903 Enable easier view of Journal entries created by loan transactions.
[33mcommit e4cf52eb74ab29ff34eca9191dec26351fa09aea[m
Merge: c5109b3 65883e8
Author: Vishwas Babu A J <vishwas@confluxtechnologies.com>
Date: Mon Mar 16 01:24:55 2015 +0530
Merge pull request #1274 from vorburger/patch-3
README.md: Use "npm config set prefix ~"
[33mcommit c5109b3f0a70317659918f5b8e6e9df10c71bbb0[m
Merge: 9f48453 e6d822a
Author: Vishwas Babu A J <vishwas@confluxtechnologies.com>
Date: Mon Mar 16 01:19:58 2015 +0530
Merge pull request #1276 from gauravsaini03/testcase-fix
fix the travis build failure
[33mcommit 318ec5b25d7fd974d0647f759a26311040522d2e[m
Author: Terence Monteiro <terence@sanjosesolutions.in>
Date: Sat Mar 14 00:37:23 2015 +0400
Fixed MainController test for http.get().success()
[33mcommit 2ea5ffff376ec2a82342f95cf51f19e8a3f58b15[m
Author: Terence Monteiro <terence@sanjosesolutions.in>
Date: Fri Mar 13 18:58:50 2015 +0400
Using in place of jQuery to get json
[33mcommit 9f48453bf22bf1234accb326362b774c52ff79d0[m
Merge: f9d0114 56c920c
Author: Markus Geiß <mgeiss@mifos.org>
Date: Fri Mar 13 15:49:43 2015 +0400
Merge pull request #1273 from vorburger/build
closed (y)
[33mcommit ec2fb1feee06c0f4c15c84458de271cde4c1247b[m
Merge: ea19ec9 e6d822a
Author: Terence Monteiro <terence@sanjosesolutions.in>
Date: Fri Mar 13 12:47:57 2015 +0400
Merge branch 'testcase-fix' of https://github.com/gauravsaini03/community-app into RemoveHardcodedVersion
[33mcommit e6d822ab8d23e86e9b18d56e2376d0a8908f5d20[m
Author: Gaurav Saini <gauravsaini03@gmail.com>
Date: Fri Mar 13 14:11:11 2015 +0530
fix the travis build failure
[33mcommit ea19ec968803e0bbb033f3ef1abe718cf841d3c4[m
Author: Terence Monteiro <terence@sanjosesolutions.in>
Date: Fri Mar 13 12:32:39 2015 +0400
Replaced app/VERSION.txt with app/release.json
[33mcommit fab13e456f747d4b88916accdab7439a3453e609[m
Author: Terence Denzil Monteiro <terence@sanjosesolutions.in>
Date: Fri Mar 13 10:25:21 2015 +0400
Moved version from MainController.js to VERSION.txt, and pulling
[33mcommit ee2af3228f243f9991361ba5a4adb873452f18a6[m
Merge: 56c920c d8b2ae6
Author: Terence Denzil Monteiro <terence@sanjosesolutions.in>
Date: Fri Mar 13 09:57:15 2015 +0400
Merge branch 'IndexVersionDynamicInsteadOfHardcoded' of https://github.com/vorburger/community-app into HEAD
[33mcommit 65883e8e00e565a937928263939aa06ee33c8dfe[m
Author: Michael Vorburger <mike@vorburger.ch>
Date: Thu Mar 12 16:21:05 2015 +0100
README.md: Use "npm config set prefix ~", see http://stackoverflow.com/questions/19352976/npm-modules-wont-install-globally-without-sudo
[33mcommit 56c920c45ba3fd186a76fe5a6ae119ad8c80ea85[m
Author: Michael Vorburger <mike@vorburger.ch>
Date: Thu Mar 12 16:13:10 2015 +0100
build.sh how-to doc
[33mcommit 7ded7cb90bbf6ac8db4b82b34355015a00d21a3d[m
Author: Michael Vorburger <mike@vorburger.ch>
Date: Thu Mar 12 15:51:13 2015 +0100
build.sh
[33mcommit d8b2ae6bd5d5783849ac9680db213772a025f940[m
Author: Michael Vorburger <mike@vorburger.ch>
Date: Thu Mar 12 15:40:45 2015 +0100
Version should dynamic as {{ version }} instead of hard-coded in index.html
[33mcommit 0278d82b1868ba9d4295978329758508bf2d7fce[m
Author: sachinkulkarni12 <sachin.kulkarni@confluxtechnologies.com>
Date: Mon Mar 9 14:17:44 2015 +0530
MIFOSX-1903
[33mcommit f9d01149369eaa962022c0a9f986659877b444a4[m
Merge: ac2a9d3 b057b09
Author: Vishwas Babu A J <vishwas@confluxtechnologies.com>
Date: Sat Mar 7 22:09:23 2015 +0530
Merge branch 'Mifos_tasks_wubwub' of git://github.com/Muciojad/community-app into Muciojad-Mifos_tasks_wubwub
Conflicts:
app/scripts/controllers/organization/ViewRoleController.js
app/views/administration/viewrole.html
[33mcommit ac2a9d389743dae8403526e21c0df3ffa0f8d3bd[m
Merge: db0f93a 7bfaaf1
Author: Vishwas Babu A J <vishwas@confluxtechnologies.com>
Date: Sat Mar 7 20:12:43 2015 +0530
Merge pull request #1219 from chandrikamohith/MIFOSX-1822
MIFOSX-1822 Parent field is displaying properly now in Add Sub ledger ac...
[33mcommit db0f93a4f43ba87c635a67f410f63afe88f737e0[m
Author: Vishwas Babu A J <vishwas@confluxtechnologies.com>
Date: Sat Mar 7 19:43:59 2015 +0530
resolving merge conflicts
[33mcommit 03bac6cc36660c7819dadd981092c5ffa33c92f7[m
Merge: 7785a4e 81ce82d
Author: Vishwas Babu A J <vishwas@confluxtechnologies.com>
Date: Fri Mar 6 20:32:20 2015 +0530
Merge branch 'develop' of git://github.com/Muciojad/community-app into Muciojad-develop
Conflicts:
app/scripts/controllers/accounting/AccCoaController.js
app/styles/app.css
app/views/accounting/accounting_coa.html
[33mcommit 7785a4eadb53fab4e75f24a950395b1b0f1307ca[m
Merge: b83eb27 3b55637
Author: Vishwas Babu A J <vishwas@confluxtechnologies.com>
Date: Fri Mar 6 20:07:20 2015 +0530
Merge branch 'MIFOSX-1778' of git://github.com/MegaAlex/community-app into MegaAlex-MIFOSX-1778
Conflicts:
app/global-translations/locale-en.json
[33mcommit b83eb27115bc66b407399aeefbd21b2b44b36bd9[m
Merge: 86def2b ee2a8b4
Author: Vishwas Babu A J <vishwas@confluxtechnologies.com>
Date: Fri Mar 6 19:55:57 2015 +0530
Merge pull request #1226 from MegaAlex/MIFOSX-1777
MIFOSX-1777 Add tooltips to fixed/recurring deposit product fields
[33mcommit 86def2b50931fa6705ac910b46f45002befe96fe[m
Merge: 80c43a4 b93b98f
Author: Vishwas Babu A J <vishwas@confluxtechnologies.com>
Date: Fri Mar 6 17:59:53 2015 +0530
Merge branch 'mifosx-1780' of git://github.com/Muciojad/community-app into Muciojad-mifosx-1780
Conflicts:
app/global-translations/locale-en.json
app/views/products/createloanproduct.html
[33mcommit 80c43a4529215f259ba607dac65cec06eb32ddd3[m
Merge: 6b40b0e ec41d3a
Author: Vishwas Babu A J <vishwas@confluxtechnologies.com>
Date: Fri Mar 6 17:03:39 2015 +0530
Merge branch 'mifosx-1779' of git://github.com/Muciojad/community-app into Muciojad-mifosx-1779
Conflicts:
app/global-translations/locale-en.json
[33mcommit 6b40b0e01189054acd210037c97bc3199e56d073[m
Merge: 38c8628 96510f1
Author: Vishwas Babu A J <vishwas@confluxtechnologies.com>
Date: Fri Mar 6 16:56:39 2015 +0530
Merge branch 'backup_branch' of git://github.com/Muciojad/community-app into Muciojad-backup_branch
Conflicts:
app/global-translations/locale-en.json
[33mcommit 38c86281b1b06e72ce0dadd508b9f37c6d0c43b0[m
Author: Vishwas Babu A J <vishwas@confluxtechnologies.com>
Date: Thu Mar 5 23:47:07 2015 +0530
resolving merge conflicts
[33mcommit d8cbf7d0c1afa9e91137587c94924808455ee959[m
Merge: 61a1f89 1113a31
Author: Vishwas Babu A J <vishwas@confluxtechnologies.com>
Date: Wed Mar 4 21:45:35 2015 +0530
Merge pull request #1267 from sachinkulkarni12/accountmapping
Finance Account Mapping Changes Updated
[33mcommit 61a1f896a4c2d64dffb18842a0aed1c52b03bcaa[m
Author: Vishwas Babu A J <vishwas@confluxtechnologies.com>
Date: Wed Mar 4 20:53:58 2015 +0530
merge conflicts resolved
[33mcommit 90960eca60e0edd968f9d8023a9771982a264113[m
Author: Vishwas Babu A J <vishwas@confluxtechnologies.com>
Date: Wed Mar 4 20:28:19 2015 +0530
MIFOSX-1464
[33mcommit 25aa03810f3671ea438e054188f1af7bbf5b8814[m
Author: Vishwas Babu A J <vishwas@confluxtechnologies.com>
Date: Wed Mar 4 15:43:59 2015 +0530
resolving merge conflicts
[33mcommit 38725f6ef131045550d4861e73ca64af838093c7[m
Author: Vishwas Babu A J <vishwas@confluxtechnologies.com>
Date: Wed Mar 4 13:31:06 2015 +0530
resolving merge conflicts
[33mcommit 1113a315976191a73b94412aad6b0cb3d4d60e99[m
Author: sachinkulkarni12 <sachin.kulkarni@confluxtechnologies.com>
Date: Wed Mar 4 11:40:45 2015 +0530
Finance Account Mapping Changes Updated
[33mcommit 3328e76b070c75662f2590336b6a934c3c958efa[m
Merge: fd99e31 1754f6c
Author: Vishwas Babu A J <vishwas@confluxtechnologies.com>
Date: Tue Mar 3 20:23:27 2015 +0530
Merge pull request #1253 from chandrikamohith/MIFOSX-1864
MIFOSX-1864 UI corrections made for deleting mapping penalty and fees du...
[33mcommit fd99e315ec820c926bb5f0fba261ef2b00d25556[m
Merge: da390be 7af7b98
Author: Vishwas Babu A J <vishwas@confluxtechnologies.com>
Date: Tue Mar 3 20:17:57 2015 +0530
Merge branch 'chandrikamohith-TrancheApproval' into develop
[33mcommit 7af7b9814892a4131550041d04809c450a6cc9bb[m
Merge: da390be 753a0d6
Author: Vishwas Babu A J <vishwas@confluxtechnologies.com>
Date: Tue Mar 3 20:17:35 2015 +0530
Merge branch 'TrancheApproval' of git://github.com/chandrikamohith/community-app into chandrikamohith-TrancheApproval
Conflicts:
app/global-translations/locale-en.json
app/scripts/controllers/loanAccount/LoanAccountActionsController.js
app/views/loans/viewloanaccountdetails.html
[33mcommit da390be3603ae71818944068b2cd483161187a07[m
Merge: 55f9d26 e258969
Author: Vishwas Babu A J <vishwas@confluxtechnologies.com>
Date: Tue Mar 3 20:13:55 2015 +0530
Merge pull request #1254 from chandrikamohith/MIFOS-1836
MIFOSX-1836 Available clients can be selected from the multiple select d...
[33mcommit 55f9d263713e94ef92c006cd13497c4880280d33[m
Merge: 2ec2d8d 3e23e94
Author: Vishwas Babu A J <vishwas@confluxtechnologies.com>
Date: Tue Mar 3 20:10:06 2015 +0530
Merge pull request #1256 from chandrikamohith/MIFOSX-1872
MIFOSX-1872 Dropdown for account transfer - toAccount options are now ge...
[33mcommit 2ec2d8d4a77e8901b500fac6b228ac1798c80caf[m
Merge: c39ce85 e87827d
Author: Vishwas Babu A J <vishwas@confluxtechnologies.com>
Date: Tue Mar 3 20:08:34 2015 +0530
Merge pull request #1257 from pramodn02/latest
MIFOSX-1850 : UI changes for recurring deposits without maturity date
[33mcommit c39ce8502c0b52b7a99e37e85d21ba5ed4747986[m
Merge: 80f48e9 ccf0e0b
Author: Vishwas Babu A J <vishwas@confluxtechnologies.com>
Date: Tue Mar 3 14:11:54 2015 +0530
Merge pull request #1266 from sachinkulkarni12/MIFOSX-1888
MIFOSX-1888: COnfiguration file updated
[33mcommit ccf0e0bc81dc1e68d3bbdc594eacdad4ea4d4482[m
Author: sachinkulkarni12 <sachin.kulkarni@confluxtechnologies.com>
Date: Tue Mar 3 14:05:57 2015 +0530
MIFOSX-1888: COnfiguration file updated
[33mcommit 80f48e9e02ef467cdaf2837aea4f19d568602a65[m
Merge: 948d3cb a7b58ff
Author: Vishwas Babu A J <vishwas@confluxtechnologies.com>
Date: Tue Mar 3 08:56:37 2015 +0530
Merge pull request #1258 from chandrikamohith/TrancheDisbursal
Tranche disbursal
[33mcommit 948d3cbfb7bff2a0cbb3fae8f9b358f2781ee1cf[m
Merge: 21f1954 918bc37
Author: Vishwas Babu A J <vishwas@confluxtechnologies.com>
Date: Mon Mar 2 07:09:17 2015 +0530
Merge pull request #1264 from MithunKashyap/MIFOSX-1828
MIFOSX-1828: EntityToEntity Mapping Feature
[33mcommit 918bc37987f5c1857b69d821fe0816f52383574a[m
Author: MithunKashyap <mithunkashyap0206@gmail.com>
Date: Sat Feb 28 13:30:57 2015 +0530
MIFOSX-1828: EntityToEntity Mapping Feature
[33mcommit 21f19543a802d9878bbed394c30bd690d520ab50[m
Merge: 662b2dd 9da473c
Author: Vishwas Babu A J <vishwas@confluxtechnologies.com>
Date: Wed Feb 25 19:54:20 2015 +0530
Merge pull request #1262 from sachinkulkarni12/MIFOSX-1888
MIFOSX-1888:New feature based configuration file to specify which fields should be editable/read only/hidden.
[33mcommit 9da473c343e3e77cf40c18183d36e0543a27bcc8[m
Author: sachinkulkarni12 <sachin.kulkarni@confluxtechnologies.com>
Date: Wed Feb 25 19:42:17 2015 +0530
MIFOSX-1888:New feature based configuration file to specify which fields should be editable/read only/hidden
[33mcommit a7b58fff9965662c5089a7609397dacc0603dc7b[m
Author: Chandrika <chandrika@confluxtechnologies.com>
Date: Tue Feb 24 15:43:58 2015 +0530
MIFOSX-1842 UI improvements to disbursal of Tranche Loans
[33mcommit b3a41aae596e7f722864570b870e35ac7f8339a2[m
Author: Chandrika <chandrika@confluxtechnologies.com>
Date: Fri Jan 30 11:01:37 2015 -0500
MIFOSX-1824 UI changes for loan approval screen in case of multi disburse loans
[33mcommit e87827db63a26fc31c97859e629ec86c59d2170f[m
Author: Pramod Nuthakki <pramod@confluxtechnologies.com>
Date: Tue Feb 24 14:27:38 2015 +0530
MIFOSX-1850 : UI changes for recurring deposits without maturity date
[33mcommit 3e23e945684d1a86da254e0603c3a01c16c3daca[m
Author: Chandrika <chandrika@confluxtechnologies.com>
Date: Mon Feb 23 15:19:12 2015 +0530
MIFOSX-1872 Dropdown for account transfer - toAccount options are now getting displayed for Loan/Savings
[33mcommit 662b2dd7b9db7946dd2f22799d4cdaf3780b05a8[m
Author: Siebrand Mazeland <siebrand@kitano.nl>
Date: Thu Feb 19 13:18:38 2015 +0100
Localisation updates from https://translatewiki.net.
[33mcommit e258969f28ce1ee00f998e35da66688ef87209e7[m
Author: Chandrika <chandrika@confluxtechnologies.com>
Date: Thu Feb 19 11:55:19 2015 +0530
MIFOSX-1836 Available clients can be selected from the multiple select dropdown.HTML issue in ViewGroup corrected.
[33mcommit 1754f6c7ba4b2169dcad518bf285ba48db5bca15[m
Author: Chandrika <chandrika@confluxtechnologies.com>
Date: Tue Feb 17 14:45:30 2015 +0530
MIFOSX-1864 UI corrections made for deleting mapping penalty and fees during edit.
[33mcommit f2decbf2b5a8c1f68e3f8a77fee472e2350c6b8e[m
Merge: 91e66e3 6490f4d
Author: Vishwas Babu A J <vishwas@confluxtechnologies.com>
Date: Tue Feb 10 02:40:10 2015 -0800
Merge pull request #1250 from shashvattrip/MIFOS-1293
MIFOSX-1293
[33mcommit 91e66e3cbdb1defd7943579d12a52cb51ce1fc61[m
Merge: 5fe5f58 25bcfd3
Author: Vishwas Babu A J <vishwas@confluxtechnologies.com>
Date: Tue Feb 10 02:35:27 2015 -0800
Merge pull request #1252 from shashvattrip/MIFOSX-1312
MIFOSX-1312
[33mcommit 25bcfd36adcdf2c34dea770ddc7e34ab87ad71cc[m
Author: Shashvat Tripathi <shashvattrip@gmail.com>
Date: Mon Feb 2 00:01:58 2015 +0530
MIFOSX-1312
When viewing a group loan, the group is now displayed.
Fixed HTML errors.
[33mcommit 6490f4d01f692de53f4582aa070a1865ed7a51fb[m
Author: Shashvat Tripathi <shashvattrip@gmail.com>
Date: Sat Jan 31 21:47:48 2015 +0530
MIFOS-1293
Add select all option to Pending Tasks in Checker Inbox and Tasks
[33mcommit 753a0d6fa22f378907d4581033229b813519fab7[m
Author: Chandrika <chandrika@confluxtechnologies.com>
Date: Fri Jan 30 11:01:37 2015 -0500
MIFOSX-1824 UI changes for loan approval screen in case of multi disburse loans
[33mcommit 5fe5f589a668055514347af69d6e84df26d0d8ba[m
Merge: 40e7cdf 5228bf5
Author: Vishwas Babu A J <vishwas@confluxtechnologies.com>
Date: Thu Jan 29 21:00:27 2015 -0800
Merge pull request #1248 from shashvattrip/MIFOSX-1849-Parse-Error
MIFOSX-1849
[33mcommit 5228bf50b51f38a08a5440381f1ab630a8e5c20c[m
Author: Shashvat Tripathi <shashvattrip@gmail.com>
Date: Fri Jan 30 10:22:49 2015 +0530
Fixed Parse Error
[33mcommit 40e7cdf8d3e9087108d59fcc4542159089404242[m
Merge: c097240 75ea825
Author: Vishwas Babu A J <vishwas@confluxtechnologies.com>
Date: Thu Jan 29 19:37:40 2015 -0800
Merge branch 'MIFOSX-1613' of git://github.com/pramodn02/community-app into pramodn02-MIFOSX-1613
Conflicts:
app/global-translations/locale-en.json
app/views/products/editloanproduct.html
[33mcommit c0972406da3080668da4ab2848b5b2b40b30c2ae[m
Merge: 2c078f4 748d9e1
Author: Vishwas Babu A J <vishwas@confluxtechnologies.com>
Date: Wed Jan 28 16:00:05 2015 -0800
Merge pull request #1223 from Muciojad/small_issues
MIFOSX-1833 & MIFOSX-1590 (small issues)
[33mcommit 2c078f4c4be381f3dfc4aa19de69456f7a0fa4f8[m
Merge: 803cc03 e646ed9
Author: Vishwas Babu A J <vishwas@confluxtechnologies.com>
Date: Wed Jan 28 15:58:05 2015 -0800
Merge pull request #1230 from MegaAlex/MIFOSX-1685
MIFOSX-1685 Improve tabs browser-back navigation
[33mcommit 803cc037485411ecc9dc1760ccd4809aa5523c0d[m
Merge: 4417c9e e098604
Author: Vishwas Babu A J <vishwas@confluxtechnologies.com>
Date: Wed Jan 28 15:55:57 2015 -0800
Merge pull request #1235 from MegaAlex/MIFOSX-1690
MIFOSX-1690 Change account transfer client field type
[33mcommit 4417c9e18c0b940ae57d1aa5a725c6bc98813030[m
Merge: 21b8598 16c81d9
Author: Vishwas Babu A J <vishwas@confluxtechnologies.com>
Date: Wed Jan 28 15:48:39 2015 -0800
Merge pull request #1238 from MegaAlex/MIFOSX-1139
MIFOSX-1139 Add connection failed message
[33mcommit 21b85982a9d606771cde481eca611eaeb5c38cd6[m
Merge: d1660e0 389a46f
Author: Vishwas Babu A J <vishwas@confluxtechnologies.com>
Date: Wed Jan 28 15:42:10 2015 -0800
Merge branch 'develop' of git://github.com/sidthekidder/community-app into sidthekidder-develop
[33mcommit d1660e01a30d1a14c6a86bbe95597ff2e5b3a5da[m
Merge: 9f39a1b d928cd7
Author: Vishwas Babu A J <vishwas@confluxtechnologies.com>
Date: Wed Jan 28 15:38:25 2015 -0800
Merge pull request #1242 from pramodn02/MIFOSX-1605
MIFOSX-1605 : corrected select tag of pre-mature closure on edit recurring page
[33mcommit 9f39a1b29f163b7cf146e5bb5a2c226f2f40fc63[m
Merge: 0f1eb89 2a58893
Author: Vishwas Babu A J <vishwas@confluxtechnologies.com>
Date: Wed Jan 28 15:37:22 2015 -0800
Merge pull request #1236 from MithunKashyap/MIFOSX-1846_new
MIFOSX-1846: Loan Transaction Receipt report
[33mcommit 0f1eb8963c210ff0d7046dc656b4f6e63c363272[m
Author: Siebrand Mazeland <siebrand@kitano.nl>
Date: Mon Jan 26 23:08:33 2015 +0100
Localisation updates from https://translatewiki.net.
[33mcommit 389a46f2350ae1685f527681684e3c4ad762b839[m
Author: Siddhartha Sahai <siddharthasahai99@gmail.com>
Date: Sat Jan 24 10:15:37 2015 +0530
Updated app.css sidebar easing
Added transition to left-nav to ease sidebar back slowly.
[33mcommit d928cd72c75a3dd09d9e20f54dfd467d2c10c72c[m
Author: Pramod Nuthakki <pramod@confluxtechnologies.com>
Date: Wed Jan 21 14:47:50 2015 +0530
MIFOSX-1605 : corrected select tag of pre-mature closure on edit recurring page
[33mcommit 4aeef01cad9d14c526c8e1f78914923a5af6cea8[m
Merge: 10c2525 4cea082
Author: Vishwas Babu A J <vishwas@confluxtechnologies.com>
Date: Tue Jan 20 19:24:37 2015 -0800
Merge pull request #1240 from pramodn02/MIFOSX-1844
MIFOSX-1844 : UI changes for config to manage last transaction
[33mcommit 4cea082f997bba9be87222a6c080ee554922fb1b[m
Author: Pramod Nuthakki <pramod@confluxtechnologies.com>
Date: Tue Jan 20 18:14:44 2015 +0530
MIFOSX-1844 : UI changes for config to manage last transaction
[33mcommit 10c2525e4ac6f30c9b91fe6c09613724929b651f[m
Author: Siebrand Mazeland <siebrand@kitano.nl>
Date: Mon Jan 19 09:38:59 2015 +0100
Localisation updates from https://translatewiki.net.
[33mcommit 96510f1380ab538d69f7921a16a0be069af70e73[m
Author: Muciojad <muciojad@gmail.com>
Date: Sun Jan 18 17:28:05 2015 +0100
MIFOSX-1782 - ADD TOOLTIPS FOR STANDING INSTRUCTION LABELS
Tooltips for Standing Instruction Labels.
[33mcommit 16c81d959c0beadcb891825613dc8ab8cdbfba44[m
Author: Alex Ivanov <alexivanov97@gmail.com>
Date: Sat Jan 17 18:56:41 2015 +0200
MIFOSX-1139 Add connection failed message
[33mcommit b93b98fffafc7a46f00d926b8727edf1108d3edb[m
Author: Muciojad <muciojad@gmail.com>
Date: Sat Jan 17 13:38:06 2015 +0100
MIFOSX-1780
Added tooltips for Creating Loan Product part 3.
[33mcommit ec41d3a397bb6374c868b17ea6495ed0aeb9481b[m
Author: Muciojad <muciojad@gmail.com>
Date: Sat Jan 17 13:38:06 2015 +0100
MIFOSX-1779 - Tooltips for Loan products
Tooltips added on right side.
[33mcommit 2a58893e94f17e0e9150e3de3cec3b0b48c35a75[m
Author: MithunKashyap <mithunkashyap0206@gmail.com>
Date: Sat Jan 17 14:32:06 2015 +0530
MIFOSX-1846: Loan Transaction Receipt report
[33mcommit e098604762c7b7950a97df208ad742b727babf7f[m
Author: Alex Ivanov <alexivanov97@gmail.com>
Date: Sat Jan 17 01:25:34 2015 +0200
MIFOSX-1690 Change account transfer client field type
[33mcommit 6c20db3827598ef6ce9ff35a14d54b91434eb6e2[m
Merge: 5e4eeed 332c053
Author: Vishwas Babu A J <vishwas@confluxtechnologies.com>
Date: Fri Jan 16 01:56:28 2015 -0800
Merge pull request #1232 from pramodn02/MIFOSX-1742
MIFOSX-1742 : Ui changes for collection sheet
[33mcommit 332c05317359c0f7ddde50daef722328ff500cd1[m
Author: Pramod Nuthakki <pramod@confluxtechnologies.com>
Date: Fri Jan 16 10:23:16 2015 +0530
MIFOSX-1742 : Ui changes for collection sheet
[33mcommit 5e4eeedf52aca5ad4732a723d3fb8c17b8f8eb70[m
Merge: 545cb6f 34c2f36
Author: Vishwas Babu A J <vishwas@confluxtechnologies.com>
Date: Thu Jan 15 16:52:45 2015 -0800
Merge pull request #1231 from MegaAlex/develop
Resolve merge conflicts
[33mcommit 34c2f36d71ce4b981c4b5f5e4073fcd4cb740748[m
Author: Alex Ivanov <alexivanov97@gmail.com>
Date: Thu Jan 15 21:16:48 2015 +0200
Resolve merge conflicts
[33mcommit e646ed95340e5c10a8ff00ff5e0c38461a7ea6d2[m
Author: Alex Ivanov <alexivanov97@gmail.com>
Date: Thu Jan 15 20:58:04 2015 +0200
MIFOSX-1685 Improve tabs browser-back navigation
[33mcommit 545cb6fb53f90775a2c23d14342bd4410657ca1d[m
Merge: 876703c 72c07bb
Author: Vishwas Babu A J <vishwas@confluxtechnologies.com>
Date: Wed Jan 14 10:24:13 2015 -0800
Merge branch 'MIFOSX-1786' of git://github.com/binaryking/community-app into binaryking-MIFOSX-1786
Conflicts:
app/global-translations/locale-en.json
[33mcommit 876703cf990fafc3e5099c88398e8f5f69a151ae[m
Merge: 0f3a5bc f6242f7
Author: Vishwas Babu A J <vishwas@confluxtechnologies.com>
Date: Wed Jan 14 01:19:44 2015 -0800
Merge pull request #1228 from MithunKashyap/MIFOSX-1830
MIFOSX-1830 : Bug fix for savings transaction report
[33mcommit f6242f7a6f8ea439afd1a4fc109530d27650d039[m
Author: MithunKashyap <mithunkashyap0206@gmail.com>
Date: Wed Jan 14 14:03:19 2015 +0530
MIFOSX-1830 : Bug fix for savings transaction report
[33mcommit 0f3a5bc3752c14e42b3c130a11da389ec61e4be2[m
Author: Vishwas Babu A J <vishwas@confluxtechnologies.com>
Date: Tue Jan 13 20:42:45 2015 -0800
cleaning up MIFOSX-1555
[33mcommit 2c02f00170290826d45909481601b5d531fd2e6e[m
Merge: 7405c50 f676c85
Author: Vishwas Babu A J <vishwas@confluxtechnologies.com>
Date: Tue Jan 13 19:10:53 2015 -0800
Merge branch 'develop' of git://github.com/Lajeo/community-app into Lajeo-develop
[33mcommit f676c851dce16cbd9ca243d19017b8e82d21174d[m
Author: LAJEO <lajeogloria@gmail.com>
Date: Tue Jan 20 00:09:02 2015 +0300
Collection Sheet Thousand Separator
[33mcommit 7405c503aead2940ddc16ba9580da5a976ae0731[m
Merge: 123875b f762793
Author: Vishwas Babu A J <vishwas@confluxtechnologies.com>
Date: Tue Jan 13 17:44:52 2015 -0800
Merge pull request #1227 from MegaAlex/develop
Fix view client signature link showing twice
[33mcommit f762793871dfcb3f0878fb9949ae00d27ab2ee3d[m
Author: Alex Ivanov <alexivanov97@gmail.com>
Date: Wed Jan 14 03:38:43 2015 +0200
Fix view client signature link showing twice
[33mcommit ee2a8b4feccf27b63efc9f86865220dda3cb3e06[m
Author: Alex Ivanov <alexivanov97@gmail.com>
Date: Tue Jan 13 22:35:24 2015 +0200
MIFOSX-1777 Add tooltips to fixed/recurring deposit product fields
[33mcommit 3b55637c0611e036d87be2ef6ee6021ac5b52f1a[m
Author: Alex Ivanov <alexivanov97@gmail.com>
Date: Sat Jan 10 15:12:33 2015 +0200
MIFOSX-1778 Add help tooltips to loan product fields
[33mcommit 81ce82de4020eb8c3bd7ed25eb8e3c4055599f78[m
Author: Muciojad <muciojad@gmail.com>
Date: Tue Jan 13 11:52:56 2015 +0100
MIFOSX-1693 - CHART OF ACCOUNTS UX IMPROVEMENTS
1)Clicking on chart of account element in tree view should go to "view" GL account (preferably on right frame instead of another page)
2)Tree view - chart of accounts should have GL Code in brackets (before GL names)
Update AccCoaController.js
[33mcommit 748d9e138f89208d903eed93448bee68f19e4fde[m
Author: Muciojad <muciojad@gmail.com>
Date: Mon Jan 12 15:56:54 2015 +0100
MIFOSX-1833 & MIFOSX-1590
1833 - In the Add journal entry - Drop down accounts should be sorted with respect to gl code
Sorted.
1590 - Moving icons on Accounting Menu page distracting - Resolved, icons are static now.
[33mcommit 845d272ee330f943aa691504ec08862e8c6670d9[m
Author: LAJEO <lajeogloria@gmail.com>
Date: Mon Jan 12 03:32:33 2015 +0300
Thousand Separators and MIFOSX-1555 - UI On Group
Variations Thousand separators added
[33mcommit 7bfaaf1071009e8a04157bc520b5d4452d4fd29f[m
Author: Chandrika <chandrika@confluxtechnologies.com>
Date: Thu Jan 8 18:15:12 2015 -0500
MIFOSX-1822 Parent field is displaying properly now in Add Sub ledger account
[33mcommit 123875b09b9859571fc3110c588965ea2cb379df[m
Merge: fcdf67d 5825d96
Author: Vishwas Babu A J <vishwas@confluxtechnologies.com>
Date: Thu Jan 8 10:01:42 2015 -0800
Merge branch 'shashvattrip-Better_Pagination_MIFOSX-1617' into develop
[33mcommit 5825d965a812892287306a629f148673b4aa3e52[m
Author: Vishwas Babu A J <vishwas@confluxtechnologies.com>
Date: Thu Jan 8 10:01:12 2015 -0800
ensure grunt prod works with MIFOSX-1617
[33mcommit fcdf67dbdd53783097a6cb91a9ec6d191cbae473[m
Merge: 61213ea 137bc14
Author: Vishwas Babu A J <vishwas@confluxtechnologies.com>
Date: Thu Jan 8 09:58:46 2015 -0800
Merge pull request #1217 from shashvattrip/Better_Pagination_MIFOSX-1617
MIFOSX-1617 - Better Pagination
[33mcommit 33b4487e666dad81cd0ff51183cee7619ce94b26[m
Merge: 61213ea 137bc14
Author: Vishwas Babu A J <vishwas@confluxtechnologies.com>
Date: Thu Jan 8 08:48:49 2015 -0800
Merge branch 'Better_Pagination_MIFOSX-1617' of git://github.com/shashvattrip/community-app into shashvattrip-Better_Pagination_MIFOSX-1617
[33mcommit 61213ea1f16f92fdf439eb9176ddd300d0b61a74[m
Merge: cd28922 fb0d8d4
Author: Vishwas Babu A J <vishwas@confluxtechnologies.com>
Date: Thu Jan 8 06:40:46 2015 -0800
Merge branch 'openingbalances' of git://github.com/binnygopinath/community-app into binnygopinath-openingbalances
Conflicts:
app/scripts/mifosXComponents.js
[33mcommit 137bc146fe3d0834458a1353e1e99d4db0a7f7ef[m
Author: Shashvat Tripathi <shashvattrip@gmail.com>
Date: Thu Dec 25 18:12:29 2014 +0530
MIFOSX-1617 - Better Pagination
Better Pagination of Clients listing using
https://github.com/michaelbromley/angularUtils/tree/master/src/directives/pagination#working-with-asynchronous-data
I have simply commented out the earlier pager implementation.
[33mcommit cd28922eeb222bdde6373d548a978aee44ceee83[m
Merge: e387068 35afd16
Author: Vishwas Babu A J <vishwas@confluxtechnologies.com>
Date: Wed Jan 7 23:12:34 2015 -0800
Merge pull request #1211 from MithunKashyap/MIFOSX-1737_new
MIFOSX-1737:Fetching Staff Assignment History Report to UI
[33mcommit e387068d28bb89b629257ebb5996a424bb84f6f0[m
Merge: 219b065 0c424f1
Author: Vishwas Babu A J <vishwas@confluxtechnologies.com>
Date: Wed Jan 7 23:10:37 2015 -0800
Merge pull request #1202 from Muciojad/develop
MIFOSX-1602 - Include MifosX Release Date and Version as About info && MIFOSX-1782
[33mcommit 219b0659bc9de42ee2b54b59d9454662f1c30210[m
Merge: e09c99c 6b517b6
Author: Vishwas Babu A J <vishwas@confluxtechnologies.com>
Date: Wed Jan 7 23:07:02 2015 -0800
Merge pull request #1203 from pkt77/MIFOSX-1781
MIFOSX-1781 Tooltips for New Loan Account Labels
[33mcommit e09c99cd5e41b579cac02c82f554ca3dcbb0f703[m
Merge: 3adee24 bf0d165
Author: Vishwas Babu A J <vishwas@confluxtechnologies.com>
Date: Wed Jan 7 23:05:58 2015 -0800
Merge pull request #1206 from chandrikamohith/MIFOSX-1809
MIFOSX-1809 Changes for group and center closure reason
[33mcommit 3adee24ecd8ec5b307a28a5bcb7a39e9f2f87976[m
Merge: 356418c 2ec0707
Author: Vishwas Babu A J <vishwas@confluxtechnologies.com>
Date: Wed Jan 7 23:05:00 2015 -0800
Merge pull request #1214 from chandrikamohith/MIFOSX-1808
MIFOSX-1808 Variable corrected to display active client loans in Center ...
[33mcommit 356418ca976ecece904c3feeedd5a290783c768f[m
Merge: afce971 b160794
Author: Vishwas Babu A J <vishwas@confluxtechnologies.com>
Date: Wed Jan 7 23:00:32 2015 -0800
Merge pull request #1213 from Nayan/bulkJLGapplication
#MIFOSX-1825 Option to create JLG loans for group members in bulk
[33mcommit afce971e88eb3158596e383ed69d6508a44b4655[m
Merge: b91ccb1 0ce5717
Author: Vishwas Babu A J <vishwas@confluxtechnologies.com>
Date: Wed Jan 7 21:35:49 2015 -0800
Merge pull request #1207 from satish-conflux/MIFOSX-1817
MIFOSX-1870 : Added Currency Type
[33mcommit b91ccb178d0c038ac1e28354ab5f03cbb4be82b1[m
Merge: 595223a ff49d71
Author: Vishwas Babu A J <vishwas@confluxtechnologies.com>
Date: Wed Jan 7 21:34:08 2015 -0800
Merge pull request #1212 from MithunKashyap/MIFOSX-1823
MIFOSX-1823: Savings Transaction Receipt can be viewed/printed
[33mcommit 2ec0707ff091b802e6a90ba85d02df3fd10dda19[m
Author: Chandrika <chandrika@confluxtechnologies.com>
Date: Wed Jan 7 15:11:54 2015 -0500
MIFOSX-1808 Variable corrected to display active client loans in Center Summary
[33mcommit b057b094b6fef55e563d56af3f687758956293e5[m
Author: Muciojad <muciojad@gmail.com>
Date: Fri Jan 2 20:15:08 2015 +0100
MIFOSX-1696 - Manage Roles and Permissions UX IMPROVEMENTS
1) Text doesn't wrapping to two or more lines
2) Added Select All/Deselect All buttons to make (de)selection easier
3) Repaired: displaying modified checkboxes after canceled edition(description in PR comment)
[33mcommit b160794cfcba1389ad1b5f8f7ca334c94a00d647[m
Author: Nayan <nayan.ambali@gmail.com>
Date: Tue Jan 6 20:16:59 2015 +0530
Option to create JLG loans for group members in bulk
[33mcommit ff49d71384c8fe4e04483022bd7b75ed0cba7862[m
Author: MithunKashyap <mithunkashyap0206@gmail.com>
Date: Tue Jan 6 15:30:03 2015 +0530
MIFOSX-1823: Savings Transaction Receipt can be viewed/printed
[33mcommit 35afd164bcc1fcef5c72c1d8ab886d84c19e6b0d[m
Author: MithunKashyap <mithunkashyap0206@gmail.com>
Date: Sat Jan 3 18:27:15 2015 +0530
MIFOSX-1737:Fetching Staff Assignment History Report to UI
[33mcommit 595223a7e3b9283b84fbf28cf9020920ffc0e2a8[m
Author: Siebrand Mazeland <siebrand@kitano.nl>
Date: Fri Jan 2 11:02:36 2015 +0100
Localisation updates from https://translatewiki.net.
[33mcommit 0ce57175b6ad5b86601a847d0375ef3de5dbdb25[m
Author: Satish Sajjan <satish.sajjan@confluxtechnologies.com>
Date: Wed Dec 31 19:14:11 2014 +0530
MIFOSX-1870 : Added Currency Type
[33mcommit 75ea8258e45374b1068a8d3980b6c3b6c331be11[m
Author: Pramod Nuthakki <pramod@confluxtechnologies.com>
Date: Wed Dec 31 18:19:43 2014 +0530
MIFOSX-1613 : UI changes for npa and overdue status
[33mcommit bf0d1650169b578d08e5d4d38f07cf434d419c5e[m
Author: Chandrika <chandrika@confluxtechnologies.com>
Date: Mon Dec 29 15:29:08 2014 -0500
MIFOSX-1809 Changes for group and center closure reason
[33mcommit 0c424f121758a9b80f0bd66349603999caebc4c3[m
Author: Muciojad <muciojad@gmail.com>
Date: Mon Dec 29 12:24:11 2014 +0100
MIFOSX-1602 - Include MifosX Release Date and Version as About info
Version details in footer.
[33mcommit 6b517b669b64d377b836aa8b5141088f16dbbbec[m
Author: pkt77 <parkerkt77@gmail.com>
Date: Mon Dec 29 01:42:15 2014 -0500
MIFOSX-1781 Tooltips for New Loan Account Labels
Done for GCI:
https://www.google-melange.com/gci/task/view/google/gci2014/5892902915932160
[33mcommit 8fe1dd94c0cfea28797dd52d42684ad95a7ca2b8[m
Author: Vishwas Babu A J <vishwas@confluxtechnologies.com>
Date: Sun Dec 28 05:45:39 2014 -0800
fixing test failures
[33mcommit 24194f41c7532f511a93be8c95b74747c51a8740[m
Merge: eb9398b 81239cb
Author: Vishwas Babu A J <vishwas@confluxtechnologies.com>
Date: Sun Dec 28 05:38:46 2014 -0800
Merge pull request #1200 from satish-conflux/mifosx-1670
Role Functionality with test cases
[33mcommit eb9398bf89f65120f251aa535811bc13d8f0e798[m
Merge: 024ca23 f7cad5c
Author: Vishwas Babu A J <vishwas@confluxtechnologies.com>
Date: Sun Dec 28 05:30:29 2014 -0800
Merge branch 'Muciojad-develop' into develop
[33mcommit f7cad5cdf86c51ffba7eb787dc143dbc3ad54395[m
Merge: ef91a18 ca8a830
Author: Vishwas Babu A J <vishwas@confluxtechnologies.com>
Date: Sun Dec 28 05:26:04 2014 -0800
Merge branch 'develop' of git://github.com/Muciojad/community-app into Muciojad-develop
Conflicts:
app/global-translations/locale-en.json
app/views/administration/global.html
[33mcommit ca8a83015abb417f6aee99f4e4cea11945e137f2[m
Author: Muciojad <muciojad@gmail.com>
Date: Sun Dec 28 10:21:16 2014 +0100
MifosX-1785 Final
Add tooltips for Global Configuration and Savings Accounting Labels