ADAM / AIAHTML5 | GitLab

24 Jan, 2018

3 commits

manually merged CALandscapeIssue into develop.
63560c2e

Nikita Kulshreshtha authored
2018-01-24 15:48:52 +0530
Browse Code »
files came after resettimg to Develop-IPAD-MAc
519b7396

Nikita Kulshreshtha authored
2018-01-24 15:39:09 +0530
Browse Code »
new files came from develop
1a5f0330

Nikita Kulshreshtha authored
2018-01-24 13:55:24 +0530
Browse Code »

23 Jan, 2018

4 commits

Merge branch 'AIAAdminApi' of http://52.6.196.163/ADAM/AIAHTML5 into Develop-IPAD-MAC ...
991f51b4
```
# Conflicts:
#	400-SOURCECODE/AIAHTML5.Web/app/controllers/TileViewListController.js
#	400-SOURCECODE/AIAHTML5.Web/app/views/da/da-view.html
```
Amrita Vishnoi authored
2018-01-23 17:20:32 +0530
Browse Code »
some changes came after : git checkout -b AIAAdminApi origin/AIAAdminApi
9d9835cd

Amrita Vishnoi authored
2018-01-23 17:09:31 +0530
Browse Code »
some changes came after : git checkout -b AIAAdminApi origin/AIAAdminApi
c97fc7d1

Amrita Vishnoi authored
2018-01-23 17:04:03 +0530
Browse Code »
some changes came after : git checkout -b AIAAdminApi origin/AIAAdminApi
3170a2e4

Amrita Vishnoi authored
2018-01-23 16:57:43 +0530
Browse Code »

18 Jan, 2018

6 commits

merged AIAAdminApi
335a8cfa

Nikita Kulshreshtha authored
2018-01-18 16:09:00 +0530
Browse Code »
meregd AIAAdminApi
fa970934

Nikita Kulshreshtha authored
2018-01-18 16:05:09 +0530
Browse Code »
merged code from AIAAdminApi
cbc7e3fa

Nikita Kulshreshtha authored
2018-01-18 16:01:48 +0530
Browse Code »
Add dist folder
3110b119

Gagandeep authored
2018-01-18 15:52:03 +0530
Browse Code »
Merge branch 'AIAAdminApi' of http://52.6.196.163/ADAM/AIAHTML5 into Develop-IPAD-MAC
de5f4fe0

Nikita Kulshreshtha authored
2018-01-18 15:51:33 +0530
Browse Code »
Merger Harpreet code
fe633357

Gagandeep authored
2018-01-18 11:55:14 +0530
Browse Code »

17 Jan, 2018

1 commit

store Procedure
e742dc2f

Gagandeep authored
2018-01-17 14:04:52 +0530
Browse Code »

16 Jan, 2018

1 commit

Commit Changes
2b8b72c8

unknown authored
2018-01-16 15:28:30 +0530
Browse Code »

12 Jan, 2018

1 commit

testing
1a05681d

Gagandeep authored
2018-01-12 11:52:55 +0530
Browse Code »

11 Jan, 2018

2 commits

changed versions of assemblies
42744033

Nikita Kulshreshtha authored
2018-01-11 13:05:21 +0530
Browse Code »
In this push, we have admin code. Mereg request was not raised so merged manually
9b6ca490

Nikita Kulshreshtha authored
2018-01-11 11:01:02 +0530
Browse Code »

10 Jan, 2018

11 commits

Merge branch 'AIAAdminApi' of http://52.6.196.163/ADAM/AIAHTML5 into Develop-IPAD-MAC
ef6e1062

Nikita Kulshreshtha authored
2018-01-10 17:43:44 +0530
Browse Code »
Store Proc Added
8d717a35

Gagandeep authored
2018-01-10 16:58:42 +0530
Browse Code »
dist added
b7562317

Gagandeep authored
2018-01-10 16:14:00 +0530
Browse Code »
Merge branch 'InappropriateSearchList' into Develop-IPAD-MAC
7693f8af

Nikita Kulshreshtha authored
2018-01-10 15:23:01 +0530
Browse Code »
code was not updated by command so done manually changed
7ca7fe87

Nikita Kulshreshtha authored
2018-01-10 15:19:22 +0530
Browse Code »
Merge branch 'CALandscapeIssue' into Develop-IPAD-MAC
a75229ef

Nikita Kulshreshtha authored
2018-01-10 15:14:45 +0530
Browse Code »
Admin UI Added
cc9a01a1

Gagandeep authored
2018-01-10 13:42:55 +0530
Browse Code »
Remove folder
6c57e8be

Gagandeep authored
2018-01-10 13:40:43 +0530
Browse Code »
Added New Store Procedure
edea42b7

Gagandeep authored
2018-01-10 13:26:57 +0530
Browse Code »
Commit Changes
2decd299

unknown authored
2018-01-10 11:58:30 +0530
Browse Code »
remove project
97811982

Gagandeep authored
2018-01-10 10:45:08 +0530
Browse Code »

09 Jan, 2018

4 commits

db update
07ec0296

Gagandeep authored
2018-01-09 17:00:12 +0530
Browse Code »
db update
72261b59

Gagandeep authored
2018-01-09 16:59:36 +0530
Browse Code »
Merge branch 'Develop-IPAD-MAC' of http://52.6.196.163/ADAM/AIAHTML5 into AIAAdminDiscountCode
41ae1eb1

Harpreet Banwait authored
2018-01-09 15:08:40 +0530
Browse Code »
aia admin angular 4 work.
3912d150

Harpreet Banwait authored
2018-01-09 13:33:34 +0530
Browse Code »

08 Jan, 2018

7 commits

Merge branch 'SQLException1' of http://52.6.196.163/ADAM/AIAHTML5 into Develop-IPAD-MAC
0b600801

Amrita Vishnoi authored
2018-01-08 18:21:13 +0530
Browse Code »
Merge branch 'Bug #13791 ' of http://52.6.196.163/ADAM/AIAHTML5 into Develop-IPAD-MAC
dd6351cb

Amrita Vishnoi authored
2018-01-08 18:11:07 +0530
Browse Code »
Merge branch 'textDescWithCA' of http://52.6.196.163/ADAM/AIAHTML5 into Develop-IPAD-MAC
2d180b53

Amrita Vishnoi authored
2018-01-08 17:25:28 +0530
Browse Code »
Merge branch 'listManagerSystemHighlight' of http://52.6.196.163/ADAM/AIAHTML5 into Develop-IPAD-MAC
2208b716

Amrita Vishnoi authored
2018-01-08 17:14:54 +0530
Browse Code »
Merge branch 'logoUnClickable' of http://52.6.196.163/ADAM/AIAHTML5 into Develop-IPAD-MAC
b389176c

Amrita Vishnoi authored
2018-01-08 17:03:06 +0530
Browse Code »
Merge branch 'IpadToolbarTextIssue' of http://52.6.196.163/ADAM/AIAHTML5 into Develop-IPAD-MAC
0c1aa23e

Amrita Vishnoi authored
2018-01-08 16:50:05 +0530
Browse Code »
Against Merge Request #808
ea07fa25

Amrita Vishnoi authored
2018-01-08 16:45:17 +0530
Browse Code »