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
16 Jan, 2017
6 commits
  • Merge branch 'mouseuperaseiconblack' of http://52.6.196.163/ADAM/AIAHTML5 into Develop-16Jan2017
    00a807c8
    Amrita Vishnoi authored
    2017-01-16 15:23:29 +0530  
    Browse File »
  • against merge request: #269
    5fda215d
    Amrita Vishnoi authored
    2017-01-16 15:20:44 +0530  
    Browse File »
  • Merge branch 'MergingHistoryCodeinDevelop' of http://52.6.196.163/ADAM/AIAHTML5 … ...
    807d21d6
    …into Develop-16Jan2017
    Amrita Vishnoi authored
    2017-01-16 12:44:57 +0530  
    Browse File »
  • removed comment from wrong place
    10873ab1
    Amrita Vishnoi authored
    2017-01-16 12:21:24 +0530  
    Browse File »
  • Merged code against closed request ID: #258
    fa8f0546
    Amrita Vishnoi authored
    2017-01-16 11:39:20 +0530  
    Browse File »
  • Commit Changes
    bee21369
    unknown authored
    2017-01-16 11:30:19 +0530  
    Browse File »

13 Jan, 2017
1 commit
  • Commit Changes For History Code
    c15dd72d
    unknown authored
    2017-01-13 15:11:40 +0530  
    Browse File »

12 Jan, 2017
4 commits
  • this is for mouse release erase icon must be black
    482ad256
    Mukul Rajput authored
    2017-01-12 12:49:58 +0530  
    Browse File »
  • this is for erase button and brush icon must be black
    3e7c3726
    Mukul Rajput authored
    2017-01-12 12:35:17 +0530  
    Browse File »
  • Merge branch 'RectangleResizingIssue' into Develop
    acd0e040
    Amrita Vishnoi authored
    2017-01-12 12:33:51 +0530  
    Browse File »
  • Merge branch 'ColorIssueInEditPopup' into Develop
    9c2ad1d7
    Amrita Vishnoi authored
    2017-01-12 12:20:24 +0530  
    Browse File »

11 Jan, 2017
1 commit
  • DA > Annotation Toolbar > Default color "White" in Fill Option and "Black" in Ou… ...
    f455b7ba
    …tline Option is display in the below mention case.
    unknown authored
    2017-01-11 13:27:13 +0530  
    Browse File »

10 Jan, 2017
2 commits
  • Rectangle resizing issue resolved
    46998b12
    unknown authored
    2017-01-10 17:48:25 +0530  
    Browse File »
  • Merged Code With Stable Code
    c105cbda
    unknown authored
    2017-01-10 16:00:40 +0530  
    Browse File »

09 Jan, 2017
5 commits
  • Merge branch 'CICAMenu' into Develop
    532e67d4
    Nikita Kulshreshtha authored
    2017-01-09 17:48:23 +0530  
    Browse File »
  • Removed comments
    bbee54b3
    Utkarsh Singh authored
    2017-01-09 16:16:14 +0530  
    Browse File »
  • Bug#11539 fixes
    54b0692c
    Amrita Vishnoi authored
    2017-01-09 15:54:45 +0530  
    Browse File »
  • Refs: #10207 (Export Image implementation)
    ff6b10c7
    Utkarsh Singh authored
    2017-01-09 15:23:57 +0530  
    Browse File »
  • Bug #10201: Menu > Options ----> List Manger and Add to Existing Curriculum shou… ...
    09ecfd7d
    …ld be disable on CI and CA Detail page.
    Mitali Srivastava authored
    2017-01-09 13:43:26 +0530  
    Browse File »

