Logo white

ADAM / AIAHTML5

Sign in
  • Sign in
  • Project
  • Files
  • Commits
  • Network
  • Graphs
  • Milestones
  • Issues
  • Merge Requests 14
  • Labels
  • Wiki
  • Snippets
  • Commits 3,087
  • Compare
  • Branches 1610
  • Tags 133
  • AIAHTML5
07 Mar, 2017
3 commits
  • added sql.id also as mongo.oldId
    350b9ddd
    Nikita Kulshreshtha authored
    2017-03-07 18:25:54 +0530  
    Browse Code »
  • removed commented code.
    84699776
    Nikita Kulshreshtha authored
    2017-03-07 16:28:39 +0530  
    Browse Code »
  • working code for sql to json conversion.
    63c7611c
    Nikita Kulshreshtha authored
    2017-03-07 15:56:19 +0530  
    Browse Code »

06 Mar, 2017
1 commit
  • chnaged implementation due to inavlid json. now using list for modules and usertype. ...
    24282405
    after converting data into json, need to validate it.
    Nikita Kulshreshtha authored
    2017-03-06 18:18:00 +0530  
    Browse Code »

02 Mar, 2017
2 commits
  • added id in module array.
    3aef1e2b
    Nikita Kulshreshtha authored
    2017-03-02 16:23:34 +0530  
    Browse Code »
  • converted sql data of users with its type and modules in json. ...
    bb73a96e
    this will be imported in mongo DB
    Nikita Kulshreshtha authored
    2017-03-02 16:02:26 +0530  
    Browse Code »

01 Mar, 2017
1 commit
  • converted the desired resukt into json. ...
    dd535048
    now just need to remove sapce before name and slug in modules array.
    we can do that by using indexof..
    Nikita Kulshreshtha authored
    2017-03-01 19:06:34 +0530  
    Browse Code »

28 Feb, 2017
2 commits
  • added comment to switch the branch.
    5683a731
    Nikita Kulshreshtha authored
    2017-02-28 15:27:35 +0530  
    Browse Code »
  • exception in creating data
    41460e5b
    Nikita Kulshreshtha authored
    2017-02-28 15:26:36 +0530  
    Browse Code »

22 Feb, 2017
5 commits
  • Merge branch 'Develop' of http://52.6.196.163/ADAM/AIAHTML5 into Develop
    499636be
    Nikita Kulshreshtha authored
    2017-02-22 17:14:59 +0530  
    Browse Code »
  • Merge branch 'cadisablebrush' into Develop
    b11818b4
    Nikita Kulshreshtha authored
    2017-02-22 17:13:43 +0530  
    Browse Code »
  • Merge branch 'TransparencyResizeDefect' into Develop
    eac09189
    Nikita Kulshreshtha authored
    2017-02-22 16:42:36 +0530  
    Browse Code »
  • this is for bug 14843 Disable annotation toolbar in menu in clinical animation detail page.
    ff2ea676
    Mukul Rajput authored
    2017-02-22 15:39:43 +0530  
    Browse Code »
  • Issue in Transparency when annotation and annotation toolbar is open/close
    5fadfdd4
    unknown authored
    2017-02-22 13:12:39 +0530  
    Browse Code »

