Skip to content

Commit

Permalink
Merge in bmeurer's web controller changes.
Browse files Browse the repository at this point in the history
  • Loading branch information
jverkoey committed Aug 19, 2011
1 parent e324942 commit 880cdf2
Show file tree
Hide file tree
Showing 3 changed files with 25 additions and 4 deletions.
1 change: 1 addition & 0 deletions AUTHORS
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@ Nimbus Authors
The following people have contributed their time and effort to the Nimbus framework:

Roger Chapman gh:rogchap
Benedikt Meurer gh:bmeurer
Anderson Miller gh:candersonmiller
Peter Steinberger gh:steipete
Jeff Verkoeyen gh:jverkoey @featherless (project founder)
Expand Down
6 changes: 3 additions & 3 deletions README.mdown
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ to understand.

- Start by exploring the "Getting Started" <a href="https://github.com/jverkoey/nimbus/tree/master/examples/gettingstarted">example applications</a>.
- Follow Nimbus' development through its <a href="http://jverkoey.github.com/nimbus/group___version-_history.html">version history</a>.
- See the <a href="http://jverkoey.github.com/nimbus/group___version-6-1.html">latest API diffs</a>.
- See the <a href="http://jverkoey.github.com/nimbus/group___version-7-0.html">latest API diffs</a>.
- Read the <a href="http://jverkoey.github.com/nimbus/group___three20-_migration-_guide.html">Three20 Migration Guide</a>.

<h2>Nimbus' Background</h2>
Expand Down Expand Up @@ -77,10 +77,10 @@ http://pledgie.com/campaigns/15519

<h3>Generous Donations Have Been Made By the Following People</h3>

- Peter Nelson
- Matt Coneybeare
- Craig Gilchrist
- Atsushi Nagase

- Peter Nelson

<h2>The Nimbus Backstory</h2>

Expand Down
22 changes: 21 additions & 1 deletion src/Doxygen.h
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@
*
* - Start by exploring the "Getting Started" <a href="https://github.com/jverkoey/nimbus/tree/master/examples/gettingstarted">example applications</a>.
* - Follow Nimbus' development through its <a href="http://jverkoey.github.com/nimbus/group___version-_history.html">version history</a>.
* - See the <a href="http://jverkoey.github.com/nimbus/group___version-6-1.html">latest API diffs</a>.
* - See the <a href="http://jverkoey.github.com/nimbus/group___version-7-0.html">latest API diffs</a>.
* - Read the <a href="http://jverkoey.github.com/nimbus/group___three20-_migration-_guide.html">Three20 Migration Guide</a>.
*
* <h2>Nimbus' Background</h2>
Expand Down Expand Up @@ -75,6 +75,12 @@
* </div>
*
* <div class="contributor_profile">
* <img width="135px" height="135px" src="http://www.gravatar.com/avatar/22f25c7b3f0f15a6854fae62bbd3482f?s=135&amp;d=http://three20.info/gfx/team/silhouette.gif" />
* <div class="name">Benedikt Meurer</div>
* <div class="github"><a href="http://github.com/bmeurer">bmeurer</a></div>
* </div>
*
* <div class="contributor_profile">
* <img width="135px" height="135px" src="http://www.gravatar.com/avatar/8d33edcb6695ab66b1e48067e4e3723c?s=135&amp;d=http://three20.info/gfx/team/silhouette.gif" />
* <div class="name">Anderson Miller</div>
* <div class="github"><a href="http://github.com/candersonmiller">candersonmiller</a></div>
Expand Down Expand Up @@ -157,6 +163,14 @@
* - <span class="apiDiffAdded">Added</span> <code>@link NIMemoryCache::nameOfLeastRecentlyUsedObject nameOfLeastRecentlyUsedObject@endlink</code> (thanks to <a href="http://github.com/candersonmiller">candersonmiller</a>.)
* - <span class="apiDiffAdded">Added</span> <code>@link NIMemoryCache::nameOfMostRecentlyUsedObject nameOfMostRecentlyUsedObject@endlink</code> (thanks to <a href="http://github.com/candersonmiller">candersonmiller</a>.)
*
* <h2>WebController</h2>
*
* <h3>NIWebController[.h]</h3>
*
* - <span class="apiDiffAdded">Added</span> <code>@link NIWebController::shouldPresentActionSheet: shouldPresentActionSheet:@endlink</code> (thanks to <a href="http://github.com/bmeurer">bmeurer</a>.)
* - <span class="apiDiffFeature">Feature</span> "Copy this URL" option added to the web controller's action sheet. (thanks to <a href="http://github.com/bmeurer">bmeurer</a>.)
* - <span class="apiDiffFeature">Feature</span> The current web page's URL is shown in the action sheet title. (thanks to <a href="http://github.com/bmeurer">bmeurer</a>.)
*
*
* <h2>Examples</h2>
*
Expand All @@ -166,6 +180,12 @@
* <h2>Real Live People Involved in this Release</h2>
*
* <div class="contributor_profile">
* <img width="135px" height="135px" src="http://www.gravatar.com/avatar/22f25c7b3f0f15a6854fae62bbd3482f?s=135&amp;d=http://three20.info/gfx/team/silhouette.gif" />
* <div class="name">Benedikt Meurer</div>
* <div class="github"><a href="http://github.com/bmeurer">bmeurer</a></div>
* </div>
*
* <div class="contributor_profile">
* <img width="135px" height="135px" src="http://www.gravatar.com/avatar/8d33edcb6695ab66b1e48067e4e3723c?s=135&amp;d=http://three20.info/gfx/team/silhouette.gif" />
* <div class="name">Anderson Miller</div>
* <div class="github"><a href="http://github.com/candersonmiller">candersonmiller</a></div>
Expand Down

0 comments on commit 880cdf2

Please sign in to comment.