aboutsummaryrefslogtreecommitdiff
path: root/js
Commit message (Expand)AuthorAge
* Merge branch 'FileIO-Integration' of github.com:joseeight/ninja-internal into...hwc4872012-03-09
|\
| * Clean upJose Antonio Marquez2012-03-09
| * Merge pull request #32 from ericmueller/integrationJose Antonio Marquez Russo2012-03-09
| |\
| * | Adding missing file for webGL, still need a fix for runtimeJose Antonio Marquez2012-03-09
* | | further removal of authortime asset path replacement.hwc4872012-03-09
| |/ |/|
* | Removed asset path replacement at authortime.hwc4872012-03-09
|/
* Adding webGL I/O runtime functionalityJose Antonio Marquez2012-03-09
* Merge branch 'refs/heads/integration' into FileIO-IntegrationJose Antonio Marquez2012-03-09
|\
| * Canvas IOhwc4872012-03-08
* | Merge branch 'refs/heads/Ninja-Internal' into FileIOJose Antonio Marquez2012-03-08
|\ \
| * \ Merge pull request #102 from dhg637/PanelsValerio Virgillito2012-03-08
| |\ \
| | * | Disabled state for panelsArmen Kesablyan2012-03-07
| | * | Reordering and resizing now worksArmen Kesablyan2012-03-07
| | * | Fixed: Collapsed panels would collapse panels belowArmen Kesablyan2012-03-07
| | * | Fixed Collapsing and resizing window with panelsArmen Kesablyan2012-03-07
| * | | IKNINJA-1270: fixed browser crashing when you close a document while playing ...Ananya Sen2012-03-08
| * | | Merge pull request #100 from imix23ways/TimelineUberValerio Virgillito2012-03-08
| |\ \ \
| | * | | Timeline Bug Fix: IKNINJA-1283Kruti Shah2012-03-07
| | * | | Merge branch 'refs/heads/Timeline-b4-latest' into TimelineUberJonathan Duran2012-03-06
| | |\ \ \
| | | * | | Timeline: Storing Hashtable for element MappingKruti Shah2012-03-06
| | | * | | Timeline:Storing HashTable for switching docsKruti Shah2012-03-06
| | | * | | Timeline: Fixing the layer switchingKruti Shah2012-03-05
| | | * | | Timeline: Removing Events for Adding and Deleting Layer, Taking care of Bread...Kruti Shah2012-03-05
| | * | | | Merge branch 'Timeline-uber' into timeline-serializedJon Reid2012-03-06
| | |\ \ \ \
| | | * \ \ \ Merge remote-tracking branch 'ninja-jduran/TimelineUber' into Timeline-uberJon Reid2012-03-06
| | | |\ \ \ \
| | | | * \ \ \ Merge branch 'refs/heads/NINJAmaster' into TimelineUberJonathan Duran2012-03-06
| | | | |\ \ \ \
| | * | | | | | | Timeline: Code cleanup. Fix bug with unfound property in serialization.Jon Reid2012-03-06
| | * | | | | | | Merge branch 'Timeline-uber' into timeline-serializedJon Reid2012-03-06
| | |\| | | | | |
| | | * | | | | | Merge remote-tracking branch 'ninja-jduran/TimelineUber' into Timeline-uberJon Reid2012-03-06
| | | |\ \ \ \ \ \
| | | | * | | | | | Squashed commit of the following:Jonathan Duran2012-03-06
| | | | |/ / / / /
| | | * | | | | | Merge remote-tracking branch 'ninja-jduran/TimelineUber' into Timeline-uberJon Reid2012-03-02
| | | |\ \ \ \ \ \ | | | | | |_|/ / / | | | | |/| | | |
| | * | | | | | | Merge remote-tracking branch 'ninja-jduran/TimelineUber' into timeline-serial...Jon Reid2012-03-02
| | |\ \ \ \ \ \ \ | | | | |/ / / / / | | | |/| | | | |
| | * | | | | | | Timeline: Serialization of all Collapser componentsJon Reid2012-03-02
| | | |/ / / / / | | |/| | | | |
| | * | | | | | Timeline: Fix TODOs for consolidating repetition objects.Jon Reid2012-03-02
* | | | | | | | Merge pull request #30 from ananyasen/FileIO-ananyaJose Antonio Marquez Russo2012-03-08
|\ \ \ \ \ \ \ \
| * | | | | | | | Merge branch 'refs/heads/FileIO-jose' into FileIO-ananyaAnanya Sen2012-03-08
| |\| | | | | | |
| * | | | | | | | null the arrays on all documents closed, so that they get garbage collectedAnanya Sen2012-03-08
| * | | | | | | | minor fixesAnanya Sen2012-03-07
| * | | | | | | | added close file menu itemAnanya Sen2012-03-06
| * | | | | | | | Merge branch 'refs/heads/FileIO-jose' into FileIO-ananyaAnanya Sen2012-03-06
| |\ \ \ \ \ \ \ \ | | | |_|_|_|_|/ / | | |/| | | | | |
| * | | | | | | | removed unnecessary console logsAnanya Sen2012-03-06
| * | | | | | | | IKNINJA-1270: fixed browser crashing when you close a document while playing ...Ananya Sen2012-03-06
| * | | | | | | | updated file picker image iconsAnanya Sen2012-03-06
| * | | | | | | | - detect document style edit [with Eric's input for styles-controller.js]Ananya Sen2012-03-06
| * | | | | | | | IKNINJA-1256 fix - needed to convert String object to stringAnanya Sen2012-03-06
| * | | | | | | | IKNINJA-1238 fix and fixing other js errors on switching and closing documentsAnanya Sen2012-03-06
| * | | | | | | | fixed picker address dropdown to backtrace till the logical driveAnanya Sen2012-03-06
| * | | | | | | | IKNINJA-1207: added check for design view to fix js errorAnanya Sen2012-03-06
| * | | | | | | | Fixing WebGL not available bugJose Antonio Marquez2012-03-06
| * | | | | | | | Merge branch 'refs/heads/Ninja-Internal' into FileIOJose Antonio Marquez2012-03-06
| |\ \ \ \ \ \ \ \