06 Jan, 2017
9 commits
  • Merge branch 'cinewerase' into Develop
    7e3fe013
    Amrita Vishnoi authored
    2017-01-06 18:28:03 +0530  
    Browse File »
  • Merge branch 'AnnotationDawingDetectMode_Merge' into Develop
    6f506a63
    Nikita Kulshreshtha authored
    2017-01-06 17:54:48 +0530  
    Browse File »
  • merged AnnotationDawingDetectMode and renamed varibales
    6b9edcfe
    Nikita Kulshreshtha authored
    2017-01-06 17:51:01 +0530  
    Browse File »
  • Fixed Line issue in IE
    6f8c4019
    Amrita Vishnoi authored
    2017-01-06 17:34:35 +0530  
    Browse File »
  • renamed variables
    6b654e27
    Amrita Vishnoi authored
    2017-01-06 16:34:44 +0530  
    Browse File »
  • Renamed one more function
    1e62cb2c
    Amrita Vishnoi authored
    2017-01-06 16:23:08 +0530  
    Browse File »
  • Fixed after conflict resolve
    538312a1
    Amrita Vishnoi authored
    2017-01-06 16:03:25 +0530  
    Browse File »
  • Renamed the function names
    5c37396d
    Amrita Vishnoi authored
    2017-01-06 15:52:11 +0530  
    Browse File »
  • merged Bugs_v10 into develop
    05cbcd96
    Nikita Kulshreshtha authored
    2017-01-06 12:54:45 +0530  
    Browse File »

05 Jan, 2017
1 commit
  • this is ci erase tool functionality
    020abb71
    Mukul Rajput authored
    2017-01-05 16:19:04 +0530  
    Browse File »

29 Dec, 2016
1 commit
  • Commit changes for Issue Ref: #12221:DA > Annotation Toolbar > If Outline option… ...
    90ed96ca
    … is unchecked, and user draw the shapes. Outline is display on the shapes.
    unknown authored
    2016-12-29 12:15:57 +0530  
    Browse File »

22 Dec, 2016
1 commit
  • Merge branch 'Develop' of http://52.6.196.163/ADAM/AIAHTML5 into Bugs_v13 ...
    ab08335b
    # Conflicts:
    #	400-SOURCECODE/AIAHTML5.Web/app/controllers/HomeController.js
    #	400-SOURCECODE/AIAHTML5.Web/index.html
    unknown authored
    2016-12-22 11:55:57 +0530  
    Browse File »

21 Dec, 2016
2 commits
  • this is for ie outline with color and size annotation image
    35695cde
    Mukul Rajput authored
    2016-12-21 15:54:13 +0530  
    Browse File »
  • Commit Changes for textarea
    b51b2ae2
    unknown authored
    2016-12-21 11:56:17 +0530  
    Browse File »

19 Dec, 2016
3 commits
  • Commit Changes
    38fa0efb
    unknown authored
    2016-12-19 15:22:59 +0530  
    Browse File »
  • Merge branch 'Develop' of http://52.6.196.163/ADAM/AIAHTML5 into AnnotationDawingDetectMode ...
    582dbc1f
    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-12-19 11:37:51 +0530  
    Browse File »
  • Annotation: User should be able to see what he/she drawing
    2fdee721
    unknown authored
    2016-12-19 11:27:36 +0530  
    Browse File »

16 Dec, 2016
1 commit
  • Merge branch 'Erasetoolfunctionality' into Develop
    7cca942d
    Nikita Kulshreshtha authored
    2016-12-16 12:07:09 +0530  
    Browse File »

13 Dec, 2016
3 commits
  • after changing code for modesty. Navigator image was not reflected on skintone/ modesty change. ...
    0a6e382d
    Remove angular binding from navImg and added src attribute when we get nav image src.
    Also added new event for changing Nav image on modesty change only.
    Nikita Kulshreshtha authored
    2016-12-13 18:18:12 +0530  
    Browse File »
  • DA > Annotation search from Search List is not highlight in the List manager.
    ac503277
    unknown authored
    2016-12-13 15:42:46 +0530  
    Browse File »
  • Merge branch 'Develop' of http://52.6.196.163/ADAM/AIAHTML5 into Bugs_v10 ...
    868ce8d7
    # Conflicts:
    #	400-SOURCECODE/AIAHTML5.Web/app/controllers/HomeController.js
    #	400-SOURCECODE/AIAHTML5.Web/index.html
    unknown authored
    2016-12-13 12:33:30 +0530  
    Browse File »