diff --git a/CHANGELOG.md b/CHANGELOG.md index fb30972f3..bd853a9a9 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -519,7 +519,7 @@ - Fix a bug: user is not redirected after changing is duplicated e-mail on the SSO provider ## v2.1.0 2016 May 2 -- Add search feature on openlab projects : [Openlab-projects](https://github.com/LaCasemate/openlab-projects) +- Add search feature on openlab projects : [Openlab-projects](https://github.com/sleede/openlab-projects) - Add integration tests for main features - Credits logic has been extracted into a microservice - Improved UI list of projects diff --git a/LICENSE.md b/LICENSE.md index 3deb50991..e20c7f8ad 100644 --- a/LICENSE.md +++ b/LICENSE.md @@ -1,4 +1,4 @@ -Copyright (C) 2015 La Casemate +Copyright (C) 2019 Sleede This program is free software: you can redistribute it and/or modify it under the terms of the GNU Affero General Public License as published @@ -14,43 +14,6 @@ Copyright (C) 2015 La Casemate along with this program. If not, see . -Fab-Manager uses some external components, which are licenced under the -terms of the following licences: - -- [Apache 2 license](http://www.apache.org/licenses/LICENSE-2.0): - - [jasny-bootstrap](https://github.com/jasny/bootstrap/) - - [elasticsearch](https://github.com/elasticsearch/bower-elasticsearch-js) - - [nvd3](https://github.com/novus/nvd3) - - [angular-bootstrap-switch](https://github.com/frapontillo/angular-bootstrap-switch) - - [elasticsearch-rails](https://github.com/elastic/elasticsearch-rails) - - [elasticsearch-model](https://github.com/elastic/elasticsearch-rails/tree/master/elasticsearch-model) - - [elasticsearch-persistence](https://github.com/elastic/elasticsearch-rails/tree/master/elasticsearch-persistence) - - font [Open Sans](http://www.fontsquirrel.com/fonts/open-sans) - -- [General Public License version 2](http://www.gnu.org/licenses/old-licenses/gpl-2.0-faq.en.html): - - [railroady](https://github.com/preston/railroady) - - [unicorn](https://github.com/defunkt/unicorn) - - [prawn](https://github.com/prawnpdf/prawn) - - [prawn-table](https://github.com/prawnpdf/prawn-table) - -- [BSD-2-Clause](https://opensource.org/licenses/BSD-2-Clause) - - [ruby](https://www.ruby-lang.org) - - [rubyzip](https://github.com/rubyzip/rubyzip) - - [byebug](https://github.com/deivid-rodriguez/byebug) - -- [MIT Licence](https://opensource.org/licenses/MIT) - - Errors and omissions excepted, all the other external libraries used - in this project. - -Please refer to the libraries documentation for more information about -their licences. - -Complete lists of used libraries are available in `bower.json` for the -JS/EcmaScript libraries and in `Gemfile` for Ruby libraries. - - - - GNU AFFERO GENERAL PUBLIC LICENSE Version 3, 19 November 2007 diff --git a/README.md b/README.md index 873cd0959..76630ccfd 100644 --- a/README.md +++ b/README.md @@ -496,7 +496,7 @@ It enables you to write plugins which can: To install a plugin, you just have to copy the plugin folder which contains its code into the folder `plugins` of Fab-manager. -You can see an example on the [repo of navinum gamification plugin](https://github.com/LaCasemate/navinum-gamification) +You can see an example on the [repo of navinum gamification plugin](https://github.com/sleede/navinum-gamification) ## Single Sign-On diff --git a/app/doc/open_api/v1/events_doc.rb b/app/doc/open_api/v1/events_doc.rb index 4b8f391de..70f7d669c 100644 --- a/app/doc/open_api/v1/events_doc.rb +++ b/app/doc/open_api/v1/events_doc.rb @@ -21,7 +21,7 @@ class OpenAPI::V1::EventsDoc < OpenAPI::V1::BaseDoc { "id": 183, "title": "OPEN LAB", - "description": "Que vous soyez Fab user, visiteur, curieux ou bricoleur, l’atelier de fabrication numérique vous ouvre ses portes les mercredis soirs pour avancer vos projets ou rencontrer la «communauté» Fab Lab. \r\n\r\nCe soir, venez spécialement découvrir les machines à commandes numérique du Fab Lab de La Casemate, venez comprendre ce lieux ouvert à tous. \r\n\r\n\r\nVenez découvrir un concept, une organisation, des machines, pour stimuler votre sens de la créativité.", + "description": "Que vous soyez Fab user, visiteur, curieux ou bricoleur, l’atelier de fabrication numérique vous ouvre ses portes les mercredis soirs pour avancer vos projets ou rencontrer la «communauté» Fab Lab. \r\n\r\nCe soir, venez spécialement découvrir les machines à commandes numérique de la Fabrique de Fab-manager, venez comprendre ce lieux ouvert à tous. \r\n\r\n\r\nVenez découvrir un concept, une organisation, des machines, pour stimuler votre sens de la créativité.", "updated_at": "2016-04-25T10:49:40.055+02:00", "created_at": "2016-04-25T10:49:40.055+02:00", "nb_total_places": 18, diff --git a/doc/elastic_upgrade.md b/doc/elastic_upgrade.md index bed715d7e..2ef11a022 100644 --- a/doc/elastic_upgrade.md +++ b/doc/elastic_upgrade.md @@ -21,7 +21,7 @@ Once you've understood all the points above, you can run the migration script wi ```bash cd /apps/fabmanager # do not run as root, elevation will be prompted if needed -\curl https://raw.githubusercontent.com/LaCasemate/fab-manager/master/scripts/elastic-upgrade.sh | bash +\curl https://raw.githubusercontent.com/sleede/fab-manager/master/scripts/elastic-upgrade.sh | bash ``` ## Manual upgrade @@ -99,7 +99,7 @@ Then, edit your [docker-compose.yml](../docker/docker-compose.yml) and change th Now you can safely restart the upgrade script. ```bash -\curl https://raw.githubusercontent.com/LaCasemate/fab-manager/master/scripts/elastic-upgrade.sh | bash +\curl https://raw.githubusercontent.com/sleede/fab-manager/master/scripts/elastic-upgrade.sh | bash ``` ## Debugging the upgrade diff --git a/docker/README.md b/docker/README.md index af68cefa2..c95369023 100644 --- a/docker/README.md +++ b/docker/README.md @@ -57,7 +57,7 @@ On DigitalOcean, create a Droplet with One-click apps **"Docker on Ubuntu 16.04 This way, Docker and Docker-compose are preinstalled. Choose a datacenter and set the hostname as your domain name. -With other providers, choose a [supported operating system](https://github.com/LaCasemate/fab-manager/blob/master/README.md#software-stack) and install docker on it: +With other providers, choose a [supported operating system](https://github.com/sleede/fab-manager/blob/master/README.md#software-stack) and install docker on it: - [Debian](https://docs.docker.com/engine/installation/linux/docker-ce/debian/) - [Ubuntu](https://docs.docker.com/engine/installation/linux/docker-ce/ubuntu/) @@ -95,7 +95,7 @@ You can run the following script as root to easily perform all these operations: ### Retrieve the initial configuration files ```bash -\curl -sSL https://raw.githubusercontent.com/LaCasemate/fab-manager/master/docker/setup.sh | bash +\curl -sSL https://raw.githubusercontent.com/sleede/fab-manager/master/docker/setup.sh | bash ``` ### Setup folders and env file @@ -317,7 +317,7 @@ docker-compose run --rm -e ADMIN_EMAIL=xxx -e ADMIN_PASSWORD=xxx fabmanager bund ### Steps When a new version is available, follow this procedure to update fab-manager app in a production environment, using docker-compose. -You can subscribe to [this atom feed](https://github.com/LaCasemate/fab-manager/releases.atom) to get notified when a new release comes out. +You can subscribe to [this atom feed](https://github.com/sleede/fab-manager/releases.atom) to get notified when a new release comes out. 1. go to your app folder @@ -342,8 +342,8 @@ You can subscribe to [this atom feed](https://github.com/LaCasemate/fab-manager/ 6. run specific commands **Do not forget** to check if there are commands to run for your upgrade. Those commands - are always specified in the [CHANGELOG](https://github.com/LaCasemate/fab-manager/blob/master/CHANGELOG.md) and prefixed by **[TODO DEPLOY]**. - They are also present in the [releases page](https://github.com/LaCasemate/fab-manager/releases). + are always specified in the [CHANGELOG](https://github.com/sleede/fab-manager/blob/master/CHANGELOG.md) and prefixed by **[TODO DEPLOY]**. + They are also present in the [releases page](https://github.com/sleede/fab-manager/releases). Those commands execute specific tasks and have to be run by hand. @@ -361,5 +361,5 @@ You can check that all containers are running with `docker ps`. #### Is it possible to update several versions at the same time ? Yes, indeed. It's the default behaviour as `docker-compose pull` command will fetch the latest versions of the docker images. -Be sure to run all the specific commands listed in the [CHANGELOG](https://github.com/LaCasemate/fab-manager/blob/master/CHANGELOG.md) between your actual +Be sure to run all the specific commands listed in the [CHANGELOG](https://github.com/sleede/fab-manager/blob/master/CHANGELOG.md) between your actual and the new version in sequential order. (Example: to update from 2.4.0 to 2.4.3, you will run the specific commands for the 2.4.1, then for the 2.4.2 and then for the 2.4.3). diff --git a/docker/setup.sh b/docker/setup.sh index 023db60a4..3350c550a 100644 --- a/docker/setup.sh +++ b/docker/setup.sh @@ -8,21 +8,21 @@ prepare_config() mkdir -p "$FABMANAGER_PATH/elasticsearch/config" # fab-manager environment variables - \curl -sSL https://raw.githubusercontent.com/LaCasemate/fab-manager/master/docker/env.example > "$FABMANAGER_PATH/example/env.example" + \curl -sSL https://raw.githubusercontent.com/sleede/fab-manager/master/docker/env.example > "$FABMANAGER_PATH/example/env.example" # nginx configuration - \curl -sSL https://raw.githubusercontent.com/LaCasemate/fab-manager/master/docker/nginx_with_ssl.conf.example > "$FABMANAGER_PATH/example/nginx_with_ssl.conf.example" - \curl -sSL https://raw.githubusercontent.com/LaCasemate/fab-manager/master/docker/nginx.conf.example > "$FABMANAGER_PATH/example/nginx.conf.example" + \curl -sSL https://raw.githubusercontent.com/sleede/fab-manager/master/docker/nginx_with_ssl.conf.example > "$FABMANAGER_PATH/example/nginx_with_ssl.conf.example" + \curl -sSL https://raw.githubusercontent.com/sleede/fab-manager/master/docker/nginx.conf.example > "$FABMANAGER_PATH/example/nginx.conf.example" # let's encrypt configuration - \curl -sSL https://raw.githubusercontent.com/LaCasemate/fab-manager/master/docker/webroot.ini.example > "$FABMANAGER_PATH/example/webroot.ini.example" + \curl -sSL https://raw.githubusercontent.com/sleede/fab-manager/master/docker/webroot.ini.example > "$FABMANAGER_PATH/example/webroot.ini.example" # ElasticSearch configuration files - \curl -sSL https://raw.githubusercontent.com/LaCasemate/fab-manager/master/docker/elasticsearch.yml > "$FABMANAGER_PATH/elasticsearch/config/elasticsearch.yml" - \curl -sSL https://raw.githubusercontent.com/LaCasemate/fab-manager/master/docker/log4j2.properties > "$FABMANAGER_PATH/elasticsearch/config/log4j2.properties" + \curl -sSL https://raw.githubusercontent.com/sleede/fab-manager/master/docker/elasticsearch.yml > "$FABMANAGER_PATH/elasticsearch/config/elasticsearch.yml" + \curl -sSL https://raw.githubusercontent.com/sleede/fab-manager/master/docker/log4j2.properties > "$FABMANAGER_PATH/elasticsearch/config/log4j2.properties" # docker-compose - \curl -sSL https://raw.githubusercontent.com/LaCasemate/fab-manager/master/docker/docker-compose.yml > "$FABMANAGER_PATH/docker-compose.yml" + \curl -sSL https://raw.githubusercontent.com/sleede/fab-manager/master/docker/docker-compose.yml > "$FABMANAGER_PATH/docker-compose.yml" } prepare_config "$@" diff --git a/package.json b/package.json index 4313cc544..86c536394 100644 --- a/package.json +++ b/package.json @@ -11,9 +11,9 @@ "documentation" ], "homepage": "http://www.fab-manager.com/", - "repository": "https://github.com/LaCasemate/fab-manager.git", + "repository": "https://github.com/sleede/fab-manager.git", "bugs": { - "url": "https://github.com/LaCasemate/fab-manager/issues" + "url": "https://github.com/sleede/fab-manager/issues" }, "license": "AGPL-3.0-only", "devDependencies": { diff --git a/scripts/elastic-upgrade.sh b/scripts/elastic-upgrade.sh index c4320da02..fd91b2c00 100755 --- a/scripts/elastic-upgrade.sh +++ b/scripts/elastic-upgrade.sh @@ -325,8 +325,8 @@ upgrade_compose() abs_dir=$(echo "$dir" | sed "s^\${PWD}^$FM_PATH^") echo -e "\nCopying ElasticSearch 2.4 configuration files from GitHub to $abs_dir..." mkdir -p "$abs_dir" - curl -sSL https://raw.githubusercontent.com/LaCasemate/fab-manager/master/docker/elasticsearch.yml > "$abs_dir/elasticsearch.yml" - curl -sSL https://raw.githubusercontent.com/LaCasemate/fab-manager/master/docker/log4j2.properties > "$abs_dir/log4j2.properties" + curl -sSL https://raw.githubusercontent.com/sleede/fab-manager/master/docker/elasticsearch.yml > "$abs_dir/elasticsearch.yml" + curl -sSL https://raw.githubusercontent.com/sleede/fab-manager/master/docker/log4j2.properties > "$abs_dir/log4j2.properties" fi docker-compose pull docker-compose up -d