aboutsummaryrefslogtreecommitdiff
path: root/js
Commit message (Expand)AuthorAge
...
| | | | * | | | | | | | | | | | | | | | | | 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
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | | | | Changing length of characters per line (pretty function)Jose Antonio Marquez2012-03-06
| * | | | | | | | | | | | | | | | | | | | | | | CSS on CDN preview fixJose Antonio Marquez2012-03-05
| * | | | | | | | | | | | | | | | | | | | | | | Temp support for CDN CSSJose Antonio Marquez2012-03-05
| * | | | | | | | | | | | | | | | | | | | | | | Minor FixJose Antonio Marquez2012-03-05
| * | | | | | | | | | | | | | | | | | | | | | | Fixed URL parsing issue on actual opened documentJose Antonio Marquez2012-03-05
| * | | | | | | | | | | | | | | | | | | | | | | Resolved URL path issues in document and CSSJose Antonio Marquez2012-03-05
| * | | | | | | | | | | | | | | | | | | | | | | Setting up document level URL parsingJose Antonio Marquez2012-03-04
| * | | | | | | | | | | | | | | | | | | | | | | Improved CSS URL cleanedJose Antonio Marquez2012-03-04
| * | | | | | | | | | | | | | | | | | | | | | | Merge branch 'refs/heads/Ninja-Internal' into FileIOJose Antonio Marquez2012-03-02
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | | | | | Minor logic fixes for URL resolution in CSSJose Antonio Marquez2012-03-02
| * | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'refs/heads/Ninja-Internal' into FileIOJose Antonio Marquez2012-03-02
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | | | | | | Fixing CSS URL issuesJose Antonio Marquez2012-03-02
| * | | | | | | | | | | | | | | | | | | | | | | | | Fixing IO RegExJose Antonio Marquez2012-03-02
| * | | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'refs/heads/Ninja-Internal' into FileIOJose Antonio Marquez2012-03-01
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | | | | | | | Optimizing URL intercepting detectionJose Antonio Marquez2012-03-01
| * | | | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'refs/heads/ninja-internal-master' into FileIOAnanya Sen2012-02-29
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ | | |/| | | | | | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'refs/heads/ninja-internal-master' into FileIOAnanya Sen2012-02-29
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \