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
  • 400-SOURCECODE
  • AIAHTML5.Web
  • app
  • controllers
  • HomeController.js
03 Oct, 2016
2 commits
  • COMMIT AFTER MERGE AND CONTAINS CODE CHANGE FOR SAVE TEXT IN ANNOTATION
    facaa561
    unknown authored
    2016-10-03 14:29:26 +0530  
    Browse File »
  • Commit changes for Annotation in CI module.
    0168f33a
    unknown authored
    2016-10-03 13:06:34 +0530  
    Browse File »

30 Sep, 2016
7 commits
  • 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 File »
  • Merge branch 'SettingBug8006' into Develop
    17e6e608
    Amrita Vishnoi authored
    2016-09-30 13:48:11 +0530  
    Browse File »
  • merged NewBug Branch
    a4b74383
    Nikita Kulshreshtha authored
    2016-09-30 13:32:18 +0530  
    Browse File »
  • 88 Merged Request
    68f8eacb
    Amrita Vishnoi authored
    2016-09-30 12:33:25 +0530  
    Browse File »
  • 79 merged commit
    1f82b15f
    Amrita Vishnoi authored
    2016-09-30 11:55:39 +0530  
    Browse File »
  • Refs: 7646, 7914 ...
    4a6500fa
    commit after buBugFix.
    Nikita Kulshreshtha authored
    2016-09-30 11:41:12 +0530  
    Browse File »
  • 74 merged request changes
    0fb9ec8e
    Amrita Vishnoi authored
    2016-09-30 11:35:30 +0530  
    Browse File »

26 Sep, 2016
1 commit
  • Commit changes for Issue :Ref ...
    c52ed369
    #I7908:Annotation Toolbar | Incorrect state of the button
    #7930:Annotation: Defect in Opacity Level.
    #7177:Annotation toolbar is not working in IE Browser
    unknown authored
    2016-09-26 16:54:46 +0530  
    Browse File »

23 Sep, 2016
2 commits
  • Commit changes for the issue Ref: ...
    e26f5798
    #7914:Annotation should be disable when List Manager is open.
    unknown authored
    2016-09-23 18:17:11 +0530  
    Browse File »
  • Resolved line issue, pin issue and replicated a code for annotation toolbar in different views.
    8fefb59f
    unknown authored
    2016-09-23 11:17:49 +0530  
    Browse File »

22 Sep, 2016
1 commit
  • Bug #8006:Setting> apply and ok buttons should work after the application is just loaded.
    5be15595
    Mitali Srivastava authored
    2016-09-22 17:22:58 +0530  
    Browse File »

15 Sep, 2016
4 commits
  • Merge branch 'bugs' into Develop
    7ee514de
    Nikita Kulshreshtha authored
    2016-09-15 18:13:37 +0530  
    Browse File »
  • renamed a variable which created issue. sometimes space is created between name. ...
    bd7fb618
    This created issue in opening view after closing jspanel sometimes.
    Nikita Kulshreshtha authored
    2016-09-15 15:51:05 +0530  
    Browse File »
  • loading icon was not visible on search and LM - Fixed.
    76312e57
    Nikita Kulshreshtha authored
    2016-09-15 15:12:44 +0530  
    Browse File »
  • After list manager load removed the wait cursor.
    168aa89c
    Nikita Kulshreshtha authored
    2016-09-15 11:53:08 +0530  
    Browse File »

14 Sep, 2016
1 commit
  • Commit changes for Issue ...
    29c622f5
    Issue #7184:User is unable to select any annotation from an image
    unknown authored
    2016-09-14 17:26:33 +0530  
    Browse File »

13 Sep, 2016
1 commit
  • #7642 , #6200
    15683ca1
    Mukul Rajput authored
    2016-09-13 11:26:26 +0530  
    Browse File »

12 Sep, 2016
2 commits
  • Modified HomeController file
    3e101343
    Amrita Vishnoi authored
    2016-09-12 13:59:52 +0530  
    Browse File »
  • tem changes
    40f57f51
    Amrita Vishnoi authored
    2016-09-12 13:49:20 +0530  
    Browse File »

