Commit Graph

9520 Commits

Author SHA1 Message Date
decabeza
771ef3d9e1 Adds custom consul settings 2018-06-06 12:00:39 +02:00
decabeza
e3b92f1c0c Adds foundation assets 2018-06-06 12:00:39 +02:00
decabeza
c5506e48bb Updates foundation gem 2018-06-06 12:00:39 +02:00
Adan Amarillas
9210d8928e Clean up newly created modules 2018-06-04 08:55:53 -07:00
Adan Amarillas
ee877888b3 Split spec common actions support helper 2018-06-04 08:55:53 -07:00
Juan Salvador Pérez García
0effea3c03 Ignores relative to the editor moved from gitignore to gitignore_global 2018-06-03 18:32:31 +02:00
Alberto
a05f6ac61a Merge pull request #2641 from consul/homepage
Add customization of homepage from admin section
2018-06-01 19:18:44 +02:00
Alberto
ec58ada817 Merge pull request #2650 from aamarill/2586-split_admin_settings
Split admin settings
2018-06-01 19:18:14 +02:00
decabeza
8664ac887a Expands proposals content if there no have image 2018-06-01 18:01:01 +02:00
decabeza
ef57396f9d Fixes styles for admin homepage 2018-06-01 18:00:19 +02:00
decabeza
a9eca180a4 Adds missing label for header card 2018-06-01 17:01:10 +02:00
Juan Salvador Pérez García
8161045009 Docker/docker-compose enhancements
The following enhancements have been made to docker/docker-compose

* Fixed bug when building the image.
* docker-compose up starts the server
* Scaffolding inside the container respect the ownership of the files
outside it
* Volumes are tagged as 'delegated' in order to improve performance for
mac/windoze users.
* bundler stores packages in a volume. This whay new packages can be
added without rebuilding the image:

```bash
docker-compose run app bundle install
```
2018-06-01 15:51:06 +02:00
Raimond Garcia
eea0c74707 Merge pull request #2654 from wairbut-m2c/backport/budgets-map-fixes
Budgets homepage map fixes
2018-05-31 23:19:34 +02:00
Raimond Garcia
0ace0775b8 Merge pull request #2372 from wairbut-m2c/iagirre-move-calculate-winners-button
Budget: move calculate winners button
2018-05-31 22:53:59 +02:00
Raimond Garcia
2881d0b42a Merge pull request #2657 from wairbut-m2c/backport/display-selected-budgets
Display only selected budget investmests in "Publishing prices" phase
2018-05-31 22:03:55 +02:00
Raimond Garcia
1d2f7b093e Merge pull request #2655 from wairbut-m2c/2612-backport-add-imagemagick-to-docker-configuration
Add imagemagick package to Docker configuration
2018-05-31 21:55:56 +02:00
rgarcia
8986cf4727 Display only published processes in homepage 2018-05-30 13:32:20 +02:00
rgarcia
1f16f9df6b Add feed settings to release rake 2018-05-30 13:19:19 +02:00
decabeza
f2c18c3812 Adds styles to admin homepage feeds 2018-05-30 11:58:43 +02:00
rgarcia
25133043b2 Add rake task to initialize feeds in homepage 2018-05-29 19:58:37 +02:00
rgarcia
b672a4550d Add option to configure feed items displayed in homepage 2018-05-29 19:58:04 +02:00
rgarcia
7c17eea6a3 Refactor widget feed from activemodel to activecord 2018-05-29 18:26:20 +02:00
Angel Perez
2c0475fc54 Fix failing specs for budget investments tags 2018-05-29 09:19:43 -04:00
María Checa
1169c10907 Add condition to show only selected investments in publishing_prices phase 2018-05-29 08:40:32 -04:00
decabeza
304143d051 Updates localization and home specs 2018-05-29 13:22:23 +02:00
iagirre
73b0fe5162 Modified feature spec to pass with the new UI
Add feature spec to test if the 'Calculate winners'
button is enabled or not, depending on the phase.
It also checks the message that clarifies why the
button is disabled.
2018-05-29 10:27:16 +02:00
decabeza
316c816836 Expands cards if feed processes is not enabled 2018-05-28 18:52:59 +02:00
decabeza
7732a6704c Adds styles and i18n for homepage 2018-05-28 18:17:26 +02:00
rgarcia
a48e5f6df9 Skip image size validation for widget cards 2018-05-28 18:17:26 +02:00
rgarcia
ad181b0e10 Add label to cards
Also removes unused fields related to buttons and alignment
2018-05-28 18:17:26 +02:00
rgarcia
eaebf349df Fix specs
Regarding the feature ‘Carousel size’:
There is no need to test styling in specs, it changes too often
There are nice ways to test it, but it seems a little too much right
Review later on
2018-05-28 18:17:26 +02:00
decabeza
a26bc7f0f8 Removes unused i18n keys 2018-05-28 18:17:26 +02:00
decabeza
0ac6531612 Adds styles for homepage users view 2018-05-28 18:17:26 +02:00
decabeza
50fd540797 Adds styles and missing i18n for admin homepage 2018-05-28 18:17:26 +02:00
rgarcia
5fe0dd46b9 Add homepage configuration for user recomendations 2018-05-28 18:17:26 +02:00
rgarcia
0e097973cc Add widget feeds to homepage
Note there is some funkiness going on with class loadings
Had to create a `feed` and `widget_feed` table even though in this
first version the Widget::Feed includes only uses ActiveModel instead
of ActiveRecord, otherwise some specs failed

