Updated moved links

AUTHORS

@@ -2,8 +2,8 @@ OS.js is created and maintaned by:
 Anders Evenrud <[email protected]>
 
 For a full list of contributions, see:
-* https://github.com/andersevenrud/OS.js-v2/graphs/contributors
-* https://github.com/andersevenrud/OS.js-v2/wiki/Hall-of-Fame
+* https://github.com/os-js/OS.js/graphs/contributors
+* https://github.com/os-js/OS.js/wiki/Hall-of-Fame
 
 I'm using the following resources from outside sources:
 * Gnome - Icon theme

CONTRIBUTING.md

@@ -2,28 +2,28 @@
 
 These are some of the ways you can contribute to OS.js:
 
-* **Open issues** You can post any issues to [Github](https://github.com/andersevenrud/OS.js-v2/issues).
-* **New features** Create a [pull request](https://github.com/andersevenrud/OS.js-v2/pulls) or open a new issue if you have any ideas for new features.
-* **Translating** Language support is a bit lacking, so any help is appreciated! [Join the Translation team](https://github.com/andersevenrud/OS.js-v2/wiki/Join-the-translation-team)
-* **Testing** Things are always changing, and automated tests are not enough to ensure everything is working 100%. [Join the Testing team](https://github.com/andersevenrud/OS.js-v2/wiki/Join-the-testing-team)
+* **Open issues** You can post any issues to [Github](https://github.com/os-js/OS.js/issues).
+* **New features** Create a [pull request](https://github.com/os-js/OS.js/pulls) or open a new issue if you have any ideas for new features.
+* **Translating** Language support is a bit lacking, so any help is appreciated! [Join the Translation team](https://github.com/os-js/OS.js/wiki/Join-the-translation-team)
+* **Testing** Things are always changing, and automated tests are not enough to ensure everything is working 100%. [Join the Testing team](https://github.com/os-js/OS.js/wiki/Join-the-testing-team)
 * **Documentation** Found something in the [homepage or documentation](https://github.com/andersevenrud/os.js.org) that does not seem right?
-* **Community** Join in our [Gitter](https://gitter.im/andersevenrud/OS.js-v2) chat room for fun and tech talk!
+* **Community** Join in our [Gitter](https://gitter.im/os-js/OS.js) chat room for fun and tech talk!
 
 You can also submit patches and questions directly to me via [email](mailto:[email protected]), but using GitHub is preferred.
 
 # Resources
 
 * [Homepage](http://os.js.org/)
 * [Documentation](http://os.js.org/doc/)
-* [FAQ and discussion](https://github.com/andersevenrud/OS.js-v2/issues/49)
-* [Chat room](https://gitter.im/andersevenrud/OS.js-v2)
+* [FAQ and discussion](https://github.com/os-js/OS.js/issues/49)
+* [Chat room](https://gitter.im/os-js/OS.js)
 * [Subreddit](https://www.reddit.com/r/osjs)
 * [PayPal donation](https://www.paypal.com/cgi-bin/webscr?cmd=_donations&business=andersevenrud%40gmail%2ecom&lc=NO&currency_code=USD&bn=PP%2dDonationsBF%3abtn_donate_SM%2egif%3aNonHosted)
 * [Gratipay donation](https://gratipay.com/os-js/)
 
 # Source Code
 
-* [OS.js Source Code](https://github.com/andersevenrud/OS.js-v2)
+* [OS.js Source Code](https://github.com/os-js/OS.js)
 * [OS.js Homepage Code](https://github.com/andersevenrud/os.js.org)
 
 
@@ -33,7 +33,7 @@ To get started you need a [Github](https://github.com/) account.
 
 ## Prepare
 
-Then proceed to **fork** OS.js via the official [project page](https://github.com/andersevenrud/OS.js-v2).
+Then proceed to **fork** OS.js via the official [project page](https://github.com/os-js/OS.js).
 
 Follow the official documentation on how to [install and run OS.js](http://os.js.org/doc/manuals/man-install.html), with one exception -- run the development server instead:
 
@@ -44,7 +44,7 @@ Follow the official documentation on how to [install and run OS.js](http://os.js
 ## Making and submitting changes
 
 * Fork OS.js on github
-* Follow the [style guide](https://github.com/andersevenrud/OS.js-v2/wiki/Style-guide)
+* Follow the [style guide](https://github.com/os-js/OS.js/wiki/Style-guide)
 * Use **UTF-8** file encoding
 * I **strongly** recommend using a separate branch for your changes.
 * I **strongly** recommend [squashing](http://makandracards.com/makandra/527-squash-several-git-commits-into-a-single-commit) your commits if you have spread out a task into several pieces.

INSTALL.md

@@ -55,7 +55,7 @@ $ sudo npm install -g grunt-cli
 
 # You can also download and extarct the latest zip
 $ git clone https://github.com/os-js/OS.js.git
-$ cd OS.js-v2
+$ cd OS.js
 $ npm install --production
 $ grunt
 ```
@@ -77,7 +77,7 @@ $ npm install -g grunt-cli
 
 # You can also download and extarct the latest zip
 $ git clone https://github.com/os-js/OS.js.git
-$ cd OS.js-v2
+$ cd OS.js
 $ npm install
 
 # This is required to make the Development Environment work, but is optional.
@@ -134,7 +134,7 @@ You can install [node supervisor](https://github.com/petruisfan/node-supervisor)
 
 You can start a server manually with `(cd dist; php -S 0.0.0.0:8000 ../src/server/php/server.php)` or look below for webserver alternatives.
 
-If you have a "webhost" (or "webhotel") with ex. cPanel without shell access (or no node support), you can run OS.js, but has to be built on another computer, then transfered over to the target machine. The only downside here is that you'd have to run from /OS.js-v2/dist/ without doing modifications to the setup (if you don't have access to mod_rewrite to create proxy rules).
+If you have a "webhost" (or "webhotel") with ex. cPanel without shell access (or no node support), you can run OS.js, but has to be built on another computer, then transfered over to the target machine. The only downside here is that you'd have to run from /OS.js/dist/ without doing modifications to the setup (if you don't have access to mod_rewrite to create proxy rules).
 
 *By default PHP uses 'dist' as the default root*
 

Vagrantfile

@@ -41,22 +41,22 @@ Vagrant.configure(2) do |config|
     aptitude -y install make git npm
     ln -s /usr/bin/nodejs /usr/bin/node
 
-    # build OS.js-v2
+    # build OS.js
     sudo npm install -g grunt-cli
-    git clone https://github.com/andersevenrud/OS.js-v2.git
-    pushd OS.js-v2
+    git clone https://github.com/os-js/OS.js.git
+    pushd OS.js
     npm install
     grunt
 
-    # configure apache2 to serve OS.js-v2 dist-dev
+    # configure apache2 to serve OS.js dist-dev
     grunt apache-vhost:dist-dev:apache-vhost.conf
     sed -i -e 's/#Require/Require/' apache-vhost.conf
     sudo cp apache-vhost.conf /etc/apache2/sites-available/000-default.conf
     sudo service apache2 restart
 
     # update permissions
     popd
-    sudo chown -R vagrant:vagrant OS.js-v2
-    sudo chown -R www-data:www-data OS.js-v2/vfs
+    sudo chown -R vagrant:vagrant OS.js
+    sudo chown -R www-data:www-data OS.js/vfs
   SHELL
 end

package.json

@@ -2,7 +2,7 @@
   "name": "OS.js",
   "version": "2.0.0-alpha.71",
   "description": "JavaScript Cloud/Web Desktop Platform",
-  "url": "http://andersevenrud.github.io/OS.js-v2/",
+  "url": "http://os.js.org",
   "email": "[email protected]",
   "license": "BSD-2-Clause",
   "contributors": [
@@ -13,11 +13,11 @@
   ],
   "keywords": ["os.js", "web desktop", "cloud desktop"],
   "bugs": {
-    "url": "https://github.com/andersevenrud/OS.js-v2/issues"
+    "url": "https://github.com/os-js/OS.js/issues"
   },
   "repository": {
     "type": "git",
-    "url": "https://github.com/andersevenrud/OS.js-v2.git"
+    "url": "https://github.com/os-js/OS.js.git"
   },
   "scripts": {
     "test": "grunt test"

src/client/javascript/dialogs/error.js

@@ -106,7 +106,7 @@
         if ( self.traceMessage ) {
           body.push('\n```\n' + self.traceMessage + '\n```');
         }
-        window.open('//github.com/andersevenrud/OS.js-v2/issues/new?title=' + title + '&body=' + encodeURIComponent(body.join('\n')));
+        window.open('//github.com/os-js/OS.js/issues/new?title=' + title + '&body=' + encodeURIComponent(body.join('\n')));
       });
     } else {
       this.scheme.find(this, 'ButtonBugReport').hide();