consul/nairobi
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
13,615 Commits 1 Branch 0 Tags
1f76b25e2a3f2e5280c452397526f9ca6ec3fd59
Commit Graph

13615 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
rgarcia
aeb84108bc Verify poll ballots 2019-04-10 18:29:01 +02:00
rgarcia
1eaa5cc77b stores the heading where the user has voted 2019-04-10 18:15:43 +02:00
Raimond Garcia
f80183783a Merge pull request #3430 from consul/idea 
Add Intellij IDE project settings to gitignore
 2019-04-10 17:58:24 +02:00
Javier Martín
e27f5903f2 Merge pull request #2857 from consul/backport_1527-budget_ballots_results_ui 
Budget ballot sheets UI
 2019-04-10 17:04:09 +02:00
María Checa
394177213c Adds Ballot Sheet model and business logic 2019-04-10 16:04:39 +02:00
María Checa
ccf8d3a8e2 Adds ballot sheets controller and main views 2019-04-10 16:03:47 +02:00
Javi Martín
78c6395e5f Respond with 404 when confirming an invalid token 
We were getting a 500 Internal Server Error because `find_by` returned
`nil`, but the code assumed it returned an object responding to
`encrypted_password`. In this case, maybe some other status code (like
400 or 401) might be more appropriate, but I've kept 404 because it was
easier to implement and I wasn't sure which one was better.

Also note ideally we would test the controller using:

expect(response).to have_http_status(:not_found)

However, we would need to configure the test to show exceptions and not
to consider all requests local. I haven't been able to do so for
controller tests, and doing so for feature/request specs seems to
require changes in the test environment configuration which would affect
other tests.
 2019-04-10 12:41:21 +02:00
Javier Martín
3ccdf039e4 Merge pull request #3344 from consul/backport-budget_ballots 
Allow voting Budget Investments in booths
 2019-04-09 13:54:00 +02:00
voodoorai2000
76f3fd38ad Ignore Intellij IDE project settings 
Some developers use the Intellij IDE to program in Rails.

Adding the /.idea folder where project settings are stored, so that these files do not have to be skipped manually when sending a PR upstream.
 2019-04-06 11:58:00 +02:00
Javier Martín
3e46153a97 Merge pull request #3420 from consul/backport-fix_sort_by_random 
Fix sort by random inconsistencies
 2019-04-05 17:38:44 +02:00
decabeza
94b8caffca Merge branch 'master' into proposal-dashboard 2019-04-04 14:08:30 +02:00
Javier Martín
0942ef3200 Merge pull request #3351 from LextrendIT/feature/module_15_change_subfilters_as_checkboxes 
Change admin budget investments subfilters from tabs to advanced filter checkboxes
 2019-04-04 12:41:22 +02:00
decabeza
7bd0f9c1d7 Adds spec to do not show questions section on budget poll 2019-04-03 22:28:19 +02:00
decabeza
bee616c878 Fixes manage assignments button overlapping 2019-04-03 22:28:19 +02:00
decabeza
429edd0745 Hides total final and total recount cells on budget poll recounts 2019-04-03 22:28:17 +02:00
lalo
237a03552f Move admin budget investments tabs filters to advanced filters component 2019-04-03 22:27:48 +02:00
decabeza
fcbb11b26e Hides question menu on budget poll and changes redirect when create 2019-04-03 22:23:32 +02:00
rgarcia
431c313487 Use scenario instead of it in feature specs 2019-04-03 22:23:27 +02:00
rgarcia
6fa7562181 Automatically create a budget poll if it does not exist 2019-04-03 22:23:22 +02:00
rgarcia
8cfcfcb6a7 Check for link to poll in specs 2019-04-03 22:22:56 +02:00
rgarcia
b1b88918f0 Moving spec to budget_polls folder 2019-04-03 22:22:50 +02:00
María Checa
22727a9876 Hides budget polls in polls public index 2019-04-03 22:22:45 +02:00
María Checa
acb0a6070e Hides budget polls in polls admin index 2019-04-03 22:20:10 +02:00
María Checa
f6739dc7e5 Adds "Admin ballots" button in admin budgets index 2019-04-03 22:20:05 +02:00
rgarcia
7dd314c699 Do not display polls associated to a budget in admin poll questions 
This section is used to select to which poll a question belongs to.

