Commit message (Expand) | Author | Age | ||
---|---|---|---|---|
... | ||||
| * | | | | | | | | | | | | | | | | | | | | | Merge pull request #104 from ananyasen/integration-candidate | Valerio Virgillito | 2012-03-08 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||
| | * | | | | | | | | | | | | | | | | | | | | | IKNINJA-1270: fixed browser crashing when you close a document while playing ... | Ananya Sen | 2012-03-08 | |
| |/ / / / / / / / / / / / / / / / / / / / / | ||||
| * | | | | | | | | | | | | | | | | | | | | | Merge pull request #100 from imix23ways/TimelineUber | Valerio Virgillito | 2012-03-08 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||
| | * | | | | | | | | | | | | | | | | | | | | | Timeline Bug Fix: IKNINJA-1283 | Kruti Shah | 2012-03-07 | |
| | * | | | | | | | | | | | | | | | | | | | | | Merge branch 'refs/heads/Timeline-b4-latest' into TimelineUber | Jonathan Duran | 2012-03-06 | |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||
| | | * | | | | | | | | | | | | | | | | | | | | | Timeline: Storing Hashtable for element Mapping | Kruti Shah | 2012-03-06 | |
| | | * | | | | | | | | | | | | | | | | | | | | | Timeline:Storing HashTable for switching docs | Kruti Shah | 2012-03-06 | |
| | | * | | | | | | | | | | | | | | | | | | | | | Timeline: Fixing the layer switching | Kruti Shah | 2012-03-05 | |
| | | * | | | | | | | | | | | | | | | | | | | | | Timeline: Removing Events for Adding and Deleting Layer, Taking care of Bread... | Kruti Shah | 2012-03-05 | |
| | | * | | | | | | | | | | | | | | | | | | | | | Merge branch 'refs/heads/TimelineUber' into Timeline-b4-latest | Kruti Shah | 2012-03-05 | |
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||
| | * | \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'Timeline-uber' into timeline-serialized | Jon Reid | 2012-03-06 | |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||
| | | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge remote-tracking branch 'ninja-jduran/TimelineUber' into Timeline-uber | Jon Reid | 2012-03-06 | |
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||
| | | | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'refs/heads/NINJAmaster' into TimelineUber | Jonathan Duran | 2012-03-06 | |
| | | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||
| | * | | | | | | | | | | | | | | | | | | | | | | | | | | Timeline: Code cleanup. Fix bug with unfound property in serialization. | Jon Reid | 2012-03-06 | |
| | * | | | | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'Timeline-uber' into timeline-serialized | Jon Reid | 2012-03-06 | |
| | |\| | | | | | | | | | | | | | | | | | | | | | | | | | ||||
| | | * | | | | | | | | | | | | | | | | | | | | | | | | | Merge remote-tracking branch 'ninja-jduran/TimelineUber' into Timeline-uber | Jon Reid | 2012-03-06 | |
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||
| | | | * | | | | | | | | | | | | | | | | | | | | | | | | | Squashed commit of the following: | Jonathan Duran | 2012-03-06 | |
| | | | |/ / / / / / / / / / / / / / / / / / / / / / / / | ||||
| | | * | | | | | | | | | | | | | | | | | | | | | | | | | Merge remote-tracking branch 'ninja-jduran/TimelineUber' into Timeline-uber | Jon Reid | 2012-03-02 | |
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | |_|_|/ / / / / / / / / / / / / / / / / / / / / | | | | |/| | | | | | | | | | | | | | | | | | | | | | | | ||||
| | * | | | | | | | | | | | | | | | | | | | | | | | | | | Merge remote-tracking branch 'ninja-jduran/TimelineUber' into timeline-serial... | Jon Reid | 2012-03-02 | |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | |/ / / / / / / / / / / / / / / / / / / / / / / / | | | |/| | | | | | | | | | | | | | | | | | | | | | | | | ||||
| | * | | | | | | | | | | | | | | | | | | | | | | | | | | Timeline: Serialization of all Collapser components | Jon Reid | 2012-03-02 | |
| | | |/ / / / / / / / / / / / / / / / / / / / / / / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | ||||
| | * | | | | | | | | | | | | | | | | | | | | | | | | | Timeline: Fix TODOs for consolidating repetition objects. | Jon Reid | 2012-03-02 | |
| | | |_|_|/ / / / / / / / / / / / / / / / / / / / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | ||||
| * | | | | | | | | | | | | | | | | | | | | | | | | | Merge pull request #103 from joseeight/FileIO-Build-Candidate | Valerio Virgillito | 2012-03-07 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|/ / / / / / / / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | ||||
* | | | | | | | | | | | | | | | | | | | | | | | | | | Merge pull request #30 from ananyasen/FileIO-ananya | Jose Antonio Marquez Russo | 2012-03-08 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'refs/heads/FileIO-jose' into FileIO-ananya | Ananya Sen | 2012-03-08 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / / / / / / / / / / / / / / / / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | ||||
| * | | | | | | | | | | | | | | | | | | | | | | | | | | null the arrays on all documents closed, so that they get garbage collected | Ananya Sen | 2012-03-08 | |
| * | | | | | | | | | | | | | | | | | | | | | | | | | | minor fixes | Ananya Sen | 2012-03-07 | |
| * | | | | | | | | | | | | | | | | | | | | | | | | | | added close file menu item | Ananya Sen | 2012-03-06 | |
| * | | | | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'refs/heads/FileIO-jose' into FileIO-ananya | Ananya Sen | 2012-03-06 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / / / / / / / / / / / / / / / / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | ||||
| * | | | | | | | | | | | | | | | | | | | | | | | | | | removed unnecessary console logs | Ananya Sen | 2012-03-06 | |
| * | | | | | | | | | | | | | | | | | | | | | | | | | | IKNINJA-1270: fixed browser crashing when you close a document while playing ... | Ananya Sen | 2012-03-06 | |
| * | | | | | | | | | | | | | | | | | | | | | | | | | | updated file picker image icons | Ananya Sen | 2012-03-06 | |
| * | | | | | | | | | | | | | | | | | | | | | | | | | | - detect document style edit [with Eric's input for styles-controller.js] | Ananya Sen | 2012-03-06 | |
| * | | | | | | | | | | | | | | | | | | | | | | | | | | IKNINJA-1256 fix - needed to convert String object to string | Ananya Sen | 2012-03-06 | |
| * | | | | | | | | | |