We’ll figure it out and clean up 😌
2018-05-28 18:17:26 +02:00
rgarcia
c7f85c4173 Add widget header to homepage 2018-05-28 18:17:26 +02:00
rgarcia
664e77305c Add widget cards to homepage 2018-05-28 18:17:26 +02:00
rgarcia
85c08da7a6 Add homepage admin section 2018-05-28 18:17:26 +02:00
Angel Perez
9575aa5a42 Fix failing specs for skipping invalid map markers 2018-05-28 11:44:53 -04:00
Angel Perez
dbed904a4e Fix typo: toogle -> toggle 2018-05-28 11:44:53 -04:00
rgarcia
994e15666e Skip invalid map markers
Why:
Sometimes the latitude or longitude it passed to the map as *********
instead of the actual latitude or longitud. The asterisks are not a
string, breaking the whole array
https://github.com/consul/consul/issues/2380

What:
This commits skips invalid markers and displays the rest

How:
- Substituting the mysterious asterisks for null
(cleanInvestmentCoordinates)

- Validating the coordinates are numbers before trying to pain
them(validCoordinates)

- Adding a numeric function to validate the latitude and longitude
(isNumeric)
https://stackoverflow.com/questions/9716468/is-there-any-function-like-i
snumeric-in-javascript-to-validate-numbers#answer-9716488
2018-05-28 11:44:53 -04:00
iagirre
af867028a7 Add imagemagick package to Docker configuration
Add imagemagick package to the Docker configuration so that
it's installed along with the others at the moment of configuring it.
2018-05-28 16:56:52 +02:00
iagirre
2821985552 Change 'Calculate Winners button' to budget_investments index.
Move the button so that it appears in the Winners tab of the
budget_investments index.

When the budget is in "Balloting projects", "Reviewing Ballots"
or "Finished budget" phases, the button will appear as a button
(clickable). If there are no winners calculated yet, the text
will be "Calculate winner investments"; if there are, the text
will be "Recalculate winner investments".

If the budget is in another phase, the button will be
disabled and a message will appear: 'The budget has to stay on
phase "Balloting projects", "Reviewing Ballots" or
"Finished budget" in order to calculate winners projects'
2018-05-28 15:12:28 +02:00
Raimond Garcia
06772a7b87 Merge pull request #2649 from consul/release-0.15
Release v0.15
2018-05-25 19:03:34 +02:00
rgarcia
32bf83f3ae Update version number for consul.json 2018-05-25 17:50:06 +02:00
rgarcia
ea4eaeb687 Add module name to CHANGELOG items 2018-05-25 17:49:38 +02:00
Adan Amarillas
361518b57c Modify tests to reflect the new navigation on admin configuration settings 2018-05-24 14:49:31 -07:00
Adan Amarillas
1d974c41e3 Add missing i18n keys to locales 2018-05-24 12:27:07 -07:00
Adan Amarillas
60bc3f663a Make tabs i18n-friendly 2018-05-24 09:57:28 -07:00