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
20 Jan, 2017
1 commit
  • this is for close annotation model sketch brush must not work
    febe4c27
    Mukul Rajput authored
    2017-01-20 12:12:53 +0530  
    Browse File »

19 Jan, 2017
2 commits
  • removed one extra function
    7e6d4d67
    Amrita Vishnoi authored
    2017-01-19 11:01:52 +0530  
    Browse File »
  • for now the modules are hard coded as earlier and bypasses login. ...
    5705d96e
    This will be back once the remote mongoDB conenction issue is fixed.
    Nikita Kulshreshtha authored
    2017-01-19 10:32:58 +0530  
    Browse File »

18 Jan, 2017
1 commit
  • handled cases for login
    b3511541
    Nikita Kulshreshtha authored
    2017-01-18 15:44:39 +0530  
    Browse File »

17 Jan, 2017
4 commits
  • login integration
    7ab9aefb
    Amrita Vishnoi authored
    2017-01-17 16:34:59 +0530  
    Browse File »
  • Against merge request: #287
    698d8c3a
    Amrita Vishnoi authored
    2017-01-17 16:07:42 +0530  
    Browse File »
  • Refs: #10873
    7e795a1b
    Utkarsh Singh authored
    2017-01-17 15:20:14 +0530  
    Browse File »
  • Refs : #10871
    e2e5b717
    Utkarsh Singh authored
    2017-01-17 12:32:29 +0530  
    Browse File »

16 Jan, 2017
8 commits
  • Against Merge Request : #274
    9e7890ba
    Amrita Vishnoi authored
    2017-01-16 16:34:24 +0530  
    Browse File »
  • Merge branch 'brushopacity' of http://52.6.196.163/ADAM/AIAHTML5 into Develop-16Jan2017
    adbef95c
    Amrita Vishnoi authored
    2017-01-16 15:34:18 +0530  
    Browse File »
  • 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
9 commits
  • commit changes for Bug #12596:DA > Annotation Toolbar > If Fill Option and Outli… ...
    54e1c49e
    …ne option are unchecked and user click on Cancel button. Changes should be discard.
    unknown authored
    2017-01-12 17:11:49 +0530  
    Browse File »
  • login and dynamic modules
    8845454a
    Nikita Kulshreshtha authored
    2017-01-12 15:17:06 +0530  
    Browse File »
  • this is for opacity on brush draw sketch
    9bd18a5a
    Mukul Rajput authored
    2017-01-12 13:08:13 +0530  
    Browse File »
  • 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 »
  • Merge branch 'Develop' of http://52.6.196.163/ADAM/AIAHTML5 into Bugs_v17 ...
    9eeccea8
    # Conflicts:
    #	400-SOURCECODE/AIAHTML5.Web/app/controllers/HomeController.js
    unknown authored
    2017-01-12 12:02:25 +0530  
    Browse File »
  • Commit changes for Bug #12596:DA > Annotation Toolbar > If Fill Option and Outli… ...
    0ef23937
    …ne option are unchecked and user click on Cancel button. Changes should be discard.
    unknown authored
    2017-01-12 11:57:15 +0530  
    Browse File »

11 Jan, 2017
2 commits
  • 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 »
  • working code for login and dynamic modules. ...
    7be3ebe4
    only those modules are not showing which are not merged.
    when click on DA module all moduels get seleted. need to reslove
    Nikita Kulshreshtha authored
    2017-01-11 13:25:40 +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
5 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 »