Merge develop

.gitignore

@@ -4,6 +4,8 @@ releases/
 ofSketchApp/bin/data/Projects/*/src
 ofSketchApp/bin/data/Projects/*/obj
 
+ofSketchApp/ofSketchApp.xcodeproj/project.xcworkspace/xcshareddata/ofSketchApp.xccheckout
+
 scripts/access_token.txt
 
 *.mode1v3

CHANGELOG.md

@@ -1,3 +1,14 @@
+- 0.3.2 (08-31-2014)
+	+ Basic file upload support ([#16](https://github.com/olab-io/ofSketch/issues/16)).
+	+ New Class template ([#102](https://github.com/olab-io/ofSketch/issues/102)).
+	+ Responsive toolbar fix.
+	+ 1-line input modals can now be submitted with the return key.
+
+- 0.3.1 (08-17-2014)
+	+ Basic dependency toolchain checking that alerts user of install instructions if they are missing dependencies ([#100](https://github.com/olab-io/ofSketch/issues/100])) ([#98](https://github.com/olab-io/ofSketch/issues/98])). 
+	+ Added ROADMAP.md document.
+	+ Added BUILDING.md document.
+
 - 0.3.0 (08-07-2014)
 	+ Adapt default ACE Settings Menu to support global ofSketch editor settings ([#42](https://github.com/olab-io/ofSketch/issues/42)).
 	+ Added Raspberry Pi support, added workaround for ofSystem issue ([#58](https://github.com/olab-io/ofSketch/issues/58)).

CONTRIBUTING.md

@@ -1,6 +1,10 @@
 # Contributing to ofSketch
 
-First off, thanks for your interest contributing! ofSketch is still in its early stages of development, so there is plenty to do (and plenty that is undoubtedly broken, doesn't work, etc...). Here is a brief set of guidelines and pointers for contributing to ofSketch. For more information contact [Brannon Dorsey](http://brannondorsey.com) <<brannon@brannondorsey.com>> or [Christopher Baker](http://christopherbaker.net) <<me@christopherbaker.net>>. Also, check out openFrameworks' [CONTRIBUTING.md](https://github.com/openframeworks/openFrameworks/blob/master/CONTRIBUTING.md) for more info about contributing to ofSketch, openFrameworks, or open source projects in general.
+First off, thanks for your interest contributing! ofSketch is still in its early stages of development, so there is plenty to do (and plenty that is undoubtedly broken, doesn't work, etc...). Here is a brief set of guidelines and pointers for contributing to ofSketch. For more information contact [Brannon Dorsey](http://brannondorsey.com) <<brannon@brannondorsey.com>> or [Christopher Baker](http://christopherbaker.net) <<me@christopherbaker.net>>.
+
+If you plan on contributing heavily to ofSketch, check out our [ARCHITECTURE.md](ARCHITECTURE.md) file to learn more about the ofxAddons and Libs that ofSketch uses, as well as an overview of the way that ofSketch works.
+
+Also, check out openFrameworks' [CONTRIBUTING.md](https://github.com/openframeworks/openFrameworks/blob/master/CONTRIBUTING.md) for more info about contributing to ofSketch, openFrameworks, or open source projects in general.
 
 ## Report a Bug
 

LICENSE.md

@@ -1,7 +1,8 @@
 The MIT License (MIT)
 
-Copyright (c) 2013 Christopher Baker http://christopherbaker.net
-
+Copyright (c) 2013-2014 Christopher Baker <http://christopherbaker.net> 
+& 2014 Brannon Dorsey <http://brannondorsey.com>
+
 Permission is hereby granted, free of charge, to any person obtaining a copy of
 this software and associated documentation files (the "Software"), to deal in
 the Software without restriction, including without limitation the rights to
@@ -17,4 +18,5 @@ IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS
 FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR
 COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER
 IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
-CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTA
+

README.md

@@ -80,49 +80,6 @@ Check out the [Todo list](https://github.com/brannondorsey/ofSketch/issues/1) to
 
 Is something just downright wrong? Don't hesitate to submit an [issue](https://github.com/brannondorsey/ofSketch/issues?state=open).
 
-## Developers
-
-### Building from source
-
-To build using openFrameworks v0.8.3 on OSX and Linux follow the steps below.
-
-1. Clone the ofSketch repo into your `OF_ROOT/apps` folder, making sure that the `ofSketchApp/` folder inside of `ofSketch/` is two directories below your openFrameworks distribution:
-
-		git clone https://github.com/olab-io/ofSketch.git
-		cd ofSketch
-		
-2. Run the init repo script. This will download and install a trimmed down version of the latest oF release in the `bin/data` folder of your ofSketch build:
-
-		./scripts/init_repo.sh
-		
-3. Clone the ofxAddon dependencies. This script will attempt to clone the required addons and then pull the latest changes. If you already have these addons, make sure that any of your changes are saved:
-
-		./scripts/clone_addons.sh
-
-4. Compile ofSketch:
-
-		cd ofSketchApp
-		make && make run
-
-
-__Note__: OSX users may use the Xcode project instead of building from the command line in step 4.
-
-
-### Info
-
-Building ofSketch from source requires openFrameworks v0.8.3 and the following addons:
-
-- [ofxHTTP](https://github.com/bakercp/ofxHTTP)
-- [ofxIO](https://github.com/bakercp/ofxIO)
-- [ofxJSON](https://github.com/bakercp/ofxJSON)
-- [ofxJSONRPC](https://github.com/bakercp/ofxJSONRPC)
-- [ofxMediaType](https://github.com/bakercp/ofxMediaType)
-- [ofxSSLManager](https://github.com/bakercp/ofxSSLManager)
-- [ofxTaskQueue](https://github.com/bakercp/ofxTaskQueue)
-
-For more information, see the [ARCHITECTURE.md](ARCHITECTURE.md) document in this repository.
-
-
 ## Links
 
 - [openFrameworks documentation](http://openframeworks.cc/documentation/)

ofSketchApp/addons.make

@@ -3,5 +3,7 @@ ofxIO
 ofxJSON
 ofxJSONRPC
 ofxMediaType
+ofxPG
+ofxPugiXML
 ofxSSLManager
 ofxTaskQueue

ofSketchApp/bin/data/DocumentRoot/css/jquery.fileupload.css

@@ -0,0 +1,36 @@
+@charset "UTF-8";
+/*
+ * jQuery File Upload Plugin CSS 1.3.0
+ * https://github.com/blueimp/jQuery-File-Upload
+ *
+ * Copyright 2013, Sebastian Tschan
+ * https://blueimp.net
+ *
+ * Licensed under the MIT license:
+ * http://www.opensource.org/licenses/MIT
+ */
+
+.fileinput-button {
+  position: relative;
+  overflow: hidden;
+}
+.fileinput-button input {
+  position: absolute;
+  top: 0;
+  right: 0;
+  margin: 0;
+  opacity: 0;
+  -ms-filter: 'alpha(opacity=0)';
+  font-size: 200px;
+  direction: ltr;
+  cursor: pointer;
+}
+
+/* Fixes for IE < 8 */
+@media screen\9 {
+  .fileinput-button input {
+    filter: alpha(opacity=0);
+    font-size: 100%;
+    height: 100%;
+  }
+}

ofSketchApp/bin/data/DocumentRoot/css/style.css

@@ -130,9 +130,27 @@ code {
   margin-top: 15px;
 }
 
+#ofsketch-settings-container {
+ /* width: 80%;
+  margin: auto;*/
+}
 
+#export-project-modal .list-group a {
+  /*font-size: 1.1em;*/
+}
 
-@media (max-width: 768px) {
+#export-project-modal .list-group .label {
+  float: right;
+  margin-left: 5px;
+}
+
+textarea {
+  max-width: 100%;
+}
+
+/* Custom override for toolbar
+http://stackoverflow.com/questions/18192082/bootstrap-3-navbar-collapse */
+@media (max-width: 880px) {
 
   #collapsable-navbar {
     margin-top: 50px;
@@ -143,19 +161,50 @@ code {
     margin-top: 10px;
   }
 
-  #toolbar {
+  /*#toolbar {
     left: 70px; 
-  }
+  }*/
 
   #toolbar-settings {
 
     margin-left: -10px;
   }
 
+  .navbar-header {
+      float: none;
+  }
+  .navbar-toggle {
+      display: block;
+  }
+  .navbar-collapse {
+      border-top: 1px solid transparent;
+      box-shadow: inset 0 1px 0 rgba(255,255,255,0.1);
+  }
+  .navbar-collapse.collapse {
+      display: none!important;
+  }
+  .navbar-nav {
+      float: none!important;
+      margin: 7.5px -15px;
+  }
+  .navbar-nav>li {
+      float: none;
+  }
+  .navbar-nav>li>a {
+      padding-top: 10px;
+      padding-bottom: 10px;
+  }
+  /* since 3.1.0 */
+  .navbar-collapse.collapse.in { 
+      display: block!important;
+  }
+  .collapsing {
+      overflow: hidden!important;
+  }
 }
 
-/* Extra Small Devices, Phones */ 
-@media (max-width : 480px) {
+/* Tablets */ 
+@media (max-width: 768px) {
 
   /*oF logo*/
   .navbar-brand {
@@ -167,7 +216,12 @@ code {
     left: 0px;
   }
 
+}
+
+/* Extra Small Devices, Phones */ 
+@media (max-width : 480px) {
+
   #toolbar .hideable {
     display: none;
   }
-}
+}