478 Commits

Author SHA1 Message Date
3752d653c9 refactor: I've changed the form using rails tools. #623. 2021-04-25 19:11:35 +02:00
e1e30a98cb i18n keys for new search in organizations page + minor formatting tweaks 2021-04-24 22:00:36 +02:00
b7d8c62f17 reports: add missing i18n keys and remove deprecated ones 2021-04-24 17:54:51 +02:00
1914af848d reports: download_all refactor to make pulling collections more DRY 2021-04-24 17:45:30 +02:00
73247da151 feat: now the visitor can search for a timebank in "/organizations"
visitors can now search for their location and matching banks will be listed, and clicking on one will display a message encouraging them to join. Issue #621.
2021-04-22 12:51:12 +02:00
482d53fb4c Merge remote-tracking branch 'origin/develop' into feat/download-all-admins to update this branch 2021-04-20 19:24:34 +02:00
93a902b1e6 admin: use select2 for all selects 2021-04-17 17:02:30 +02:00
aaf67a68bf new translations 2021-04-17 15:58:01 +02:00
d3ab098f7e feat: Downloading a zip with CSV documents
The new update allows the administrator to download a zip containing all the current CSV documents. Issue #596.
2021-04-16 13:56:35 +02:00
af08e61aa9 admin: allow to set organization in posts + other minor tweaks 2021-04-16 01:41:39 +02:00
aa8c1b4492 admin: users: allow to edit member#active 2021-03-27 14:32:32 +01:00
fce1f9fb07 delete ability to create orgs from public part, the superadmin can do it easily in the /admin section 2021-03-27 02:02:25 +01:00
3364de4d03 I18n clean up (#611) 2021-03-26 23:00:33 +01:00
089955c1fa New translations 2021-03-26 13:30:19 +01:00
fa5c885446 small ui & code style tweaks; reuse i18n keys; remove useless comments 2021-03-26 00:05:00 +01:00
42bc0f2d9e refactoring: I implemented the new feedback received
Identation, simplify code, i18n...
2021-03-25 17:33:30 +01:00
04e19d74f1 fix: implemented the feedback received in the pull request
I reseted my branch to the last commit (the one where the login behavior remained unchanged) and I applied the feedback received in the pull request. Resolves #472.
2021-03-23 16:16:13 +01:00
f9f61e3be8 Merge branch 'develop' into fix/inactive-members-login to update this branch 2021-03-22 16:03:07 +01:00
e21ee36fce fix: now the messages can be translated
I put the messages directly in the html, now I changed all.
2021-03-17 18:16:56 +01:00
d36bf02fb6 fix: deactivated users cannot browse through the timebank
A user whose account has been deativated and tries to navigate through any opttion will be redirected to a page showing all the timebanks to which they are a member and they can see the information to contact the admin. Issue #472
2021-03-17 11:49:30 +01:00
1a47601bc3 Tags: refactor to make it DRY + specs 2021-03-16 23:57:05 +01:00
ad8522b96a admin: customize color palette 🎨 more inline with public styles + improve categories view 2021-03-16 00:52:22 +01:00
84eb627920 Some Admin improvements:
- Rename and refactor CsvDb => UserImporter + add specs (I have resurrected an old branch from Pau: https://github.com/coopdevs/timeoverflow/compare/improve-csv-user-import)
- ActiveAdmin settings clean up. This file is very long and always out of date, better to check docs online ;p
- ActiveAdmin improve menu: add current user + add all available locales

Co-authored-by: Pau Pérez Fabregat <saulopefa@gmail.com>
2021-03-15 23:57:45 +01:00
7b1de64fb3 Merge branch 'develop' into more_reports 2021-03-15 11:50:04 +01:00
4c121c0934 i18n: remove a couple of deprecated keys [ci skip] 2021-03-14 21:43:06 +01:00
f92b6537d0 statistics code clean up 2021-03-13 20:09:35 +01:00
ea4f9deb70 add Transfers report 2021-03-13 01:05:25 +01:00
0408aa0a2c add empty config/storage.yml to avoid app crashes on boot (eager_load) 2021-01-09 14:07:45 +01:00
f0c6a9e8f1 Update to Rails 6.1 2021-01-08 18:08:56 +01:00
640cd29e6d Merge pull request #575 from coopdevs/remove_donation_info
delete donation block in about page
2021-01-08 10:07:44 +01:00
52a02eb6be Allow non-www host name
As far as I know our DNS provider redirects itself timeoverflow.org to
www.timeoverflow.org instead of our Nginx, as we are used to, but we're
seeing people getting ERR_CONNECTION_REFUSED, with mobile data only,
they say. We hope this may fix it but we're totally blind here.
2021-01-07 13:37:43 +01:00
5d436d90af delete donation block in about page (closes #572) 2021-01-05 16:04:51 +01:00
9c795dfcab Allow requests from production host
We missed the mess we have at DNS level with the www domain. We need
this to make it work in production. IMO it's much more explicit add
a host per line instead of the regex.
2021-01-05 11:15:46 +01:00
ccc8fed327 Allow requests from staging 2021-01-05 10:07:50 +01:00
72edf73666 [FIX] fix due to Rails 6 upgrade in StatisticsController#statistics_all_transfers 2020-12-21 21:29:34 +01:00
49ba7c8c3c config: Guard against DNS rebinding attacks by permitting hosts 2020-12-21 20:38:56 +01:00
88b898f968 allow to compile js with ES6 syntax 2020-12-18 12:20:23 +01:00
c4cd343641 Update deploy.rb to match Capistrano's version
A deploy fails because the loaded version and the one specified in
config/deploy.rb don't match.
2020-12-18 09:08:16 +01:00
331ec8429a Yay! all tests passing 2020-12-16 00:14:19 +01:00
15dca38b8f merge with develop 2020-12-15 21:32:57 +01:00
4bf880e05b Revert "Revert "Merge pull request #465 from coopdevs/feature/switch-from-elastic-to-pg-search-la-buena""
This reverts commit 096fcce484.
2020-10-06 21:10:03 +02:00
29c8ec03fc trying to fix travis (1st attempt) 2020-04-04 18:01:33 +02:00
91056c163f change en.yml mail missage 2020-03-18 17:23:42 +01:00
6af7bc971d migrate to Sprockets v4 2020-02-26 00:18:22 +01:00
0bacdebc15 Merge branch 'develop' into rails_6 2020-02-26 00:04:29 +01:00
c47fe2b636 Merge pull request #401 from coopdevs/remove_whenever
move weekly digest email to sidekiq-cron and remove whenever
2020-02-25 16:55:34 +01:00
2bd5689790 Merge pull request #535 from coopdevs/remove-next-environment
Remove next environment
2020-01-23 09:54:34 +01:00
e572437f11 Remove next environment
It was used while migration the production server and since this one and
production configs are almost exact copies (just rails_env differs) it's
no longer needed.

And this brings simplicity back to this repo.

The most noticeable change is the removal of `url` from production's
database config as DATABASE_URL got removed in
https://github.com/coopdevs/timeoverflow-provisioning/pull/21 two years
ago and it's true in production:

```
timeoverflow@timeoverflow-production:~$ env | grep DATABASE
DATABASE_NAME=xxx
DATABASE_USER=xxx
DATABASE_PASSWORD=xxx
```
2020-01-22 12:51:53 +01:00
893f7f4f82 Fix production deployment
This does the trick. I never understood what that metal.* is but it now
times out. Manual configuration in the old production server not
persisted anywhere else?

I used locally to deploy with Capistrano so this is working.
2020-01-22 11:27:39 +01:00
400015c201 Merge branch 'develop' into remove_whenever 2020-01-21 21:36:28 +01:00