Budget polls are not meant to include questions that come from Citizen
Proposals or Government Questions, thus we do not display them
 2019-04-03 22:20:01 +02:00
Bertocq
dac0264b63 Prevent offline budget vote after voting online 2019-04-03 22:19:56 +02:00
rgarcia
aa7441271d Prevent balloting online after casting a ballot offline 2019-04-03 22:19:51 +02:00
rgarcia
20a3f6539d Add association between polls and budgets 2019-04-03 22:19:44 +02:00
Bertocq
d3660d1245 Create Budget Poll offline/online vote feature test 2019-04-03 22:18:55 +02:00
Javier Martín
12bccf3fd0 Merge pull request #3364 from LextrendIT/3357_add_admin_investments_advanced_filter_for_max_supports 
Add on admin budget investments an advanced filter for max supports
 2019-04-03 21:39:15 +02:00
Javier Martín
d85743bf68 Merge pull request #3356 from LextrendIT/feature/module_15_extract_costs_from_admin_investments_feasability_column 
Add price column in the admin budget investments table
 2019-04-03 21:29:31 +02:00
Javi Martín
74088ac949 Make random IDs with the same seed consistent 
The order of the array before being shuffled needs to be the same if we
want to have the same array after being shuffled with a certain seed.

We were using `pluck(:id)`, which doesn't guarantee the order of the
elements returned.

Replacing it with `order(:id).pluck(:id)` adds an `ORDER BY` clause and
so guarantees the order of the elements.
 2019-04-03 21:21:11 +02:00
Javier Martín
844ab5fb0e Merge pull request #3405 from consul/remove_obsolete_test 
Fix investment pagination tests
 2019-04-03 21:13:07 +02:00
Javier Martín
62233191cf Merge pull request #3345 from consul/backport-polls-officer-for-voter 
Add officing booths
 2019-04-03 18:26:05 +02:00
lalo
9edaf44b9c Add new admin budget investments advanced filter for max supports 2019-04-03 13:39:59 +02:00
lalo
0a5057a0a8 Add max support advanced filter for admin budget investments 2019-04-02 19:46:16 +02:00
Alberto
2a2cee636e Merge pull request #3418 from consul/readme 
Update docs link on README
 2019-04-02 11:54:03 +02:00
decabeza
e3555ae2bb Update docs link on readme 2019-04-02 10:45:36 +02:00
Alberto
caac674372 Merge pull request #3417 from consul/readme 
Update README
 2019-04-02 00:24:45 +02:00
decabeza
e0d60fc7c7 Update readme file 2019-04-01 18:21:29 +02:00
Julian Nicolas Herrero
625c15aaab Merge pull request #3416 from consul/use_3_travis_jobs 
Use 3 Travis nodes for running the test suite
 2019-04-01 13:53:42 +02:00
Julian Herrero
5822d250da Use 3 Travis nodes for running the test suite 2019-04-01 13:14:33 +02:00
Alberto
87b04a3d17 Merge pull request #3407 from consul/check-ballot 
Update texts on check my ballot links
 2019-03-28 19:20:15 +01:00
decabeza
d7bde5818e Update texts on check my ballot links 2019-03-28 17:16:15 +01:00
decabeza
17730a41dd Hides not to vote at this time button if already voted 2019-03-28 15:50:34 +01:00
decabeza
170cc45a20 Shows message on index if officer has no shifts 2019-03-28 15:50:34 +01:00
decabeza
18e57b9662 Hides sibebar menu if officer has no shifts 2019-03-28 15:50:34 +01:00
rgarcia
9329e4b6ea hot fix current booth 2019-03-28 15:50:34 +01:00
Javi Martín
99551e048b Fix user gender creation 
We use "male" and "female" conditions in scopes.
 2019-03-28 15:50:34 +01:00
Javi Martín
061549c3c3 Use booth voters to create recount in dev seeds 2019-03-28 15:50:34 +01:00