From 7984ea3c2f7e9294ed829e7955ffb3683bb4ea02 Mon Sep 17 00:00:00 2001 From: Marc Anguera Date: Thu, 4 Apr 2024 19:43:33 +0200 Subject: [PATCH 1/4] [docs] delete obsolete CONTRIBUTING.md --- CONTRIBUTING.md | 17 ----------------- 1 file changed, 17 deletions(-) delete mode 100644 CONTRIBUTING.md diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md deleted file mode 100644 index 259042923..000000000 --- a/CONTRIBUTING.md +++ /dev/null @@ -1,17 +0,0 @@ -# Contributing - -Did you find a bug? Do you want to collaborate? - -Process: -* Open a thread in [discourse](https://community.coopdevs.org/c/timeoverflow) 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. - -Visit [the getting started guide to start developing](https://github.com/coopdevs/timeoverflow/wiki/Getting-started). - -## Contributing with translations - -- Edit the translations directly on the [coopdevs/timeoverflow](https://www.localeapp.com/projects/10031) project on `Locale`. -- **That's it!** -- The maintainer will then pull translations from the `Locale` project and push to Github. From 796c36b80ce6497f4a9d14e97c4bffde311af504 Mon Sep 17 00:00:00 2001 From: Marc Anguera Insa Date: Thu, 4 Apr 2024 19:50:15 +0200 Subject: [PATCH 2/4] [docs] README tweaks --- README.md | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-) diff --git a/README.md b/README.md index 734ab1c96..ea489cd52 100644 --- a/README.md +++ b/README.md @@ -1,11 +1,12 @@ # TimeOverflow + [![Build Status](https://github.com/coopdevs/timeoverflow/actions/workflows/ci.yml/badge.svg?branch=develop)](https://github.com/coopdevs/timeoverflow/actions) [![Maintainability](https://api.codeclimate.com/v1/badges/f82c6d98a2441c84f2ef/maintainability)](https://codeclimate.com/github/coopdevs/timeoverflow/maintainability) [![Test Coverage](https://api.codeclimate.com/v1/badges/f82c6d98a2441c84f2ef/test_coverage)](https://codeclimate.com/github/coopdevs/timeoverflow/test_coverage) #### www.timeoverflow.org -:bank: :hourglass: Time Bank management system. [Learn more about Time Banks](http://www.bdtonline.org/). +🏦 ⌛ Time Bank management system. [Learn more about Time Banks](http://www.bdtonline.org/). TimeOverflow is a software developed in an altruistic way to offer a system that facilitates the interaction of the members and the management of the Time Banks. @@ -99,9 +100,15 @@ In order to configure the application you can use the following ENV variables: ## Contributions -**Join our collaborators team!** +Any kind of feedback, bug report, idea or enhancement are really appreciated. + +To contribute, just fork the repo, hack on it and send a pull request. Don't forget to add tests for behaviour changes and run the test suite: + +``` +bundle exec rspec +``` -:point_right: Further information [here](CONTRIBUTING.md). +👉 Further information in our [Wiki](https://github.com/coopdevs/timeoverflow/wiki). ## License From b65625cc681ef60bb4c0bb40904414cb26d93aa4 Mon Sep 17 00:00:00 2001 From: Sergi Alonso Date: Tue, 16 Apr 2024 19:27:07 +0200 Subject: [PATCH 3/4] Fix/footer links (#737) --- app/views/application/_footer.html.erb | 3 +-- app/views/pages/about.html.erb | 2 +- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/app/views/application/_footer.html.erb b/app/views/application/_footer.html.erb index 60bdedf52..ad4c9dc2e 100644 --- a/app/views/application/_footer.html.erb +++ b/app/views/application/_footer.html.erb @@ -2,14 +2,13 @@
- <%= t('layouts.application.help') %> + <%= t('layouts.application.help') %> <%= link_to t('application.terms_conditions'), tnc_path, data: { target: '#modal', toggle: 'modal' } %>
<%= render 'application/menus/language_switcher' %>
- Twitter Github
diff --git a/app/views/pages/about.html.erb b/app/views/pages/about.html.erb index 60698e062..2e77f1afc 100644 --- a/app/views/pages/about.html.erb +++ b/app/views/pages/about.html.erb @@ -42,7 +42,7 @@ "pages.about.empower-text-1", showmap_link: link_to( t("pages.about.empower-showmap"), - "http://www.bdtonline.org", + "https://adbdt.org/unete-a-un-banco-de-tiempo/", { title: t("pages.about.empower-showmap-title") } ) ).html_safe %>

From fe5d93ad0cd3232b96bf83c274b2203483c5ca12 Mon Sep 17 00:00:00 2001 From: Sergi Alonso Date: Tue, 16 Apr 2024 19:27:27 +0200 Subject: [PATCH 4/4] change to cco email send to organization admins for new member applications (#738) --- app/mailers/organization_notifier.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/mailers/organization_notifier.rb b/app/mailers/organization_notifier.rb index d3ed1fcd5..761ebaf34 100644 --- a/app/mailers/organization_notifier.rb +++ b/app/mailers/organization_notifier.rb @@ -20,7 +20,7 @@ def new_petition(petition) I18n.with_locale(locale) do mail( subject: 'New Application', - to: organization.users.joins(:members).where(members: { manager: true }).pluck(:email).uniq + bcc: organization.users.joins(:members).where(members: { manager: true }).pluck(:email).uniq ) end end