Permalink
Browse files

Merge branch 'release'

Conflicts:
	samples/project_samples.rb
  • Loading branch information...
2 parents eb43bfa + 8caac4f commit 2a6dd581aa9ca586ac7c989621f01be58a57cacb @ingo ingo committed Jan 20, 2012
View
@@ -48,24 +48,24 @@
project_template "Single Window Application" do |t|
t.type = :titanium_mobile
- t.location = "git://github.com/appcelerator-developer-relations/Template.SingleWindow.git"
- t.description = "A single window application with a single view - a mostly blank canvas. Requires Titanium Mobile SDK 1.8.0+."
+ t.location = "staging/Template.SingleWindow.zip"
+ t.description = "A single window application with a single view - a mostly blank canvas. Requires Titanium Mobile SDK 1.8+."
t.icon = "http://preview.appcelerator.com/dashboard/img/icons/icon_single_window.png"
puts t
end
project_template "Master/Detail Application" do |t|
t.type = :titanium_mobile
- t.location = "git://github.com/appcelerator-developer-relations/Template.MasterDetail.git"
- t.description = "A master detail view, utilizing a native table view component and platform-specific UI and navigation. A starting point for a navigation-based application with hierarchical data, or a stack of windows. Requires Titanium Mobile SDK 1.8.0+."
+ t.location = "staging/Template.MasterDetail.zip"
+ t.description = "A master detail view, utilizing a native table view component and platform-specific UI and navigation. A starting point for a navigation-based application with hierarchical data, or a stack of windows. Requires Titanium Mobile SDK 1.8+."
t.icon = "http://preview.appcelerator.com/dashboard/img/icons/icon_detail.png"
puts t
end
project_template "Tabbed Application" do |t|
t.type = :titanium_mobile
- t.location = "git://github.com/appcelerator-developer-relations/Template.Tabbed.git"
- t.description = "A tabbed application, consisting of multiple stacks of windows associated with tabs in a tab group. A starting point for tab-based application with multiple top-level windows. Requires Titanium Mobile SDK 1.8.0+."
+ t.location = "staging/Template.Tabbed.zip"
+ t.description = "A tabbed application, consisting of multiple stacks of windows associated with tabs in a tab group. A starting point for tab-based application with multiple top-level windows. Requires Titanium Mobile SDK 1.8+."
t.icon = "http://preview.appcelerator.com/dashboard/img/icons/icon_tabbed.png"
puts t
end
View
@@ -1,46 +1,57 @@
require 'ruble'
-# project_sample "Geocoder" do |s|
- # s.id = "com.appcelerator.titanium.mobile.samples.mapping"
- # s.category = "com.appcelerator.titanium.mobile.samples.category"
- # s.location = "git://github.com/appcelerator-developer-relations/Sample.Mapping.git"
- # s.description = "A sample Master/Detail app that uses native maps to plot locations. With it you can forward geocode addresses and add them as annotations to the map."
- # s.natures = ["com.appcelerator.titanium.mobile.nature", "com.aptana.projects.webnature"]
- # s.icon = "http://preview.appcelerator.com/dashboard/img/icons/icon_geo.png"
-# end
-#
-# project_sample "RSS Reader" do |s|
- # s.id = "com.appcelerator.titanium.mobile.samples.rss"
- # s.category = "com.appcelerator.titanium.mobile.samples.category"
- # s.location = "git://github.com/appcelerator-developer-relations/Sample.RSS.git"
- # s.description = "A sample Master/Detail app that creates a RSS reader. With it you can pull live RSS feeds from the internet, list them along with thumbnails, then drill down to the article itself."
- # s.natures = ["com.appcelerator.titanium.mobile.nature", "com.aptana.projects.webnature"]
- # s.icon = "http://preview.appcelerator.com/dashboard/img/icons/icon_rss.png"
-# end
-#
-# project_sample "Todo List" do |s|
- # s.id = "com.appcelerator.titanium.mobile.samples.todo"
- # s.category = "com.appcelerator.titanium.mobile.samples.category"
- # s.location = "git://github.com/appcelerator-developer-relations/Sample.Todo.git"
- # s.description = "A sample tabbed application that creates a basic todo list. With this app you can maintain a listing of tasks to be completed, add to that list, and mark tasks as done."
- # s.natures = ["com.appcelerator.titanium.mobile.nature", "com.aptana.projects.webnature"]
- # s.icon = "http://preview.appcelerator.com/dashboard/img/icons/icon_to_do_list.png"
-# end
+project_sample "Geocoder" do |s|
+ s.id = "com.appcelerator.titanium.mobile.samples.mapping"
+ s.category = "com.appcelerator.titanium.mobile.samples.category"
+ s.location = "git://github.com/appcelerator-developer-relations/Sample.Mapping.git"
+ s.description = "A sample Master/Detail app that uses native maps to plot locations. With it you can forward geocode addresses and add them as annotations to the map. Requires Titanium Mobile SDK 1.8+"
+ s.natures = ["com.appcelerator.titanium.mobile.nature", "com.aptana.projects.webnature"]
+ s.icon = "http://preview.appcelerator.com/dashboard/img/icons/icon_geo.png"
+end
+
+project_sample "RSS Reader" do |s|
+ s.id = "com.appcelerator.titanium.mobile.samples.rss"
+ s.category = "com.appcelerator.titanium.mobile.samples.category"
+ s.location = "git://github.com/appcelerator-developer-relations/Sample.RSS.git"
+ s.description = "A sample Master/Detail app that creates a RSS reader. With it you can pull live RSS feeds from the internet, list them along with thumbnails, then drill down to the article itself. Requires Titanium Mobile SDK 1.8+"
+ s.natures = ["com.appcelerator.titanium.mobile.nature", "com.aptana.projects.webnature"]
+ s.icon = "http://preview.appcelerator.com/dashboard/img/icons/icon_rss.png"
+end
+
+project_sample "Todo List" do |s|
+ s.id = "com.appcelerator.titanium.mobile.samples.todo"
+ s.category = "com.appcelerator.titanium.mobile.samples.category"
+ s.location = "git://github.com/appcelerator-developer-relations/Sample.Todo.git"
+ s.description = "A sample tabbed application that creates a basic todo list. With this app you can maintain a listing of tasks to be completed, add to that list, and mark tasks as done. Requires Titanium Mobile SDK 1.8+"
+ s.natures = ["com.appcelerator.titanium.mobile.nature", "com.aptana.projects.webnature"]
+ s.icon = "http://preview.appcelerator.com/dashboard/img/icons/icon_to_do_list.png"
+end
project_sample "Kitchen Sink" do |s|
s.id = "com.appcelerator.titanium.mobile.samples.kitchensink"
s.category = "com.appcelerator.titanium.mobile.samples.category"
s.location = "git://github.com/appcelerator/KitchenSink.git"
- s.description = "A sample Titanium Mobile project that demonstrates a variety of APIs available in Titanium Mobile"
+ s.description = "A sample Titanium Mobile project that demonstrates a variety of APIs available in Titanium Mobile. Requires Titanium Mobile SDK 1.8+"
s.natures = ["com.appcelerator.titanium.mobile.nature", "com.aptana.projects.webnature"]
s.icon = "http://preview.appcelerator.com/dashboard/img/icons/icon_kitchen_sink.png"
end
-project_sample "Kitchen Sink iPad" do |s|
- s.id = "com.appcelerator.titanium.mobile.samples.kitchensink.ipad"
+if Ruble.is_mac?
+ project_sample "Kitchen Sink iPad" do |s|
+ s.id = "com.appcelerator.titanium.mobile.samples.kitchensink.ipad"
+ s.category = "com.appcelerator.titanium.mobile.samples.category"
+ s.location = "git://github.com/appcelerator/KitchenSinkiPad.git"
+ s.description = "A sample Titanium Mobile project that demonstrates a variety of APIs available in Titanium Mobile (For iPad). Requires Titanium Mobile SDK 1.8+"
+ s.natures = ["com.appcelerator.titanium.mobile.nature", "com.aptana.projects.webnature"]
+ s.icon = "http://preview.appcelerator.com/dashboard/img/icons/icon_kitchen_sink.png"
+ end
+end
+
+project_sample "Kitchen Sink Nook" do |s|
+ s.id = "com.appcelerator.titanium.mobile.samples.kitchensink.nook"
s.category = "com.appcelerator.titanium.mobile.samples.category"
- s.location = "git://github.com/appcelerator/KitchenSinkiPad.git"
- s.description = "A sample Titanium Mobile project that demonstrates a variety of APIs available in Titanium Mobile (For iPad)"
+ s.location = "git://github.com/appcelerator/KitchenSinkNook.git"
+ s.description = "A sample Titanium Mobile project that demonstrates a variety of APIs available in Titanium Mobile (For the Barnes & Noble Nook). Requires Titanium Mobile SDK 1.8+"
s.natures = ["com.appcelerator.titanium.mobile.nature", "com.aptana.projects.webnature"]
s.icon = "http://preview.appcelerator.com/dashboard/img/icons/icon_kitchen_sink.png"
end
Binary file not shown.
Binary file not shown.
View
Binary file not shown.

0 comments on commit 2a6dd58

Please sign in to comment.