aboutsummaryrefslogtreecommitdiff
path: root/js/controllers
Commit message (Expand)AuthorAge
* Merge branch 'refs/heads/master' into bindingArmen Kesablyan2012-06-25
|\
| * Merge branch 'refs/heads/ninja-internal-master' into cut-copy-pasteAnanya Sen2012-06-21
| |\
| * | - added io api to generate file from binaryAnanya Sen2012-06-21
| * | Notify for adding multiple elements together, to fix IKNINJA-1775 [Drawing a ...Ananya Sen2012-06-20
| * | adding some error handlingAnanya Sen2012-06-19
| * | parse html in memory, instead of using a doom elementAnanya Sen2012-06-19
| * | Merge branch 'refs/heads/ninja-internal-master' into cut-copy-pasteAnanya Sen2012-06-19
| |\ \
| * | | start pasting in-place for cut/pasteAnanya Sen2012-06-18
| * | | Fixed - IKNINJA-1748 - While pasting text in any text field in the PI, the te...Ananya Sen2012-06-15
| * | | - Eric Guzman's styles-controller fix for relatively positionedAnanya Sen2012-06-13
| * | | - eric gunman's fix for styles-controller - select the appropriate override r...Ananya Sen2012-06-13
| * | | displace pasted object only if the position is absoluteAnanya Sen2012-06-13
| * | | Merge branch 'refs/heads/ninja-internal-master' into cut-copy-pasteAnanya Sen2012-06-12
| |\ \ \
| * | | | patse raw image data to stageAnanya Sen2012-06-12
| * | | | - removed extra selection change event,Ananya Sen2012-06-11
| * | | | Merge branch 'refs/heads/ninja-internal-master' into cut-copy-pasteAnanya Sen2012-06-08
| |\ \ \ \
| * | | | | - fixed multiple paste displacementAnanya Sen2012-06-08
| * | | | | Merge branch 'refs/heads/ninja-internal-master' into cut-copy-pasteAnanya Sen2012-06-07
| |\ \ \ \ \
| * | | | | | - cleanse html for copying from outer applicationAnanya Sen2012-06-07
| * | | | | | cut/paste for canvas objects and for multiple selected objects of mixed typesAnanya Sen2012-06-04
| * | | | | | Merge branch 'refs/heads/ninja-internal-master' into cut-copy-pasteAnanya Sen2012-06-04
| |\ \ \ \ \ \
| * | | | | | | cut/paste html elements in single documentAnanya Sen2012-06-01
| * | | | | | | Merge branch 'refs/heads/ninja-internal-master' into cut-copy-pasteAnanya Sen2012-05-31
| |\ \ \ \ \ \ \
| * | | | | | | | select all pasted elementsAnanya Sen2012-05-29
| * | | | | | | | copy/paste of multiple div and canvas elements doneAnanya Sen2012-05-28
| * | | | | | | | multiple objects copy/paste - in progressAnanya Sen2012-05-25
| * | | | | | | | - multiple element copy/paste - in progressAnanya Sen2012-05-24
| * | | | | | | | cleanupAnanya Sen2012-05-17
| * | | | | | | | copy/paste single webGL shapeAnanya Sen2012-05-16
| * | | | | | | | single selection copy/paste canvas 2d shapes [rectangle and circle]Ananya Sen2012-05-16
| * | | | | | | | Prototype of copy and pasting basic html elements.Ananya Sen2012-05-11
| * | | | | | | | Merge branch 'refs/heads/ninja-internal-master' into cut-copy-pasteAnanya Sen2012-05-08
| |\ \ \ \ \ \ \ \
| * | | | | | | | | removed unnecessary functionAnanya Sen2012-05-08
| * | | | | | | | | copy/paste POCAnanya Sen2012-05-07
* | | | | | | | | | Binding View :Requested Changes for Pull RequestArmen Kesablyan2012-06-21
* | | | | | | | | | Merge branch 'refs/heads/master' into bindingArmen Kesablyan2012-06-21
|\ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|/ | |/| | | | | | | |
| * | | | | | | | | remove old methodJonathan Duran2012-06-20
| * | | | | | | | | remove unneeded filesJonathan Duran2012-06-20
| * | | | | | | | | Merge branch 'refs/heads/NINJAmaster' into TimelineUberJonathan Duran2012-06-19
| |\ \ \ \ \ \ \ \ \ | | | |_|_|_|_|_|_|/ | | |/| | | | | | |
| * | | | | | | | | Merge branch 'refs/heads/NINJAmaster' into TimelineUberJonathan Duran2012-06-18
| |\ \ \ \ \ \ \ \ \
| * | | | | | | | | | Timeline: Replace currentSelectedContainer with new model.domContainer.Jon Reid2012-06-15
| * | | | | | | | | | Merge remote-tracking branch 'ninja-internal/master' into test-mergeJon Reid2012-06-15
| |\ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ Merge branch 'refs/heads/TimelineUberjd' into TimelineUberKruti Shah2012-06-12
| |\ \ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ \ Merge branch 'refs/heads/NINJAmaster' into TimelineUberJonathan Duran2012-06-11
| | |\ \ \ \ \ \ \ \ \ \ \ | | | | |_|_|_|_|_|_|_|/ / | | | |/| | | | | | | | |
| | * | | | | | | | | | | Merge branch 'refs/heads/NINJAmaster' into TimelineUberJonathan Duran2012-06-06
| | |\ \ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ \ \ Merge branch 'refs/heads/NINJAmaster' into TimelineUberJonathan Duran2012-06-05
| | |\ \ \ \ \ \ \ \ \ \ \ \ | | | | |_|_|_|_|_|_|_|/ / / | | | |/| | | | | | | | | |
| * | | | | | | | | | | | | Sub PropsKruti Shah2012-06-12
| * | | | | | | | | | | | | Color chip in TPKruti Shah2012-06-08
| * | | | | | | | | | | | | Color ChipKruti Shah2012-05-31
| |/ / / / / / / / / / / /
| * | | | | | | | | | | | Merge branch 'refs/heads/NINJAmaster' into TimelineUberJonathan Duran2012-05-31
| |\ \ \ \ \ \ \ \ \ \ \ \ | | | |_|_|_|_|_|_|_|/ / / | | |/| | | | | | | | | |
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-22 18:23:45 +0000