Merge remote-tracking branch 'upstream/master'

Conflicts:
	.gitignore
	Gruntfile.js
	INSTALL.md
	app/util/Config.js
	build/Kort/production/app.js
	package.json
	server/database/kort/kort.sql
	server/database/kort/kort_views.sql
	server/database/setup_keepright_db.sh

.gitignore

@@ -14,8 +14,10 @@ docs/Kort-backend
 docs/Ext.ux.LeafletMap
 composer.phar
 composer.lock
+npm-debug.log
 vendor/
 bin/
 .sencha_backup/      
 .idea/
 /Icon
+data/

.travis.yml

@@ -6,11 +6,11 @@ php:
 
 env:
   global:
-    - CI_HOME=`pwd`/odi86/kort
+    - CI_HOME=`pwd`/kort/kort
     - DEPLOY="true"
-    - BUILD_DIR=`pwd`/build_heroku 
-    - secure: "EIn+Rm7OxX8OKygBRBCaSTOqFGcBMWu5kHdKqSxOmHRJYjxuMOJpKV+rnyep\n+RsyFDx2Z9yKlqRRS4cpZh7M6wwC63EV46+7aWtzzTjnbMZfVzLQA9EmaEU4\nYMsKGtpQk2mhvaNKd3UbEpDl0Zq74NnAY0zipx0l02UymcFnZEc=" 
-    - secure: "cOmMBP4UyklRC0nfeTZsX/NV4GhMBT+AntUmlWxXS5Rj2yrNcmNc7320gNm5\nCLSVRYyk7/8feyUEMznWrUn/62htZp0tEBAWtXg86dgIZgH4HPy9l2pKuSsH\nxZTHgjUJI7JOuyLG4ID9D5maVLE35UWag/NEtcRVy5QXLZOrs0M="
+    - BUILD_DIR=`pwd`/build_heroku
+    - secure: "r/MlYsFk0/T1aAuzDmLhoE92EQQ+866Bkq04yLPw1RgcIQN0O2Q7fhCx++EZ\nE7Nz/JXxLLNn9Tg8KXU0JRHcw2PBP04/WzCU+3mo6vqLLUk/JtTsBjiQ3svW\nerCmRNP4H4Yb+YbdSKzWT1J9+GCIOoTW8zrj6JKOOErIkz+uypU="
+    - secure: "w1wo6x6y8IZH6ZyykNeJxO13K3IjBBLKKaASHp7Ebp0gcPcOui/DRTx9D0EZ\n/rvEEgpkubkgTOst0zq2e6UhYF/oBXx+21/OHrfuzPcT9MfXC+/NCscjMMY4\n041HRSp0zJCE6dvl6xOmvuYCZbKLeDKnLlSIijlkhvJw2B0BdDo="
   matrix:
     - TARGET_ENV="dev"
     - TARGET_ENV="prod"
@@ -20,12 +20,10 @@ before_script:
   - gem install compass
   - gem install jsduck
   - wget -qO- https://toolbelt.heroku.com/install-ubuntu.sh | sh >/dev/null 2>&1
-  - sudo npm install -g grunt >/dev/null 2>&1
+  - npm install -g grunt-cli
+  - npm install 
   - curl -s http://getcomposer.org/installer | php --
   - php composer.phar install --dev
-  - sudo pear channel-discover pear.phpdoc.org
-  - sudo pear install phpdoc/phpDocumentor-alpha
-  - sudo apt-get install graphviz
   - export PATH="$PATH:$CI_HOME:/usr/local/heroku/bin"
   - mv $CI_HOME/server/php/Webservice/Database/DbConfig.example.php $CI_HOME/server/php/Webservice/Database/DbConfig.php
   - phpenv rehash

Gruntfile.js

