Commit Graph

2004 Commits

Author SHA1 Message Date
gandhimathi
a562819967 Merge remote-tracking branch 'origin/master'
# Conflicts:
#	Apollo/api/application/config/routes.php
#	Apollo/api/application/controllers/Receive_Enrolment_Fees_Univ_Controller.php
#	Apollo/api/application/models/Receive_Enrolment_Fees_Univ_model.php
2018-09-08 19:58:15 +05:30
gandhimathi
3282671110 university payment changes 2018-09-08 19:50:10 +05:30
dineshkumarkannan
f8eea8903b formid edit cancel view changes : kdk 2018-09-08 18:51:53 +05:30
dineshkumarkannan
f3a3b4369e changes on formid model: kdk 2018-09-08 18:44:25 +05:30
dineshkumarkannan
5cae2f1535 Merge branch 'master' of https://bitbucket.org/venbainformationtechnology/apollodec 2018-09-08 18:39:37 +05:30
dineshkumarkannan
e20ef04a18 form id details check update : kdk 2018-09-08 18:36:25 +05:30
venbatechnologies@gmail.com
84c0f1fc62 checkin by bala 2018-09-08 16:19:16 +05:30
venbatechnologies@gmail.com
c645fdd1a8 navigation 2018-09-08 14:40:18 +05:30
venbatechnologies@gmail.com
6da672c989 data correction menu change 2018-09-08 14:31:33 +05:30
venbatechnologies@gmail.com
2078b8e849 daybook production 2018-09-08 12:16:24 +05:30
gandhimathi
c599643ac2 Merge branch 'master' of https://bitbucket.org/venbainformationtechnology/apollodec 2018-09-08 11:54:18 +05:30
gandhimathi
21a5e5f4b6 Student merge screen fields re-alignment 2018-09-08 11:53:40 +05:30
venbatechnologies@gmail.com
d554f01d18 daybook correction 2018-09-08 11:37:25 +05:30
venbatechnologies@gmail.com
4250a1ce48 data correction 2018-09-08 11:11:07 +05:30
gandhimathi
c07a29843a Breadcrumbs removal in master pages 2018-09-08 10:54:00 +05:30
gandhimathi
75ca7e297c Breadcrumbs removal in all pages 2018-09-08 10:28:24 +05:30
dineshkumarkannan
52f7be5af1 changes : kdk 2018-09-08 09:19:56 +05:30
dineshkumarkannan
9062f72662 aute merge routes.php changes : kdk 2018-09-08 09:18:36 +05:30
dineshkumarkannan
12fdbfbf69 formid details status capture update : kdk 2018-09-08 09:16:08 +05:30
gandhimathi
06530705d6 Merge branch 'master' of https://bitbucket.org/venbainformationtechnology/apollodec 2018-09-07 17:56:37 +05:30
gandhimathi
f1fc3ae138 Breadcrumbs Removal in students and fees screens 2018-09-07 17:48:32 +05:30
gandhimathi
c7ad4d7f21 db constant added 2018-09-07 16:15:16 +05:30
gandhimathi
e05f3140d0 Merge branch 'master' of https://bitbucket.org/venbainformationtechnology/apollodec 2018-09-07 16:06:19 +05:30
gandhimathi
612a6ee737 payment verifications changes in router 2018-09-07 16:05:30 +05:30
venbatechnologies@gmail.com
fc78d6b209 data correction 2018-09-07 15:57:05 +05:30
venbatechnologies@gmail.com
9bf2dd933c datacorrection 2018-09-07 13:30:26 +05:30
gayathri1990
60c73de203 Merge branch 'master' of https://bitbucket.org/venbainformationtechnology/apollodec 2018-09-07 12:52:57 +05:30
gayathri1990
3ce1c62bbd batchschedule 2018-09-07 12:51:12 +05:30
venbatechnologies@gmail.com
85ad61b06e course active_deactiation 2018-09-07 11:14:19 +05:30
gayathri1990
d4e9fd78a8 Merge branch 'master' of https://bitbucket.org/venbainformationtechnology/apollodec 2018-09-07 10:31:25 +05:30
gandhimathi
f0d4aa27e7 Merge branch 'master' of https://bitbucket.org/venbainformationtechnology/apollodec 2018-09-07 10:31:29 +05:30
gandhimathi
b1dd763430 common files changes university enrolment details 2018-09-07 10:31:10 +05:30
gayathri1990
9c6020d2e3 call tracking filter 2018-09-07 10:29:58 +05:30
dineshkumarkannan
799b9b60d0 form id capture details , list search changes : kdk 2018-09-07 09:09:24 +05:30
dineshkumarkannan
f5f2cd08f0 merge changes : kdk 2018-09-06 17:55:49 +05:30
dineshkumarkannan
b715749d81 formid details, fees details update record : kdk 2018-09-06 17:49:48 +05:30
gandhimathi
0ea6c34e7d DataCorrection_Controller.php edited online with Bitbucket 2018-09-06 11:31:52 +00:00
gandhimathi
a65458bc77 data correction screen for student merge 2018-09-06 16:52:19 +05:30
gandhimathi
6fd2101c41 Merge branch 'master' of https://bitbucket.org/venbainformationtechnology/apollodec 2018-09-06 12:53:24 +05:30
gandhimathi
17e654509c common files changes university enrolment details 2018-09-06 12:53:08 +05:30
gayathri1990
b05c3e9496 calltracking latest changes 2018-09-06 12:38:39 +05:30
gayathri1990
467d2cf8f9 call tracking menu changes 2018-09-06 12:28:42 +05:30
gayathri1990
33e717236c Merge branch 'master' of https://bitbucket.org/venbainformationtechnology/apollodec 2018-09-06 12:27:45 +05:30
gayathri1990
2eca1b48cc call tracking menu changes 2018-09-06 12:27:26 +05:30
gayathri1990
8752eaa58e call tracking menu lable changes 2018-09-06 12:26:29 +05:30
gandhimathi
864e65d1cd Merge branch 'master' of https://bitbucket.org/venbainformationtechnology/apollodec 2018-09-06 12:23:00 +05:30
gandhimathi
cf911771b2 common files changes university enrolment details 2018-09-06 12:22:45 +05:30
gayathri1990
2d5d409c3a Merge branch 'master' of https://bitbucket.org/venbainformationtechnology/apollodec 2018-09-06 10:24:13 +05:30
gayathri1990
df08f169fa batchshedule changes 2018-09-06 10:21:53 +05:30
gandhimathi
edfd242001 common files changes university enrolment details 2018-09-06 10:09:18 +05:30
gandhimathi
dcc4ed7ee6 common files changes university enrolment details 2018-09-06 09:48:00 +05:30
gandhimathi
fe7b851e91 common files changes university enrolment details 2018-09-06 09:47:34 +05:30
gandhimathi
23e2dd6f11 Merge branch 'master' of https://bitbucket.org/venbainformationtechnology/apollodec 2018-09-06 09:36:21 +05:30
gandhimathi
1c30e29a34 form id enrolment details changes 2018-09-06 09:35:59 +05:30
dineshkumarkannan
f6df24424d formid page hide for test: kdk 2018-09-06 09:19:15 +05:30
dineshkumarkannan
5a13771e9f Merge branch 'master' of https://bitbucket.org/venbainformationtechnology/apollodec 2018-09-06 09:17:07 +05:30
dineshkumarkannan
bae8d8a311 form upload details changes : kdk 2018-09-06 09:15:48 +05:30
venbatechnologies@gmail.com
7bb136feba data correction 2018-09-05 14:33:57 +05:30
gayathri1990
23ac03705b Merge branch 'master' of https://bitbucket.org/venbainformationtechnology/apollodec 2018-09-05 13:14:39 +05:30
gayathri1990
a19d1b10e6 batchshedule file upload 2018-09-05 13:13:41 +05:30
venbatechnologies@gmail.com
fd7ad13a28 data correction 2018-09-05 13:07:48 +05:30
venbatechnologies@gmail.com
2628209536 data correction 2018-09-05 12:34:19 +05:30
venbatechnologies@gmail.com
4c3ffbcd32 data correction 2018-09-05 12:29:52 +05:30
gandhimathi
506d3354de Merge branch 'master' of https://bitbucket.org/venbainformationtechnology/apollodec 2018-09-05 11:45:30 +05:30
gandhimathi
e5588d381a model changes 2018-09-05 11:45:15 +05:30
dineshkumarkannan
9e1cef3551 Merge branch 'master' of https://bitbucket.org/venbainformationtechnology/apollodec 2018-09-05 11:39:56 +05:30
dineshkumarkannan
bc8834dacf form id changes details : kdk 2018-09-05 11:39:40 +05:30
gandhimathi
45f26cf3ec enrolment upload model 2018-09-05 11:39:07 +05:30
gandhimathi
6c6009543c router changes 2018-09-05 11:38:18 +05:30
gandhimathi
01fbbfbcd6 enrolment upload model 2018-09-05 11:31:18 +05:30
gandhimathi
7cd52a55e0 Reports_model.php edited online with Bitbucket 2018-09-05 05:12:21 +00:00
dineshkumarkannan
8bfd4823b2 student university formid fees details capture new page add: kdk 2018-09-05 10:06:04 +05:30
dineshkumarkannan
22d549f53f Merge branch 'master' of https://bitbucket.org/venbainformationtechnology/apollodec 2018-09-05 09:38:03 +05:30
dineshkumarkannan
184340e829 university and course search details changes : kdk 2018-09-05 09:37:48 +05:30
gandhimathi
90287d2b9b report_examfeeCtrl.js edited online with Bitbucket 2018-09-04 10:35:53 +00:00
dineshkumarkannan
5384e89129 file upload feed id caputre changes : kdk 2018-09-04 15:20:08 +05:30
gandhimathi
bcd6326261 report_mark_certificate_status.html edited online with Bitbucket 2018-09-04 07:28:35 +00:00
gandhimathi
990395d7b4 enrolment upload model 2018-09-04 10:36:07 +05:30
gandhimathi
5c60bda053 call tracking undefined issue fixed 2018-09-03 17:55:39 +05:30
gandhimathi
4647679a87 Merge branch 'master' of https://bitbucket.org/venbainformationtechnology/apollodec 2018-08-31 19:17:34 +05:30
gandhimathi
27ce70eb22 fees changes 2018-08-31 19:17:22 +05:30
venbatechnologies@gmail.com
bd6a49b992 call tracking issue _ sriram report model_arasan 2018-08-31 18:43:11 +05:30
dineshkumarkannan
9bbb12891f Merge branch 'master' of https://bitbucket.org/venbainformationtechnology/apollodec 2018-08-31 18:33:01 +05:30
dineshkumarkannan
2ad37e6099 get record changes: kdk 2018-08-31 18:32:41 +05:30
gandhimathi
a50bc68d65 Merge branch 'master' of https://bitbucket.org/venbainformationtechnology/apollodec 2018-08-31 17:50:19 +05:30
gandhimathi
3b5c7272d5 fees changes 2018-08-31 17:49:59 +05:30
gandhimathi
3dea8a1e0e Reports_model.php edited online with Bitbucket 2018-08-31 12:05:27 +00:00
dineshkumarkannan
5426f9d045 Merge branch 'master' of https://bitbucket.org/venbainformationtechnology/apollodec 2018-08-31 16:22:35 +05:30
dineshkumarkannan
2bf600b995 unmatched details captured : kdk 2018-08-31 16:22:09 +05:30
gandhimathi
d35263fbf3 feesStatusCtrl.js edited online with Bitbucket 2018-08-31 10:13:32 +00:00
gandhimathi
ac76305890 Print option changed in bill details screen 2018-08-31 15:13:38 +05:30
gandhimathi
6a1ed4aa3a model changes 2018-08-31 10:08:24 +05:30
gayathri1990
87304b2030 Merge branch 'master' of https://bitbucket.org/venbainformationtechnology/apollodec 2018-08-30 17:58:59 +05:30
gayathri1990
cf773196cf hallticket date changes 2018-08-30 17:58:45 +05:30
gandhimathi
bd3b8f1fd6 model changes 2018-08-30 17:25:57 +05:30
gandhimathi
7baad2b2f7 label changes 2018-08-30 17:16:46 +05:30
gandhimathi
e3474d0bdf directive file type accept changes 2018-08-30 17:11:05 +05:30
gandhimathi
7c52cb9ba2 commit changes 2018-08-30 17:02:43 +05:30
gandhimathi
9465d2b310 commit changes 2018-08-30 16:41:09 +05:30
gandhimathi
b507941d80 commit changes 2018-08-30 16:40:54 +05:30
gandhimathi
21e36b789c commit changes 2018-08-30 16:40:35 +05:30
gandhimathi
5bdb382528 api changes 2018-08-30 16:22:47 +05:30
gandhimathi
5a3e65d9ed api changes 2018-08-30 16:14:47 +05:30
gandhimathi
00df0cfb80 Merge branch 'master' of https://bitbucket.org/venbainformationtechnology/apollodec 2018-08-30 16:13:24 +05:30
gandhimathi
a557f99528 controller and model changes fo fees compare 2018-08-30 16:13:11 +05:30
dineshkumarkannan
c78f6df959 Merge branch 'master' of https://bitbucket.org/venbainformationtechnology/apollodec 2018-08-30 16:09:14 +05:30
dineshkumarkannan
ffbcacf18f receive fee details changes : kdk 2018-08-30 16:08:56 +05:30
gandhimathi
dc8f742501 data_correction.html edited online with Bitbucket 2018-08-30 09:28:12 +00:00
gandhimathi
c04b4483b0 Merge branch 'master' of https://bitbucket.org/venbainformationtechnology/apollodec 2018-08-30 14:16:17 +05:30
gandhimathi
42453ef622 constant and router changes 2018-08-30 14:15:53 +05:30
gayathri1990
bcb5eb61be Merge branch 'master' of https://bitbucket.org/venbainformationtechnology/apollodec 2018-08-30 13:19:05 +05:30
gayathri1990
f55d5a10af hall ticket sorting date 2018-08-30 13:18:10 +05:30
gandhimathi
56328c5794 changes for file upload js,html and api 2018-08-30 12:46:58 +05:30
gandhimathi
000f368a7e changes for file upload js,html and api 2018-08-30 12:46:15 +05:30
gandhimathi
ebca18af0c changes for file upload js,html and api 2018-08-30 12:42:35 +05:30
gandhimathi
3e8205df77 Merge branch 'master' of https://bitbucket.org/venbainformationtechnology/apollodec 2018-08-30 12:39:18 +05:30
gandhimathi
bf228ea52f changes for file upload js,html and api 2018-08-30 12:39:05 +05:30
dineshkumarkannan
7d8ef5cb36 directive changes : kdk 2018-08-30 12:37:12 +05:30
dineshkumarkannan
8510bcabf0 Merge branch 'master' of https://bitbucket.org/venbainformationtechnology/apollodec 2018-08-30 11:28:00 +05:30
dineshkumarkannan
31a2ead630 student university fee details comparition : kdk 2018-08-30 11:20:29 +05:30
gandhimathi
dd3296db77 changes for file upload js,html 2018-08-30 11:17:26 +05:30
gandhimathi
5a29f0de32 Merge branch 'master' of https://bitbucket.org/venbainformationtechnology/apollodec 2018-08-29 18:37:24 +05:30
gandhimathi
faab41e795 enrolment receive changes 2018-08-29 18:36:57 +05:30
dineshkumarkannan
bda44b1bba university fee details upload changes : kdk 2018-08-29 18:33:01 +05:30
gandhimathi
3761f070e5 Merge branch 'master' of https://bitbucket.org/venbainformationtechnology/apollodec 2018-08-29 15:02:28 +05:30
gandhimathi
1b30f20107 enrolment receive changes 2018-08-29 15:02:05 +05:30
dineshkumarkannan
170c61834a Merge branches 'master' and 'master' of https://bitbucket.org/venbainformationtechnology/apollodec 2018-08-29 14:58:46 +05:30
dineshkumarkannan
b733f14794 query update check : kdk 2018-08-29 14:56:19 +05:30
gandhimathi
82badf2fc1 Merge branch 'master' of https://bitbucket.org/venbainformationtechnology/apollodec 2018-08-29 13:57:20 +05:30
gandhimathi
f30a819153 enrolment receive changes 2018-08-29 13:56:52 +05:30
dineshkumarkannan
402a818993 Merge branch 'master' of https://bitbucket.org/venbainformationtechnology/apollodec 2018-08-29 13:52:22 +05:30
dineshkumarkannan
3484610bab query updation : kdk 2018-08-29 13:51:50 +05:30
gandhimathi
bf0abb1b49 New report added for Application status - Old data 2018-08-29 12:59:09 +05:30
gandhimathi
f8f3f5afdb login changes 2018-08-28 18:56:42 +05:30
gandhimathi
6c259bf0fb Merge branch 'master' of https://bitbucket.org/venbainformationtechnology/apollodec 2018-08-28 18:47:55 +05:30
gandhimathi
6f83a746e1 university fees details changes 2018-08-28 18:47:46 +05:30
venbatechnologies@gmail.com
bd0009a260 data correction visibility 2018-08-28 17:15:36 +05:30
dineshkumarkannan
c93cf75469 Merge branch 'master' of https://bitbucket.org/venbainformationtechnology/apollodec 2018-08-28 16:39:05 +05:30
dineshkumarkannan
55975c4d7b add recieve formid file details : kdk 2018-08-28 16:38:47 +05:30
gandhimathi
c552cea597 print option in bill details screen fixed 2018-08-28 16:29:18 +05:30
gandhimathi
e9097fcc93 university fees details changes 2018-08-28 14:21:08 +05:30
gandhimathi
25bba02aac Merge branch 'master' of https://bitbucket.org/venbainformationtechnology/apollodec 2018-08-28 14:10:38 +05:30
gandhimathi
5c1454abab enrolment university received changes 2018-08-28 14:10:19 +05:30
dineshkumarkannan
b5a990f8bf Merge branch 'master' of https://bitbucket.org/venbainformationtechnology/apollodec 2018-08-28 13:58:23 +05:30
dineshkumarkannan
de01ebf64f enrolment id , form id get upload functionality: kdk 2018-08-28 13:57:44 +05:30
venbatechnologies@gmail.com
54dcc828c4 screen name change 2018-08-28 12:49:58 +05:30
sriramv
afbf564498 Reregister issues fixed by sriram 2018-08-28 12:01:50 +05:30
venbatechnologies@gmail.com
245e3bdf5d sem course map 2018-08-28 10:28:18 +05:30
gandhimathi
3edfea85e2 report_app_pendingCtrl.js edited online with Bitbucket 2018-08-27 13:16:25 +00:00
gandhimathi
525ee9d3e0 Reports_model.php edited online with Bitbucket 2018-08-27 13:15:07 +00:00