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
30 Sep, 2016
29 commits
  • Merge branch 'AnnoSpeechBubbleRedesign' into Develop
    77497b23
    Nikita Kulshreshtha authored
    2016-09-30 17:34:27 +0530  
    Browse Code »
  • annotation speech bubble design changed.
    09936044
    Nikita Kulshreshtha authored
    2016-09-30 17:30:37 +0530  
    Browse Code »
  • Merge branch 'AnnoTextAeraActiveButtons' into Develop
    73199bbe
    Nikita Kulshreshtha authored
    2016-09-30 17:08:15 +0530  
    Browse Code »
  • Refs: #7808
    6f5db128
    Nikita Kulshreshtha authored
    2016-09-30 17:04:34 +0530  
    Browse Code »
  • Refs: #7808
    d6baa2a6
    Nikita Kulshreshtha authored
    2016-09-30 17:03:29 +0530  
    Browse Code »
  • null check for annotation canvas
    b00f230d
    Amrita Vishnoi authored
    2016-09-30 16:42:56 +0530  
    Browse Code »
  • Merge branch 'Develop' of http://52.6.196.163/ADAM/AIAHTML5 into Develop
    35bb538c
    Amrita Vishnoi authored
    2016-09-30 16:36:33 +0530  
    Browse Code »
  • defect fix on binding event Listeners for annotation tool bar .
    d4432c87
    Amrita Vishnoi authored
    2016-09-30 16:34:11 +0530  
    Browse Code »
  • Merge branch 'LayerChangeArrowIEIssue' into Develop
    c3f1b1f4
    Nikita Kulshreshtha authored
    2016-09-30 16:18:09 +0530  
    Browse Code »
  • Refs: 5240. ...
    6b50e2f6
    removed number input for layer cahneg and added buttons. now teh user can change layer by incrementing/ decrementing layer numbe ronly by 1.
    Nikita Kulshreshtha authored
    2016-09-30 16:10:50 +0530  
    Browse Code »
  • Merge branch 'NormalAfterLM' into Develop
    17b7d66f
    Amrita Vishnoi authored
    2016-09-30 15:47:55 +0530  
    Browse Code »
  • Merge branch 'SerachTermsIssue' into Develop
    5327f783
    Amrita Vishnoi authored
    2016-09-30 15:42:18 +0530  
    Browse Code »
  • Merge branch 'CICAAlphabetical' into Develop
    b772c01c
    Amrita Vishnoi authored
    2016-09-30 14:41:43 +0530  
    Browse Code »
  • Comment for adding "_BodyRegion": "None" in json file
    388d57c7
    Amrita Vishnoi authored
    2016-09-30 14:35:31 +0530  
    Browse Code »
  • Merge branch 'CACIissues' into Develop
    ff0e8241
    Amrita Vishnoi authored
    2016-09-30 14:29:53 +0530  
    Browse Code »
  • case: change layer>selct term LM> now click ion normal button> the layer was go… ...
    dcfbaaf4
    …ing to the previous layer which was before the LM selection. - fixed
    Nikita Kulshreshtha authored
    2016-09-30 14:26:27 +0530  
    Browse Code »
  • called loadSearchDataForBodyView from different location and also checking data … ...
    65d2f64f
    …existance before showing this.If not exist exist tahn calling again loadSearchDataForBodyView.
    Nikita Kulshreshtha authored
    2016-09-30 14:12:06 +0530  
    Browse Code »
  • Merge branch 'Develop' of http://52.6.196.163/ADAM/AIAHTML5 into Develop
    4d8c14bb
    Amrita Vishnoi authored
    2016-09-30 14:06:12 +0530  
    Browse Code »
  • Merge branch 'SettingBug8006' into Develop
    17e6e608
    Amrita Vishnoi authored
    2016-09-30 13:48:11 +0530  
    Browse Code »
  • Merge branch 'NewBug78Merge' into Develop
    b5a93dbb
    Nikita Kulshreshtha authored
    2016-09-30 13:35:36 +0530  
    Browse Code »
  • merged NewBug Branch
    a4b74383
    Nikita Kulshreshtha authored
    2016-09-30 13:32:18 +0530  
    Browse Code »
  • Merge branch 'TwoAnnotationEditStyle' into Develop
    4e9e6fd9
    Amrita Vishnoi authored
    2016-09-30 12:49:01 +0530  
    Browse Code »
  • Fix merge change
    db59a8f6
    Amrita Vishnoi authored
    2016-09-30 12:43:01 +0530  
    Browse Code »
  • 88 Merged Request
    68f8eacb
    Amrita Vishnoi authored
    2016-09-30 12:33:25 +0530  
    Browse Code »
  • 79 merged commit
    1f82b15f
    Amrita Vishnoi authored
    2016-09-30 11:55:39 +0530  
    Browse Code »
  • Refs: 7646, 7914 ...
    4a6500fa
    commit after buBugFix.
    Nikita Kulshreshtha authored
    2016-09-30 11:41:12 +0530  
    Browse Code »
  • 74 merged request changes
    0fb9ec8e
    Amrita Vishnoi authored
    2016-09-30 11:35:30 +0530  
    Browse Code »
  • renamed function
    53f67365
    Amrita Vishnoi authored
    2016-09-30 11:21:19 +0530  
    Browse Code »
  • Merge branch 'ReplicatedCodeForAnnotation' into Develop
    9e2be78c
    Amrita Vishnoi authored
    2016-09-30 10:57:04 +0530  
    Browse Code »

29 Sep, 2016
11 commits
  • decreased time
    8cb4e826
    Amrita Vishnoi authored
    2016-09-29 17:01:54 +0530  
    Browse Code »
  • extended time
    c472cbfa
    Amrita Vishnoi authored
    2016-09-29 16:38:37 +0530  
    Browse Code »
  • Merge branch 'RemovedAddEventLitsnersForFreeze' into Develop
    a57d7b65
    Amrita Vishnoi authored
    2016-09-29 16:23:20 +0530  
    Browse Code »
  • Removed addEventListner
    900c353c
    Amrita Vishnoi authored
    2016-09-29 16:10:13 +0530  
    Browse Code »
  • more null check
    2ef28470
    Amrita Vishnoi authored
    2016-09-29 14:58:43 +0530  
    Browse Code »
  • null check
    3c386e26
    Amrita Vishnoi authored
    2016-09-29 14:49:40 +0530  
    Browse Code »
  • Merge branch 'MergeDevelopIntoFreezeCodeWithFixes' into Develop
    814bc907
    Amrita Vishnoi authored
    2016-09-29 14:26:39 +0530  
    Browse Code »
  • Merged after pulling Develop
    64f31c11
    Amrita Vishnoi authored
    2016-09-29 14:10:36 +0530  
    Browse Code »
  • dispatching event from gender Switch too
    126b78ef
    Amrita Vishnoi authored
    2016-09-29 13:49:17 +0530  
    Browse Code »
  • now we are dispatching event from javascript onclick function
    e773e07e
    Amrita Vishnoi authored
    2016-09-29 13:42:56 +0530  
    Browse Code »
  • Merge branch 'FreezeCodeManualMerge' into Develop
    ceca6087
    Amrita Vishnoi authored
    2016-09-29 12:59:20 +0530  
    Browse Code »