[Pkg-javascript-commits] [backbone] 136/211: resolving merge

[Jonas Smedegaard]

This is an automated email from the git hooks/post-receive script.

js pushed a commit to tag 0.5.0
in repository backbone.

commit db68321ebbc6f1ebae735d2d566b03e5f0e26943
Merge: c9bf20e 35ba4a9
Author: Jeremy Ashkenas <jashkenas at gmail.com>
Date:   Wed Apr 27 21:19:02 2011 -0400

    resolving merge

 docs/images/flow.png | Bin 0 -> 155078 bytes
 index.html           |  14 ++++++++++++++
 2 files changed, 14 insertions(+)

diff --cc index.html
index 84aadc3,4d83bf6..9a6a875
--- a/index.html
+++ b/index.html
@@@ -272,9 -272,9 +272,10 @@@
        <li>– <a href="#examples-todos">Todos</a></li>
        <li>– <a href="#examples-documentcloud">DocumentCloud</a></li>
        <li>– <a href="#examples-basecamp">Basecamp Mobile</a></li>
+       <li>– <a href="#examples-flow">Flow</a></li>
 -      <li>– <a href="#examples-tilemill">TileMill</a></li>
 +      <li>– <a href="#examples-cloudapp">CloudApp</a></li>
        <li>– <a href="#examples-soundcloud">Mobile SoundCloud</a></li>
 +      <li>– <a href="#examples-tilemill">TileMill</a></li>
        <li>- <a href="#examples-instagreat">Insta-great!</a></li>
        <li>- <a href="#examples-quietwrite">QuietWrite</a></li>
        <li>- <a href="#examples-tzigla">Tzigla</a></li>
@@@ -1853,15 -1853,28 +1854,28 @@@ var DocumentView = Backbone.View.extend
        </a>
      </div>
      
+     <p id="examples-flow">
+       <a href="http://www.metalabdesign.com/">MetaLab</a> used Backbone.js to create
+       <a href="http://www.getflow.com/">Flow</a>, a task management app for teams. The
+       workspace relies on Backbone.js to construct task views, activities, accounts, 
+       folders, projects, and tags. You can see the internals under <tt>window.Flow</tt>.
+     </p>
+ 
+     <div style="text-align: center;">
+       <a href="http://www.getflow.com/">
+         <img src="docs/images/flow.png" alt="Flow" class="example_image" />
+       </a>
+     </div>
 -
 -    <p id="examples-tilemill">
 -      Our fellow
 -      <a href="http://www.newschallenge.org/">Knight Foundation News Challenge</a>
 -      winners, <a href="http://mapbox.com/">MapBox</a>, created an open-source
 -      map design studio with Backbone.js:
 -      <a href="http://mapbox.github.com/tilemill/">TileMill</a>.
 -      TileMill lets you manage map layers based on shapefiles and rasters, and
 -      edit their appearance directly in the browser with the
 -      <a href="https://github.com/mapbox/carto">Carto styling language</a>.
++    
 +    <p id="examples-cloudapp">
 +      <a href="http://getcloudapp.com">CloudApp</a> is simple file and link 
 +      sharing for the Mac. Backbone.js powers the web tools
 +      which consume the <a href="http://developer.getcloudapp.com">documented API</a> 
 +      to manage Drops. Data is either pulled manually or pushed by 
 +      <a href="http://pusher.com">Pusher</a> and fed to 
 +      <a href="http://github.com/janl/mustache.js">Mustache</a> templates for 
 +      rendering. Check out the <a href="http://cloudapp.github.com/engine">annotated source code</a> 
 +      to see the magic.
      </p>
  
      <div style="text-align: center;">

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-javascript/backbone.git