Merge branch 'up' into amber-config-used

Conflicts:
	support/amber.js
	support/devel.js
	support/helios/set.js

CHANGELOG

@@ -1,4 +1,4 @@
-XXnd XXX 2014 - Release 0.12.5
+1st July  2014 - Release 0.12.6
 ===================================
 
 Highlights:
@@ -6,13 +6,16 @@ Highlights:
 * SUnit Runner in Helios IDE.
 * `amber` and `amberc` cli moved to `external` directory
   and to dedicated npm package.
+* Bootstrap 3 can be used in Amber projects
+  (no more nameclash with Helios' bootstrap 2 using bootstrap2.3.2 name).
+* Wider range of jQuery versions allowed.
 * Amber now parses `$c` character literal.
 * `amber` is not to be installed globally any more.
   Instead, `npm install -g amber-cli` installs cli tooling.
 * After installing the cli tooling, `amber init` initializes
   new project if run in empty directory.
 
-Commits: https://github.com/amber-smalltalk/amber/compare/0.12.4...0.12.5
+Commits: https://github.com/amber-smalltalk/amber/compare/0.12.4...0.12.6
 Issues:  https://github.com/amber-smalltalk/amber/issues?milestone=13&state=closed
 
 For the most important API related changes see the file API-CHANGES.txt.

external/amber-cli/CHANGELOG

@@ -1,44 +0,0 @@
-XXth XXX 2014 - Release 0.1.0
-===================================
-
-Highlights:
-
-* Package is polished.
-* `amber-cli` is now official package to install globally.
-
-Commits: https://github.com/amber-smalltalk/amber-cli/compare/0.0.6...0.1.0
-Issues:  https://github.com/amber-smalltalk/amber-cli/issues?milestone=2&state=closed
-
-
-15th April 2014 - Release 0.0.6
-===================================
-
-Highlights:
-
-* `amberc -d dir` allows specify alternate Amber dir.
-
-Commits: https://github.com/amber-smalltalk/amber-cli/compare/0.0.5...0.0.6
-Issues:  https://github.com/amber-smalltalk/amber-cli/issues?milestone=4&state=closed
-
-
-15th April 2014 - Release 0.0.5
-===================================
-
-Highlights:
-
-* Bugfix: `amberc -l` now working.
-
-Commits: https://github.com/amber-smalltalk/amber-cli/compare/0.0.4...0.0.5
-Issues:  https://github.com/amber-smalltalk/amber-cli/issues?milestone=3&state=closed
-
-
-14th April 2014 - Release 0.0.4
-===================================
-
-Highlights:
-
-* Amber tooling is now in its own package.
-
-Commits: https://github.com/amber-smalltalk/amber-cli/compare/cc2a163...0.0.4
-Issues:  https://github.com/amber-smalltalk/amber-cli/issues?milestone=1&state=closed
-

external/amber-cli/CONTRIBUTING.md

@@ -1,63 +0,0 @@
-Start Contributing by talking about Amber
-=========================================
-
-* Join our [Mailinglist/Google Group](http://groups.google.com/group/amber-lang)
-* Talk to us on [the #amber-lang IRC channel](irc://irc.freenode.net/amber-lang)
-* Follow [@AmberSmalltalk](https://twitter.com/AmberSmalltalk) on Twitter
-* Circle Amber Smalltalk on [Google+](https://plus.google.com/u/0/107038882958653788078) 
-
-
-Filing Issues
-=============
-
-If you think Amber CLI is not working as expected, You can start by asking on IRC or the Mailinglist.
-Please make sure that you have first checked the following guides:
-
-* [Getting Started](https://github.com/amber-smalltalk/amber/wiki/Getting-started)
-* [Writing My First App](https://github.com/amber-smalltalk/amber/wiki/Writing-my-first-app)
-* [How To Load Amber](https://github.com/amber-smalltalk/amber/wiki/How-to-load-amber)
-* [Amber FAQ](https://github.com/amber-smalltalk/amber/wiki/FAQ)
-
-If the issue can not be resolved you should file an issue on the respective tracker.
-
-Before reporting an issue, try to reduce the issue to the bare minimum required to reproduce it.
-This allows us to track down and fix the issue in an easier and faster way.
-
-Additionally, you should give us enough information to reproduce the issue.
-Therefore, include versions of your OS, Amber, Node.js, Grunt, and possibly used libraries as well as sample code.
-If you don't list the exact steps required to reproduce the issue we won't be able to fix it.
-
-
-Creating a Pull Request
------------------------
-
-The Amber development model currently revolves around Pull Requests which are created through GitHub
-
-1. Update to latest Amber CLI master (```git pull```)
-2. Develop your feature or bugfix in a local branch (not in ```master```)
-3. Create unittest for your feature or bugfix (your feature/fix will be integrated a lot faster if unittests are present)
-4. Enhance/fix Amber
-5. Run the unittests
-6. Commit your changes to disk if all tests are green
-7. Try to split your fix into small Git commits if multiple changes are involved (this makes it easier for us to review the changes)
-8. If you created / deleted / moved something significant, update CHANGELOG appropriately and commit.
-8. Push the changes to your fork on GitHub ```git push <your repo> <your branchname>```
-9. Submit Pull Request (usually for the Amber CLI master branch)
-
-
-Compiling Amber CLI with Grunt
---------------------------
-
-Amber uses [Grunt.js](http://gruntjs.com/) as build system since version `0.10.0`.
-
-To install Grunt.js v0.4.x on the commandline execute the following commands:
-
-    npm install -g grunt-cli
-
-Make sure that you have installed all required dependencies via `npm` and `bower`.
-Then you can finally compile Amber CLI using the following command:
-
-    cd ${Amber_DIR}
-    grunt amberc:amber_cli
-
-For Windows support check the [Grunt.js on Windows](http://gruntjs.com/frequently-asked-questions#does-grunt-work-on-windows) page.

external/amber-cli/README.md

@@ -1,47 +0,0 @@
-Amber [![Travis CI Status](https://secure.travis-ci.org/amber-smalltalk/amber.png)](https://travis-ci.org/#!/amber-smalltalk/amber-cli)
-=====
-
-By Nicolas Petton <petton.nicolas@gmail.com> and [Amber contributors](https://github.com/amber-smalltalk/amber/contributors)
-
-Amber is an implementation of the Smalltalk language that runs on top of the JavaScript runtime. It is designed to make client-side development faster and easier.
-
-Overview
---------
-
-Amber is written in itself, including the parser and compiler. Amber compiles into efficient JavaScript, mapping one-to-one with the equivalent JavaScript. There is no interpretation at runtime.
-
-Some highlights:
-
--    Amber features an IDE with a Class browser, Workspace, Transcript, a ReferencesBrowser supporting senders/implementors and class references, basic Inspector and even a beginning of a Debugger and a unit TestRunner.
--    [Pharo Smalltalk](http://www.pharo-project.org) is considered as the reference implementation.
--    Amber includes a canvas to generate HTML, like [Seaside](http://www.seaside.st)
--    Amber can use Javascript libraries and the current IDE is built on [jQuery](http://www.jquery.com)
--    You can inline Javascript code and there are many ways to interact between Amber and Javascript
-
-Getting Amber
--------------
-
-Amber is shipped as a [npm](http://npmjs.org) package for its CLI tools and as a [bower](https://github.com/bower/bower) package for the client-side.
-
-    # Install the CLI tool `amber`
-    npm install -g amber-cli
-    
-    # Initialize your project
-    cd /path/to/myproject
-    amber init
-
-    # Serve amber on localhost:4000
-    amber serve
-
-The [Getting started](http://docs.amber-lang.net/getting-started.html) page shows more details on ways to obtain Amber and start a project.
-
-License
--------
-
-Amber is released under the MIT license. All contributions made for inclusion are considered to be under MIT.
-
-
-More infos
-----------
-
-More on the [project page](http://amber-lang.net)

external/amber-cli/RELEASING.md

@@ -1,15 +0,0 @@
-Release Guide for Amber
-=======================
-
-The following steps are required to make a release of Amber:
-
-1. (not yet) check that all tests are green
-1. check the `CHANGELOG` file and update the release notes, check the milestone index in issues link
-1. bump version and git repo tag in `package.json`
-1. Create a tag for bumped version:`git tag -a 1.2.3 -m "Version 1.2.3`
-1. `git commit -a -m "Release 1.2.3" && git push && git push --tags`
-1. log in to npm with write access for the Amber package
-1. update the homepage to point to the latest tag on GitHub
-1. send announcement to mailinglists (Amber, Pharo, what else?)
-1. send announcement on Twitter
-1. send announcement on G+