09 Sep, 2016
3 commits
  • Merge branch 'Develop' of http://52.6.196.163/ADAM/AIAHTML5 into Annotation_Pencil ...
    5c7bfab2
    Conflicts:
    	400-SOURCECODE/AIAHTML5.Web/app/controllers/DAController.js
    	400-SOURCECODE/AIAHTML5.Web/app/controllers/HomeController.js
    	400-SOURCECODE/AIAHTML5.Web/index.html
    unknown authored
    2016-09-09 16:18:42 +0530  
    Browse File »
  • Implemented Text Area Edit, Identity and draw functionality.
    b402dbb3
    unknown authored
    2016-09-09 16:04:40 +0530  
    Browse File »
  • Commit changes for Ref: ...
    005e31fb
    Issue#7547 :Once the edit shape style popup is opened if user clicks and drag popup gets displaced from its original position.
    unknown authored
    2016-09-09 15:37:15 +0530  
    Browse File »

07 Sep, 2016
1 commit
  • commit after merge
    04a17755
    Nikita Kulshreshtha authored
    2016-09-07 15:10:11 +0530  
    Browse File »

02 Sep, 2016
1 commit
  • UserStory:2923 and bugs 6983 and 6980 and modifyxml utility added
    bea3d6cd
    Mitali Srivastava authored
    2016-09-02 18:43:08 +0530  
    Browse File »

01 Sep, 2016
11 commits
  • 1. bug 7245-list manager close on other button. ...
    a1525289
    2. code of extract after list manger sleection.
    3. crash issue logs and trial code
    Nikita Kulshreshtha authored
    2016-09-01 18:27:44 +0530  
    Browse File »
  • Added revised json files and some code in DAController and Home controller
    2410adf7
    Amrita Vishnoi authored
    2016-09-01 15:36:00 +0530  
    Browse File »
  • One fix related to navigator man settings fix
    bad813cc
    Amrita Vishnoi authored
    2016-09-01 14:07:57 +0530  
    Browse File »
  • DA updated and validated jsons. ...
    629d1743
    Homecontroller fix for setting after merge with branch DisableATBarOnPopUp
    Mitali Srivastava authored
    2016-09-01 13:33:56 +0530  
    Browse File »
  • AnnotationToolBar missing code merged in this.
    23a2156a
    Amrita Vishnoi authored
    2016-09-01 12:56:32 +0530  
    Browse File »
  • Merge branch 'DisableATBarOnPopUp' of http://52.6.196.163/ADAM/AIAHTML5 into Settingsfix ...
    e505ef83
    Conflicts:
    	400-SOURCECODE/AIAHTML5.Web/app/controllers/DAController.js
    Mitali Srivastava authored
    2016-09-01 12:46:16 +0530  
    Browse File »
  • After cherry pick of 3df42770ae i.e. fix for Bug 6983: Modesty change doesn't r… ...
    ec6ce39f
    …eflect on Navigator for the first time
    6980: Image doesn't update in Navigator
    Amrita Vishnoi authored
    2016-09-01 12:15:20 +0530  
    Browse File »
  • Merge branch 'DisableATBarOnPopUp' of http://52.6.196.163/ADAM/AIAHTML5 into Annotation_Pencil
    e5fea54e
    unknown authored
    2016-09-01 12:03:25 +0530  
    Browse File »
  • Commit changes for: ...
    f4b38866
    1)Edit TextArea
    2)Identify and draw option
    3)Increase pencil width
    unknown authored
    2016-09-01 12:01:58 +0530  
    Browse File »
  • commit after taking file from DisableATBarOnPopUp branch
    eb5fd6b2
    Amrita Vishnoi authored
    2016-09-01 11:12:44 +0530  
    Browse File »
  • unwanted commit
    3b6fce4d
    Amrita Vishnoi authored
    2016-09-01 11:01:18 +0530  
    Browse File »

31 Aug, 2016
3 commits
  • Merged EditShape_Modal_Changes branch and modified after code review
    5fc7c2b4
    Amrita Vishnoi authored
    2016-08-31 17:08:33 +0530  
    Browse File »
  • Merge branch 'blackIssueInTb' of http://52.6.196.163/ADAM/AIAHTML5 into Settingsfix
    9ac40e25
    Mitali Srivastava authored
    2016-08-31 16:28:11 +0530  
    Browse File »
  • Bug 6983: Modesty change doesn't reflect on Navigator for the first time ...
    3df42770
    2
    6980: Image doesn't update in Navigator
    Mitali Srivastava authored
    2016-08-31 13:46:51 +0530  
    Browse File »