diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index 188ef7f30..a42cdc2ca 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -1,5 +1,4 @@ -Read this in English: -[CONTRIBUTING.en.md](https://github.com/coopdevs/timeoverflow/blob/master/CONTRIBUTING.en.md) +:globe_with_meridians: Read this [in English](docs/CONTRIBUTING.en.md) # Contribuciones @@ -7,11 +6,11 @@ Read this in English: Proceso: * Abrir un hilo en [discourse](http://community.coopdevs.org/) para aclarar si es un bug o una feature :wink: -* Una vez aclarado el bug y detectado los pasos para reproducirlos se crearia una issue en GH con enlaze al hilo original en discourse -* Pull request que resuelve la issue -* Reportar en el hilo de discourse que el bug ha sido resuelto con enlace a PR +* Una vez aclarado el bug y detectado los pasos para reproducirlos se crearia una issue en GH con enlaze al hilo original en discourse. +* Pull request que resuelve la issue. +* Reportar en el hilo de discourse que el bug ha sido resuelto con enlace a PR. -Visita [la guia para empezar a desarrollar para timeoverflow](https://github.com/coopdevs/timeoverflow/wiki/Getting-started) +Visita [la guía para empezar a desarrollar para timeoverflow](https://github.com/coopdevs/timeoverflow/wiki/Getting-started). ## Contribuir con traducciones diff --git a/Gemfile b/Gemfile index 5a1943a13..88aec66df 100644 --- a/Gemfile +++ b/Gemfile @@ -1,6 +1,6 @@ source 'https://rubygems.org' -ruby '2.3.0' +ruby File.read('.ruby-version').strip gem 'rails', '~> 4.2' gem 'rails-i18n' diff --git a/Gemfile.lock b/Gemfile.lock index 3032c85f9..fb5b77c75 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -189,7 +189,7 @@ GEM i18n (~> 0.4) json rest-client - loofah (2.2.0) + loofah (2.2.2) crass (~> 1.0.2) nokogiri (>= 1.5.9) mail (2.7.0) @@ -245,8 +245,8 @@ GEM activesupport (>= 4.2.0, < 5.0) nokogiri (~> 1.6) rails-deprecated_sanitizer (>= 1.0.1) - rails-html-sanitizer (1.0.3) - loofah (~> 2.0) + rails-html-sanitizer (1.0.4) + loofah (~> 2.2, >= 2.2.2) rails-i18n (4.0.3) i18n (~> 0.6) railties (~> 4.0) diff --git a/README.md b/README.md index 69c0dce83..8456cc4fb 100644 --- a/README.md +++ b/README.md @@ -1,6 +1,7 @@ -# TimeOverflow [![Build Status](https://travis-ci.org/coopdevs/timeoverflow.svg)](https://travis-ci.org/coopdevs/timeoverflow) [![Code Climate](https://codeclimate.com/github/timeoverflow/timeoverflow/badges/gpa.svg)](https://codeclimate.com/github/timeoverflow/timeoverflow) [![Dependencies](https://gemnasium.com/coopdevs/timeoverflow.svg)](https://gemnasium.com/coopdevs/timeoverflow) +# TimeOverflow [![Build Status](https://travis-ci.org/coopdevs/timeoverflow.svg)](https://travis-ci.org/coopdevs/timeoverflow) [![Code Climate](https://codeclimate.com/github/timeoverflow/timeoverflow/badges/gpa.svg)](https://codeclimate.com/github/timeoverflow/timeoverflow) #### www.timeoverflow.org -#### Read this in English: https://github.com/coopdevs/timeoverflow/blob/master/README.en.md + +:globe_with_meridians: Read this [in English](docs/README.en.md) :bank: :hourglass: Sistema de gestión de Banco de Tiempo. [Saber más sobre Bancos de Tiempo](http://www.bdtonline.org/) @@ -9,7 +10,7 @@ de los miembros y la gestión de los Bancos de Tiempo. El modelo sobre el que se que hacen uso de él y está preparado para poder albergar varios Bancos de Tiempo en una sola instalación, para ello cuenta con tres niveles de privilegios: superadmin, admin (solo gestiona un Banco) y miembros de un Banco. -![Lista de usuarios](usuarios.png) ![Lista de ofertas](ofertas.png) +![Lista de usuarios](docs/usuarios.png) ![Lista de ofertas](docs/ofertas.png) TimeOverflow está dividido en 2 grandes bloques: @@ -36,33 +37,12 @@ de Tiempo y también tienen la posibilidad de consultar el extracto de su cuenta # Contribuciones -## Únete al equipo de colaboradores!! - -https://github.com/coopdevs/timeoverflow/blob/develop/CONTRIBUTING.md - -## License - -This is free and unencumbered software released into the public domain. +**Únete al equipo de colaboradores!** -Anyone is free to copy, modify, publish, use, compile, sell, or -distribute this software, either in source code form or as a compiled -binary, for any purpose, commercial or non-commercial, and by any -means. +:point_right: Más información [aquí](CONTRIBUTING.md). -In jurisdictions that recognize copyright laws, the author or authors -of this software dedicate any and all copyright interest in the -software to the public domain. We make this dedication for the benefit -of the public at large and to the detriment of our heirs and -successors. We intend this dedication to be an overt act of -relinquishment in perpetuity of all present and future rights to this -software under copyright law. +# Licencia -THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, -EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF -MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. -IN NO EVENT SHALL THE AUTHORS 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. +> The Unlicense -For more information, please refer to +Puedes consultar la licencia [aquí](UNLICENSE). diff --git a/Vagrantfile b/Vagrantfile deleted file mode 100644 index 235d282e8..000000000 --- a/Vagrantfile +++ /dev/null @@ -1,127 +0,0 @@ -# -*- mode: ruby -*- -# vi: set ft=ruby : - -# Vagrantfile API/syntax version. Don't touch unless you know what you're doing! -VAGRANTFILE_API_VERSION = "2" - -Vagrant.configure(VAGRANTFILE_API_VERSION) do |config| - # All Vagrant configuration is done here. The most common configuration - # options are documented and commented below. For a complete reference, - # please see the online documentation at vagrantup.com. - - # Every Vagrant virtual environment requires a box to build off of. - config.vm.box = "ubuntu/trusty64" - config.vm.provision :shell, path: "bootstrap.sh" - - # Disable automatic box update checking. If you disable this, then - # boxes will only be checked for updates when the user runs - # `vagrant box outdated`. This is not recommended. - # config.vm.box_check_update = false - - # Create a forwarded port mapping which allows access to a specific port - # within the machine from a port on the host machine. In the example below, - # accessing "localhost:8080" will access port 80 on the guest machine. - # config.vm.network "forwarded_port", guest: 80, host: 8080 - config.vm.network "forwarded_port", guest: 3000, host: 3000, auto_correct: true # For rails - config.vm.network "forwarded_port", guest: 4000, host: 4000, auto_correct: true # For nomachine - config.vm.network "forwarded_port", guest: 5432, host: 15432, auto_correct: true # For PostgreSQL access from PgAdmin - - # Create a private network, which allows host-only access to the machine - # using a specific IP. - # config.vm.network "private_network", ip: "192.168.33.10" - - # Create a public network, which generally matched to bridged network. - # Bridged networks make the machine appear as another physical device on - # your network. - # config.vm.network "public_network" - - # If true, then any SSH connections made will enable agent forwarding. - # Default value: false - config.ssh.forward_agent = true - - # Share an additional folder to the guest VM. The first argument is - # the path on the host to the actual folder. The second argument is - # the path on the guest to mount the folder. And the optional third - # argument is a set of non-required options. - # config.vm.synced_folder "../data", "/vagrant_data" - - # Provider-specific configuration so you can fine-tune various - # backing providers for Vagrant. These expose provider-specific options. - # Example for VirtualBox: - # - config.vm.provider "virtualbox" do |vb| - # # Don't boot with headless mode - # vb.gui = true - - # Use VBoxManage to customize the VM. For example to change memory: - #vb.customize ["modifyvm", :id, "--memory", "1024"] - vb.memory = 1024 - end - # - # View the documentation for the provider you're using for more - # information on available options. - - # Enable provisioning with CFEngine. CFEngine Community packages are - # automatically installed. For example, configure the host as a - # policy server and optionally a policy file to run: - # - # config.vm.provision "cfengine" do |cf| - # cf.am_policy_hub = true - # # cf.run_file = "motd.cf" - # end - # - # You can also configure and bootstrap a client to an existing - # policy server: - # - # config.vm.provision "cfengine" do |cf| - # cf.policy_server_address = "10.0.2.15" - # end - - # Enable provisioning with Puppet stand alone. Puppet manifests - # are contained in a directory path relative to this Vagrantfile. - # You will need to create the manifests directory and a manifest in - # the file default.pp in the manifests_path directory. - # - # config.vm.provision "puppet" do |puppet| - # puppet.manifests_path = "manifests" - # puppet.manifest_file = "default.pp" - # end - - # Enable provisioning with chef solo, specifying a cookbooks path, roles - # path, and data_bags path (all relative to this Vagrantfile), and adding - # some recipes and/or roles. - # - # config.vm.provision "chef_solo" do |chef| - # chef.cookbooks_path = "../my-recipes/cookbooks" - # chef.roles_path = "../my-recipes/roles" - # chef.data_bags_path = "../my-recipes/data_bags" - # chef.add_recipe "mysql" - # chef.add_role "web" - # - # # You may also specify custom JSON attributes: - # chef.json = { mysql_password: "foo" } - # end - - # Enable provisioning with chef server, specifying the chef server URL, - # and the path to the validation key (relative to this Vagrantfile). - # - # The Opscode Platform uses HTTPS. Substitute your organization for - # ORGNAME in the URL and validation key. - # - # If you have your own Chef Server, use the appropriate URL, which may be - # HTTP instead of HTTPS depending on your configuration. Also change the - # validation key to validation.pem. - # - # config.vm.provision "chef_client" do |chef| - # chef.chef_server_url = "https://api.opscode.com/organizations/ORGNAME" - # chef.validation_key_path = "ORGNAME-validator.pem" - # end - # - # If you're using the Opscode platform, your validator client is - # ORGNAME-validator, replacing ORGNAME with your organization name. - # - # If you have your own Chef Server, the default validation client name is - # chef-validator, unless you changed the configuration. - # - # chef.validation_client_name = "ORGNAME-validator" -end diff --git a/app/assets/stylesheets/application.css.scss b/app/assets/stylesheets/application.css.scss index b24eb34d2..bead08185 100644 --- a/app/assets/stylesheets/application.css.scss +++ b/app/assets/stylesheets/application.css.scss @@ -2,6 +2,9 @@ *= require_self */ +@import "bootstrap-sprockets"; +@import "bootstrap"; + $bg-color: #f5f8fa; $navs-bg-color: #1e1e1e; $white: #ffffff; @@ -89,6 +92,10 @@ html { span.input-group-addon { padding: 2rem 2rem 2rem 3rem; + + @media (max-width: $screen-xs-min) { + display: none; + } } span.show-password { @@ -304,7 +311,6 @@ table.users { max-width: 100%; } } - } @media print { @@ -625,6 +631,10 @@ form .checkbox input[type="checkbox"] { letter-spacing: 0.031rem; margin-bottom: 2rem; margin-top: 3rem; + + @media (max-width: $screen-xs-min) { + display: none; + } } .material-icons { @@ -654,7 +664,7 @@ form .checkbox input[type="checkbox"] { } form .checkbox input[type="checkbox"]:checked { - background-image: url(checked.png); + background-image: image-url('checked.png'); background-size: 100%; } diff --git a/app/assets/stylesheets/libs.scss b/app/assets/stylesheets/libs.scss index 4961a6bef..485de4a76 100644 --- a/app/assets/stylesheets/libs.scss +++ b/app/assets/stylesheets/libs.scss @@ -2,6 +2,3 @@ *= require jquery-ui *= require select2 */ - -@import "bootstrap-sprockets"; -@import "bootstrap"; \ No newline at end of file diff --git a/app/views/users/show.html.erb b/app/views/users/show.html.erb index d723fe4b0..7d0eeed6d 100644 --- a/app/views/users/show.html.erb +++ b/app/views/users/show.html.erb @@ -21,6 +21,9 @@ <%= image_tag avatar_url(@user, 160) %> + + <%= glyph :pencil %> <%= t ".change_your_image" %> + <% else %> <%= image_tag avatar_url(@user, 160) %> <% end %> diff --git a/bootstrap.sh b/bootstrap.sh deleted file mode 100644 index 0a7368626..000000000 --- a/bootstrap.sh +++ /dev/null @@ -1,166 +0,0 @@ -#!/usr/bin/env bash - -echo '******************************************************' -echo "Vagrant image provisioning started at " -date -date > /etc/vagrant_provisioned_at -echo '******************************************************' -# 1. Apply updates and install essential dependencies -echo '' -echo '******************************************************' -echo '****** STEP 1 of 10 ***** Applying Ubuntu Updates and installing dependencies' -echo '******************************************************' -echo '' -sudo apt-get -y update -sudo apt-get -y upgrade -sudo apt-get -y install git-core build-essential zlib1g-dev nodejs libpq-dev - -# 2. Configure GIT -echo '' -echo '******************************************************' -echo '****** STEP 2 of 10 ***** Configuring GIT' -echo '******************************************************' -echo '' - -cd /vagrant -git config --global core.autocrlf input -git config --global color.ui true -git config --global push.default simple -git config --global pull.rebase true -git config --global alias.changed "show --pretty=\"format:\" --name-only" -git config --global alias.nicelog "log --pretty=format:'%Cgreen%cd [%h] %Cblue<%an> %Cred%s' --date-order" -git config --global alias.s "status -s" -git config --global alias.lg "log --oneline --decorate --all --graph" -git config --global alias.g "grep --break --heading --line-number" -git remote add upstream https://github.com/coopdevs/timeoverflow.git - -# 3.Install RVM -echo '' -echo '******************************************************' -echo '****** STEP 3 of 10 ***** Installing RVM' -echo '******************************************************' -echo '' - -gpg --keyserver hkp://keys.gnupg.net --recv-keys D39DC0E3 -\curl -L https://get.rvm.io | bash -s stable -source /etc/profile.d/rvm.sh - -# 4.Install ruby 2.2.0 and bundler -echo '' -echo '******************************************************' -echo '****** STEP 4 of 10 ***** Installing ruby 2.2.0' -echo '******************************************************' -echo '' - -rvm install 2.2.0 -rvm use 2.2.0 -rvm --default 2.2.0 - -# 5.Install bundler and apply gems from Gemfile.lock -echo '' -echo '******************************************************' -echo '****** STEP 5 of 10 ***** Installing Bundler and TimeOverflow gems' -echo '******************************************************' -gem install bundler -bundle install - -# 6.Install and setup PostgreSQL 9.3 -echo '' -echo '******************************************************' -echo '****** STEP 6 of 10 ***** Installing and configuring PostgreSQL for development' -echo '******************************************************' -echo '' -sudo apt-get -y install postgresql postgresql-contrib -pg_hba=`sudo find / -name pg_hba.conf -print -quit|head -1` -sudo -u postgres sed -ibak 's/postgres/all/gi' $pg_hba -sudo -u postgres sed -ibak 's/peer/trust/gi' $pg_hba -sudo -u postgres sed -ibak 's/md5/trust/gi' $pg_hba -sudo service postgresql restart -sudo -u postgres -i psql -c 'CREATE EXTENSION hstore;' -sudo -u postgres -i psql -c 'CREATE USER vagrant WITH SUPERUSER CREATEROLE CREATEDB;' -sudo -u postgres -i psql -c 'CREATE USER root WITH SUPERUSER CREATEROLE CREATEDB;' - -# 7.Create all databases -echo '' -echo '******************************************************' -echo '****** STEP 7 of 10 ***** Creating TimeOverflow Databases (development,test,production)' -echo '******************************************************' -echo '' -rake db:create RAILS_ENV=development -rake db:create RAILS_ENV=test -rake db:create RAILS_ENV=production - -# 8.Grant privileges to user vagrant -echo '' -echo '******************************************************' -echo '****** STEP 8 of 10 ***** Granting privileges to User vagrant on these databases' -echo '******************************************************' -echo '' -sudo -u postgres -i psql -c 'GRANT ALL PRIVILEGES ON DATABASE timeoverflow_development to vagrant;' -sudo -u postgres -i psql -c 'GRANT ALL PRIVILEGES ON DATABASE timeoverflow_test to vagrant;' -sudo -u postgres -i psql -c 'GRANT ALL PRIVILEGES ON DATABASE timeoverflow_production to vagrant;' -sudo -u postgres -i psql -c 'GRANT ALL PRIVILEGES ON DATABASE timeoverflow_development to root;' -sudo -u postgres -i psql -c 'GRANT ALL PRIVILEGES ON DATABASE timeoverflow_test to root;' -sudo -u postgres -i psql -c 'GRANT ALL PRIVILEGES ON DATABASE timeoverflow_production to root;' - -# 9.Run DB migrations -echo '' -echo '******************************************************' -echo '****** STEP 9 of 10 ***** Running Databases Migrations' -echo '******************************************************' -echo '' -rake db:migrate RAILS_ENV=development -rake db:migrate RAILS_ENV=test -rake db:migrate RAILS_ENV=production - -# 10.Run DB seeds -echo '' -echo '******************************************************' -echo '****** STEP 9 of 10 ***** Running Database Seeds' -echo '******************************************************' -echo '' -rake db:seed RAILS_ENV=development -rake db:seed RAILS_ENV=test -rake db:seed RAILS_ENV=production - -# 12.Inform we are DONE! -echo '' -echo '********************** DONE! *************************' -echo 'Vagrant image for TimeOverflow development provisioned! :)' -echo "Date of provisioning saved at /etc/vagrant_provisioned_at file" -echo '******************************************************' -echo '' -echo '******************* IMPORTANT ******************' -echo 'Please remember to finish your git configuration' -echo '' -echo 'Configure your user.name and user.email that will show in Github' -echo '$ git config --global user.email "your@email.com"' -echo '$ git config --global user.name "Your name"' -echo '******************* IMPORTANT *****************' -echo '' -echo '**************' -echo 'What is next?' -echo '**************' -echo '1. launch a session of the TimeOverflow Vagrant image and go to /vagrant folder' -echo ' NOTE: /vagrant folder is a shared folder with your host where TimeOverflow code resides' -echo ' $ vagrant ssh' -echo ' $ cd /vagrant' -echo '2. Then develop using your host editor.' -echo '3. Run TimeOverflow by doing' -echo ' $ cd /vagrant' -echo ' $ rails s' -echo 'As we are doing port forwarding for 3000 you can access the running app from your browser at http://localhost:3000' -echo '' -echo '4. For commits and other GIT commands: You can use GIT from vagrant ssh session or from your host computer' -echo ' If using Windows host machine use GIT from vagrant ssh session' -echo '' -echo 'For more details visit the TimeOverflow Wiki at Github, specially following links' -echo 'https://github.com/coopdevs/timeoverflow/wiki/Getting-started' -echo 'https://github.com/coopdevs/timeoverflow/wiki/Configuring-Postgres-to-Avoid-using-environment-variables' -echo '' -echo '' -echo '******************************************************' -echo "Vagrant image provisioning finished at " -date -date >> /etc/vagrant_provisioned_at -echo '******************************************************' diff --git a/config/locales/ca.yml b/config/locales/ca.yml index a07718d33..5f2bf5e9e 100644 --- a/config/locales/ca.yml +++ b/config/locales/ca.yml @@ -518,6 +518,7 @@ ca: accounts: Comptes balance: 'Balanç:' categories: Serveis Ofertats + change_your_image: Canvia la teva imatge created_at: 'Alta:' data: Dades de l'usuari date: Data diff --git a/config/locales/en.yml b/config/locales/en.yml index b09210304..64aad56cc 100644 --- a/config/locales/en.yml +++ b/config/locales/en.yml @@ -518,6 +518,7 @@ en: accounts: Accounts balance: 'Balance:' categories: Offered Services + change_your_image: Change your image created_at: 'Registered:' data: User details date: Date diff --git a/config/locales/es.yml b/config/locales/es.yml index 0499f3ae9..ef62fa833 100644 --- a/config/locales/es.yml +++ b/config/locales/es.yml @@ -518,6 +518,7 @@ es: accounts: Cuentas balance: 'Balance:' categories: Servicios Ofrecidos + change_your_image: Cambia tu imagen created_at: 'Alta:' data: Datos del usuario date: Fecha diff --git a/config/locales/eu.yml b/config/locales/eu.yml index b08c0dd1c..24fe72b2a 100644 --- a/config/locales/eu.yml +++ b/config/locales/eu.yml @@ -524,6 +524,7 @@ eu: accounts: Kontuak balance: 'Balantzea:' categories: Eskainiriko zerbitzuak + change_your_image: created_at: 'Alta:' data: Erabiltzailearen datuak date: Eguna diff --git a/config/locales/pt-BR.yml b/config/locales/pt-BR.yml index 307aea3d2..c9b1add8b 100644 --- a/config/locales/pt-BR.yml +++ b/config/locales/pt-BR.yml @@ -518,6 +518,7 @@ pt-BR: accounts: Contas balance: 'Balanço:' categories: Serviços Oferecidos + change_your_image: created_at: 'Inscrição:' data: Dados do usuário date: Data diff --git a/CONTRIBUTING.en.md b/docs/CONTRIBUTING.en.md similarity index 75% rename from CONTRIBUTING.en.md rename to docs/CONTRIBUTING.en.md index 30955c7ff..9ed140e25 100644 --- a/CONTRIBUTING.en.md +++ b/docs/CONTRIBUTING.en.md @@ -1,14 +1,14 @@ -# Contribuciones +# Contributing Did you find a bug? Do you want to collaborate? Process: * Open a thread in [discourse](http://community.coopdevs.org/) to make sure whether it's a bug or a feature :wink: * Once we understand what the bug is about and know the steps to reproduce we will create an issue in GitHub linking to the Discourse thread. -* Create a pull request to solve the issue -* Report back to the discourse thread the bug has been solved linking to the pull request +* Create a pull request to solve the issue. +* Report back to the discourse thread the bug has been solved linking to the pull request. -Visita [la guia para empezar a desarrollar para timeoverflow](https://github.com/coopdevs/timeoverflow/wiki/Getting-started) +Visit [the getting started guide to start developing](https://github.com/coopdevs/timeoverflow/wiki/Getting-started). ## Contributing with translations diff --git a/README.en.md b/docs/README.en.md similarity index 51% rename from README.en.md rename to docs/README.en.md index 28a0074be..2440cb485 100644 --- a/README.en.md +++ b/docs/README.en.md @@ -1,4 +1,4 @@ -# TimeOverflow [![Build Status](https://travis-ci.org/coopdevs/timeoverflow.svg)](https://travis-ci.org/coopdevs/timeoverflow) [![Code Climate](https://codeclimate.com/github/timeoverflow/timeoverflow/badges/gpa.svg)](https://codeclimate.com/github/timeoverflow/timeoverflow) [![Dependencies](https://gemnasium.com/coopdevs/timeoverflow.svg)](https://gemnasium.com/coopdevs/timeoverflow) +# TimeOverflow [![Build Status](https://travis-ci.org/coopdevs/timeoverflow.svg)](https://travis-ci.org/coopdevs/timeoverflow) [![Code Climate](https://codeclimate.com/github/timeoverflow/timeoverflow/badges/gpa.svg)](https://codeclimate.com/github/timeoverflow/timeoverflow) #### https://www.timeoverflow.org/ :bank: :hourglass: Time Bank management system. [Learn more about Time Banks](http://www.bdtonline.org/) @@ -14,10 +14,10 @@ and members of a bank. TimeOverflow is divided into 2 large blocks: -* ** Management system for administrators ** -* ** Social network and online banking for users ** +* **Management system for administrators** +* **Social network and online banking for users** -> ** NOTE ** A physical Time Bank can work only with the management block, it could happen, for example, that the vast majority of its members do not use the Internet and may want to operate only with listings, checks and a management office . +> **NOTE** A physical Time Bank can work only with the management block, it could happen, for example, that the vast majority of its members do not use the Internet and may want to operate only with listings, checks and a management office. ## Management system @@ -37,33 +37,12 @@ of Time and also have the possibility to consult the extract of their account. # Contributions -## Join the team of collaborators !! +**Join our collaborators team!** -https://github.com/coopdevs/timeoverflow/blob/develop/CONTRIBUTING.md +:point_right: Further information [here](CONTRIBUTING.en.md). -## License +# License -This is free and unencumbered software released into the public domain. +> The Unlicense -Anyone is free to copy, modify, publish, use, compile, sell, or -distribute this software, either in source code form or as a compiled -binary, for any purpose, commercial or non-commercial, and by any -means. - -In jurisdictions that recognize copyright laws, the author or authors -of this software dedicate any and all copyright interest in the -software to the public domain. We make this dedication for the benefit -of the public at large and to the detriment of our heirs and -successors. We intend this dedication to be an overt act of -relinquishment in perpetuity of all present and future rights to this -software under copyright law. - -THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, -EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF -MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. -IN NO EVENT SHALL THE AUTHORS 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. - -For more information, please refer to +You can find the license file [here](../UNLICENSE). \ No newline at end of file diff --git a/ofertas.png b/docs/ofertas.png similarity index 100% rename from ofertas.png rename to docs/ofertas.png diff --git a/usuarios.png b/docs/usuarios.png similarity index 100% rename from usuarios.png rename to docs/usuarios.png