Skip to content

remove outdated Vagrant + docs update #336

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 4 commits into from
Apr 3, 2018
Merged

remove outdated Vagrant + docs update #336

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
d923d1c
:scissors: outdated Vagrant file
markets Mar 18, 2018
caf107b
add docs/ folder to keep translations and other support files out of …
markets Mar 18, 2018
63dede0
fix relative links in README.en.md
markets Mar 18, 2018
bf6853d
Gemfile: remove ruby version (as we don't officially support Heroku d…
markets Mar 18, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 5 additions & 6 deletions CONTRIBUTING.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,17 +1,16 @@
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

¿Has encontrado algún bug? ¿Quieres colaborar?

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

Expand Down
2 changes: 0 additions & 2 deletions Gemfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,5 @@
source 'https://rubygems.org'

ruby '2.3.0'
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

⚠️


gem 'rails', '~> 4.2'
gem 'rails-i18n'
gem "rdiscount"
Expand Down
3 changes: 0 additions & 3 deletions Gemfile.lock
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -414,8 +414,5 @@ DEPENDENCIES
web-console (= 2.1.3)
whenever

RUBY VERSION
ruby 2.3.0p0

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

⚠️

Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I think we need both .ruby-version and a version specified in the Gemfile. The former will make rbenv, rvm or chruby to use the specified version and the latter will make it obvious that someone used a different ruby version (the check doesn't raise any error).

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Let's create an issue then!

BUNDLED WITH
1.16.1
38 changes: 9 additions & 29 deletions README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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/)

Expand All @@ -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:

Expand All @@ -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 <http://unlicense.org/>
Puedes consultar la licencia [aquí](UNLICENSE).
127 changes: 0 additions & 127 deletions Vagrantfile
View file
Open in desktop

This file was deleted.

166 changes: 0 additions & 166 deletions bootstrap.sh
View file
Open in desktop

This file was deleted.

Loading