21 Feb, 2017
15 commits
  • Merge branch 'TBIssue1' into Develop
    66c73b5b
    Nikita Kulshreshtha authored
    2017-02-21 18:21:59 +0530  
    Browse Code »
  • removed a class
    fe39ec41
    Nikita Kulshreshtha authored
    2017-02-21 18:19:17 +0530  
    Browse Code »
  • Merge branch 'TBIssue1' of http://52.6.196.163/ADAM/AIAHTML5 into TBIssue1
    020c0dd5
    Nikita Kulshreshtha authored
    2017-02-21 18:15:10 +0530  
    Browse Code »
  • annotation tool bar canavses was added before deletion of the canvasDiv child. changed the location.
    4b280fff
    Nikita Kulshreshtha authored
    2017-02-21 18:14:17 +0530  
    Browse Code »
  • In a case there was issue in combination of Tbox and AToolbar.-fixed
    c55173ee
    Nikita Kulshreshtha authored
    2017-02-21 18:00:20 +0530  
    Browse Code »
  • added annotationToolbar open check
    afab0321
    Nikita Kulshreshtha authored
    2017-02-21 16:55:11 +0530  
    Browse Code »
  • Merge branch 'TransparencyNotWorking_Merge' into Develop
    a25f1460
    Nikita Kulshreshtha authored
    2017-02-21 16:42:55 +0530  
    Browse Code »
  • now we can draw transparency box when annotation box is open
    c2d51add
    Nikita Kulshreshtha authored
    2017-02-21 16:40:38 +0530  
    Browse Code »
  • Merge branch 'listMangerStateMaintainIssue1_Merge' into Develop
    3959ad25
    Nikita Kulshreshtha authored
    2017-02-21 13:10:22 +0530  
    Browse Code »
  • merged branch
    b830a9b4
    Nikita Kulshreshtha authored
    2017-02-21 13:08:27 +0530  
    Browse Code »
  • Merge branch 'messageModalIntergartion' into Develop
    0e5d2091
    Nikita Kulshreshtha authored
    2017-02-21 12:41:22 +0530  
    Browse Code »
  • meaasge was incorrect
    6de21315
    Nikita Kulshreshtha authored
    2017-02-21 12:36:41 +0530  
    Browse Code »
  • removed zindex as it amde the ok button of modal non clickable.
    12a34fe5
    Nikita Kulshreshtha authored
    2017-02-21 12:29:58 +0530  
    Browse Code »
  • not working in a case but working now
    6808660f
    Nikita Kulshreshtha authored
    2017-02-21 12:25:34 +0530  
    Browse Code »
  • Commit Changes
    50bf3ea4
    unknown authored
    2017-02-21 11:52:53 +0530  
    Browse Code »

20 Feb, 2017
2 commits
  • switched off authentiaction for development merge
    725f1d75
    Nikita Kulshreshtha authored
    2017-02-20 12:15:06 +0530  
    Browse Code »
  • Merge branch 'PrintCssIssues' into Develop
    9281c1cf
    Nikita Kulshreshtha authored
    2017-02-20 11:31:02 +0530  
    Browse Code »

16 Feb, 2017
9 commits
  • changed the location from where message picked
    e9225240
    Amrita Vishnoi authored
    2017-02-16 17:42:31 +0530  
    Browse Code »
  • Merge branch 'LoginIssues' into Develop
    6c7473be
    Amrita Vishnoi authored
    2017-02-16 17:23:02 +0530  
    Browse Code »
  • Code correction regarding print-main.css conflicts
    d9002148
    Utkarsh Singh authored
    2017-02-16 17:13:12 +0530  
    Browse Code »
  • Allover message were written in string text for login. Now fixed.
    35878cd6
    Amrita Vishnoi authored
    2017-02-16 17:07:59 +0530  
    Browse Code »
  • For development purpose we have introduced default autentication TRUE. ...
    952f23fd
    we set this in web.config and handled in code accordingly.
    On Live, we will set it false.
    Nikita Kulshreshtha authored
    2017-02-16 16:10:45 +0530  
    Browse Code »
  • resolved conflicts
    1a6a967e
    Amrita Vishnoi authored
    2017-02-16 16:02:35 +0530  
    Browse Code »
  • updated message in the develop in which login was working fine on server.
    7a102231
    Amrita Vishnoi authored
    2017-02-16 15:34:07 +0530  
    Browse Code »
  • updated message on login
    531f8772
    Amrita Vishnoi authored
    2017-02-16 13:14:21 +0530  
    Browse Code »
  • small to capital for result params.
    f78c1907
    Nikita Kulshreshtha authored
    2017-02-16 11:46:24 +0530  
    Browse Code »