Commit message (Expand) | Author | Age | ||
---|---|---|---|---|
... | ||||
| | | * | | | | | | | | | | | | | | | | | | 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 #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 | |
| * | | | | | | | | | | | | | | | | | | | | | | IKNINJA-1238 fix and fixing other js errors on switching and closing documents | Ananya Sen | 2012-03-06 | |
| * | | | | | | | | | | | | | | | | | | | | | | fixed picker address dropdown to backtrace till the logical drive | Ananya Sen | 2012-03-06 | |
| * | | | | | | | | | | | | | | | | | | | | | | IKNINJA-1207: added check for design view to fix js error | Ananya Sen | 2012-03-06 | |
| * | | | | | | | | | | | | | | | | | | | | | | Fixing WebGL not available bug | Jose Antonio Marquez | 2012-03-06 | |
| * | | | | | | | | | | | | | | | | | | | | | | Merge branch 'refs/heads/Ninja-Internal' into FileIO | Jose Antonio Marquez | 2012-03-06 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||
| * | | | | | | | | | | | | | | | | | | | | | | | Changing length of characters per line (pretty function) | Jose Antonio Marquez | 2012-03-06 | |
| * | | | | | | | | | | | | | | | | | | | | | | | CSS on CDN preview fix | Jose Antonio Marquez | 2012-03-05 | |
| * | | | | | | | | | | | | | | | | | | | | | | | Temp support for CDN CSS | Jose Antonio Marquez | 2012-03-05 | |
| * | | | | | | | | | | | | | | | | | | | | | | | Minor Fix | Jose Antonio Marquez | 2012-03-05 | |
| * | | | | | | | | | | | | | | | | | | | | | | | Fixed URL parsing issue on actual opened document | Jose Antonio Marquez | 2012-03-05 | |
| * | | | | | | | | | | | | | | | | | | | | | | | Resolved URL path issues in document and CSS | Jose Antonio Marquez | 2012-03-05 | |
| * | | | | | | | | | | | | | | | | | | | | | | | Setting up document level URL parsing | Jose Antonio Marquez | 2012-03-04 | |
| * | | | | | | | | | | | | | | | | | | | | | | | Improved CSS URL cleaned | Jose Antonio Marquez | 2012-03-04 | |
| * | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'refs/heads/Ninja-Internal' into FileIO | Jose Antonio Marquez | 2012-03-02 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||
| * | | | | | | | | | | | | | | | | | | | | | | | | Minor logic fixes for URL resolution in CSS | Jose Antonio Marquez | 2012-03-02 | |
| * | | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'refs/heads/Ninja-Internal' into FileIO | Jose Antonio Marquez | 2012-03-02 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||
| * | | | | | | | | | | | | | | | | | | | | | | | | | Fixing CSS URL issues | Jose Antonio Marquez | 2012-03-02 | |
| * | | | | | | | | | | | | | | | | | | | | | | | | | Fixing IO RegEx | Jose Antonio Marquez | 2012-03-02 | |
| * | | | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'refs/heads/Ninja-Internal' into FileIO | Jose Antonio Marquez | 2012-03-01 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||
| * | | | | | | | | | | | | | | | | | | | | | | | | | | Optimizing URL intercepting detection | Jose Antonio Marquez | 2012-03-01 | |
| * | | | | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'refs/heads/ninja-internal-master' into FileIO | Ananya Sen | 2012-02-29 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ | | |/| | | | | | | | | | | | | | | | | | | | | | | | | ||||