@@ -4,16 +4,10 @@ module.exports = function(grunt) {
     // Project configuration.
     grunt.initConfig({
         qunit: {
-            files: ['test/client/index.html']
+            'kort': ['test/client/index.html']
         },
         jshint: {
-            files: {
-                src: 'app/**/*.js',
-                grunt: 'grunt.js',
-                app: 'app.js*',
-                tests: 'test/client/**/*.js'
-            },
-
+            'kort': ['app/**/*.js', 'Grunfile.js', 'app.js*', 'test/client/**/*.js'],
             options: {
                 jquery: true,
                 curly: true,
@@ -33,17 +27,8 @@ module.exports = function(grunt) {
                 trailing: true,
                 white:  false,
                 maxcomplexity: 4,
-                /*indent: 4  comment out until white/indent options are separated => https://github.com/jshint/jshint/issues/655 */
                 globals: {
                     Kort: true,
-                    Ext: true,
-                    L: true,
-                    UrlLib: true
-                }
-            },
-
-            tests: {
-                globals: {
                     Ext: true,
                     L: true,
                     UrlLib: true,
@@ -70,16 +55,16 @@ module.exports = function(grunt) {
         }
     });
 
-    // Default task.
-    //grunt.registerTask('default', 'lint qunit concat min'); //old style v0.3.x
+    // Load plugins
     grunt.loadNpmTasks('grunt-contrib-jshint');
     grunt.loadNpmTasks('grunt-contrib-qunit');
-    grunt.loadNpmTasks('grunt-contrib-concat');
-    grunt.loadNpmTasks('grunt-contrib-uglify');
-    //grunt.registerTask('default', ['lint']);
-    grunt.registerTask('test', ['jshint', 'qunit']);
-    grunt.registerTask('default', ['jshint', 'qunit', 'concat', 'uglify']); //new style v0.4.x
+
+    // Default task.
+    grunt.registerTask('default', 'jshint:kort');
+
+    // Linting task.
+    grunt.registerTask('lint', 'jshint:kort');
 
     // Travis CI task.
-    //grunt.registerTask('travis', 'lint qunit');
+    grunt.registerTask('travis', 'jshint:kort qunit:kort');
 };

INSTALL.md

@@ -12,20 +12,9 @@
 * PHP (5.3 or 5.4)
     * `apt-get install php5`
     * `apt-get install php5-curl`
-* PhantomJS
-    * `apt-get install phantomjs`
 * Composer
     * `curl -s https://getcomposer.org/installer | php`
     * `php composer.phar install --dev`
-* PEAR
-    * `apt-get install php-pear`
-    * `pear channel-discover pear.phpdoc.org`
-    * `pear install phpdoc/phpDocumentor-alpha`
-* Mockery
-    * `pear channel-discover pear.survivethedeepend.com`
-    * `pear channel-discover hamcrest.googlecode.com/svn/pear`
-    * `pear install --alldeps deepend/Mockery`
-
 * RubyGems 
     * `apt-get install rubygems`
     * `gem install sass`
@@ -34,8 +23,6 @@
 * NPM
     * `apt-get install npm`
     * `npm -g install grunt`
-* Graphviz
-    * `apt-get install graphviz`
 * Ant
     * `apt-get install ant`
     * `ant -f build_kort.xml build`

README.md

@@ -6,7 +6,7 @@ Kort is a cross-platform, crowdsourcing app aimed to improve OpenStreetMap.
 
 Kort is built using [Travis CI](https://travis-ci.org):
 
-[![Build Status](https://api.travis-ci.org/odi86/kort.png?branch=master)](http://travis-ci.org/odi86/kort)
+[![Build Status](https://api.travis-ci.org/kort/kort.png?branch=master)](http://travis-ci.org/kort/kort)
 
 The app is deployed on [Heroku](https://www.heroku.com/): http://play.kort.ch
 
@@ -51,8 +51,8 @@ There is a lot of room for improvement to keep the players motivated and  serve
 
 ## Other repositories
 
-* [odi86/kort-docu](https://github.com/odi86/kort-docu): Documents of Kort
-* [odi86/kort-home](https://github.com/odi86/kort-home): Website of Kort (http://www.kort.ch)
+* [kort/kort-docu](https://github.com/kort/kort-docu): Documents of Kort
+* [kort/kort-home](https://github.com/kort/kort-home): Website of Kort (http://www.kort.ch)
 
 ## License
 

app/util/Config.js

@@ -8,7 +8,7 @@ Ext.define('Kort.util.Config', {
         /**
          * @cfg {String} version Current version number of application
          */
-        version: '1.2.${env.TRAVIS_BUILD_NUMBER}',
+        version: '1.2.{BUILD_NR}',
 
         /**
          * @cfg {String[]} supportedLanguages Supported languages of the app
@@ -129,7 +129,7 @@ Ext.define('Kort.util.Config', {
             information: [
                 '<a href="http://www.kort.ch" target="_blank">kort.ch</a>',
                 '<a href="http://kort.uservoice.com" target="_blank">UserVoice Contact</a>',
-                '<a href="https://github.com/odi86/kort/issues" target="_blank">GitHub</a>'
+                '<a href="https://github.com/kort/kort/issues" target="_blank">GitHub</a>'
             ],
             developers: [
                 'Jürg Hunziker',

build_kort.xml

@@ -99,12 +99,7 @@
    <target name="php-docs">
        <echo message="Generating PHP docs (phpDocumentor)"/>
        <mkdir dir="${php.doc.dir}"/>
-       <exec executable="phpdoc">
-           <arg value="-d"/>
-           <arg value="${php.dir}"/>
-           <arg value="-t"/>
-           <arg value="${php.doc.dir}"/>
-       </exec>
+       <exec executable="bin/phpdoc.php" />
    </target>
 
 	<target name="css">

composer.json

@@ -3,8 +3,10 @@
         "mockery/mockery": ">=0.7.2"
     },
     "minimum-version": "dev",
+    "minimum-stability": "dev",
     "require-dev": {
-        "squizlabs/php_codesniffer": "dev-master"
+        "squizlabs/php_codesniffer": "dev-master",
+        "phpdocumentor/phpdocumentor": "dev-develop"
     },
     "config": {
         "bin-dir": "bin"