consul/grecia
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
8,771 Commits 1 Branch 0 Tags
cb15a2e25b3db45815f23589797812884785b35c
Commit Graph

2207 Commits

Author SHA1 Message Date
María Checa
cb15a2e25b Added EmailsDownload controller and routes 
Removed original method to return emails file from Newsletters controller and NewsletterZip class, included `rubyzip` gem that's no longer necessary.
 2018-02-20 22:33:01 +01:00
María Checa
017c242085 Merge pull request #2462 from consul/admin-newsletter-emails 
Admin newsletter emails
 2018-02-20 16:17:37 +01:00
Bertocq
34877ede57 Fix typos on english translations 
Thanks to @PierreMesure that noticed on each one while using Crowdin!
 2018-02-19 11:00:25 +01:00
María Checa
24bca36639 Merge branch 'master' into admin-newsletter-emails 2018-02-14 16:07:13 +01:00
María Checa
14ce229c8c Added newsletter translations 2018-02-14 16:06:31 +01:00
Raimond Garcia
8bec36500a Merge pull request #2385 from wairbut-m2c/2363-alert-delete-investment-project 
Add alert message when a user deletes an investment project from "My activity"
 2018-02-13 14:06:08 +01:00
María Checa
49adcfde02 Added newsletter controller and routes 2018-02-13 11:39:12 +01:00
decabeza
2154a614c2 Adds new legislation processes section on help page 2018-02-08 19:06:41 +01:00
decabeza
dac5b7c9a2 Adds missing polls button on help page 2018-02-07 19:09:30 +01:00
Vicente Mendoza
74124fb784 Control when the investment is trying to relate to itself. 2018-02-02 10:52:28 +01:00
Bertocq
528c9be925 Refactor valuation comments into its own partial 
It's going to be used at valuation and admin panels
 2018-01-31 16:34:11 +01:00
Raimond Garcia
45d07fa16f Merge pull request #2407 from wairbut-m2c/aperez-investment-filters-aggregation 
Investments can be applied several filters at once
 2018-01-31 14:39:02 +01:00
BertoCQ
05a6406189 Merge branch 'master' into remove_investments_internal_comments 2018-01-31 13:47:15 +01:00
BertoCQ
ec81f399bf Merge pull request #2403 from consul/valuation_comments 
Valuation comments
 2018-01-31 13:46:22 +01:00
Angel Perez
1f50e284a9 'Current applied filters' message handles multiple filters in use 2018-01-31 07:21:51 -04:00
Alberto García
0d64f51b78 Merge pull request #2405 from consul/more-info-pages 
Improve texts of help page
 2018-01-31 11:09:12 +01:00
BertoCQ
c216e965cc Merge pull request #2371 from consul/change_default_locale_to_en 
Make English the default locale
 2018-01-31 02:33:28 +01:00
Bertocq
26cf91c61a Create valuation comments creation ability 
Why:

Only admins or valuators (for those investments they've assigned) can
create internal valuation comments on them.

How:

* Creating a new `comment_valuation` ability for admins and valuators in
the same manner the `valuate` ability works.

* Adding a validation at Comment model for those with `valuation` flag
active that checks if the author can make a valuation comment on the
commentable, as well as the respective active record error messages.
This will prevent comments from being created at a controller level as
well.

* Improving comment factory trait `valuation` to have an associated
investment, author that is a valuator and setting the valuator on the
valuators list of the investment
 2018-01-31 02:03:03 +01:00
decabeza
42d0f471ee Updates i18n keys and images folder 2018-01-30 19:10:48 +01:00
decabeza
286371c9d9 Changes more_info folder and path to help 2018-01-30 18:26:30 +01:00
decabeza
a958a75bb1 Updates text of polls section of more info page 2018-01-30 18:13:24 +01:00
decabeza
037a3af5a6 Updates text of budgets section of more info page 2018-01-30 18:12:48 +01:00
decabeza
fffc769c90 Updates text of proposals section of more info page 2018-01-30 18:12:21 +01:00
decabeza
59a02301c2 Updates text of debates section of more info page 2018-01-30 18:11:50 +01:00
decabeza
735630cff0 Updates text of intro section of more info page 2018-01-30 18:11:13 +01:00
decabeza
213152349b Changes more info link to help 2018-01-30 18:10:42 +01:00
Bertocq
d280c254c8 Remove usage of Investment's internal_comments attr 2018-01-29 21:15:28 +01:00
Raimond Garcia
626b9972d1 Merge pull request #2378 from wairbut-m2c/aperez-investments-search 
Add search & sorting options to Admin::BudgetInvestments
 2018-01-29 20:06:43 +01:00
Alberto García
1207b5ce51 Merge pull request #2279 from wairbut-m2c/aperez-missing-i18n-keys 
I18n maintenance
 2018-01-29 14:02:15 +01:00
iagirre
f2927c8eb2 Add alert to the delete button of 'My activity' section so that users don't delete their investmentes accidentally 2018-01-25 16:54:26 +01:00
decabeza
f06ef1ac91 updates spanish translations of budgets 2018-01-25 14:41:16 +01:00
decabeza
1d7352d21c fixes textarea and label order on admin budgets phases form 2018-01-25 14:40:04 +01:00
decabeza
f607075c4a replaces hardcoded text to votes_for_proposal_success setting 2018-01-25 14:39:13 +01:00
Angel Perez
e04dc5b8f2 Add sorting options for Admin::BudgetInvestments (#2336) 2018-01-25 08:18:04 -04:00
Angel Perez
d30d2b0dd8 Arrange Admin::BudgetInvestments I18n for buttons under same namespace 2018-01-25 08:18:04 -04:00
Angel Perez
680ca46ef1 Add search form for Admin::BudgetInvestments (#2336) 2018-01-25 08:16:32 -04:00
decabeza
acfd49e5bd improves styles for budget investments advanced filters 2018-01-25 11:14:06 +01:00
Bertocq
18a5bc6642 Make English the default locale 2018-01-24 11:37:43 +01:00
María Checa
1c2949b60d Merge pull request #2344 from wairbut-m2c/aperez-investments-filters 
Improvements for Admin::Budget::Investment filters
 2018-01-23 20:09:54 +01:00
Raúl Fuentes
82b750de68 moved duplicated code to helper 2018-01-23 15:42:01 +01:00
iagirre
846898f3ec New phase "Information" added and UI modified to not show the links. 
Specs to test the functionality added.
 2018-01-23 15:42:01 +01:00
Bertocq
4dc07738b0 Fix rails translations for months, beware of crowdin PR's! 2018-01-23 12:51:05 +01:00
Bertocq
b998ca2e7a Add back nil at beginning of rails en months 2018-01-23 11:55:51 +01:00
Bertocq
599442440b Correctly format Budget's phases dates 2018-01-23 02:07:49 +01:00
Bertocq
c41a8482d1 Fix spanish phase translations 2018-01-23 01:48:55 +01:00
Bertocq
2ad1f96d71 Fix rails english dates 2018-01-23 01:43:57 +01:00
decabeza
7a17db01ef adds links with filters on budgets results page 2018-01-22 19:27:54 +01:00
Angel Perez
3f6a9187ec Add 'current applied filters' message to investments partial 2018-01-22 14:04:57 -04:00
Angel Perez
1027896617 Reenable 'winners' tab under Admin::Budget::Investment 2018-01-22 14:04:57 -04:00
Angel Perez
a085f471df Replace 'selection' header on investments partial with 'selected' 2018-01-22 14:02:29 -04:00