Juanjo Bazán
9ab0f9cf8b
Merge branch 'master' into amiedes-api-dev-PRs-2
2017-06-14 12:46:58 +02:00
Raimond Garcia
ae82a563d6
Merge pull request #1651 from consul/fix/direct_message_today_scope
...
Fix DirectMessage today scope
2017-06-14 11:42:54 +02:00
Bertocq
cc0146e372
Use Time in utc on direct message specs when changing created_at directly
2017-06-14 01:17:32 +02:00
Bertocq
c18d1b6e8f
Check new enabled? logic on both Legislation::Process Phase and Publication classes
2017-06-14 00:21:08 +02:00
Bertocq
990437dc40
Remove no longer used active/show/open _phase helper methods from Legislation Process, and specs
2017-06-13 22:04:36 +02:00
Bertocq
12dc7a4790
Add specs for Legislation::Process Phase and Publication enabled?/started?/open? methods
2017-06-13 22:04:36 +02:00
Bertocq
e55328caf4
Rename legislation process final_version_publication phase name to more descriptive result_publication
2017-06-13 22:04:36 +02:00
Bertocq
0c27f1ffde
Rename Legislation Process final_publication_date field to more descriptive result_publication_date
2017-06-13 22:04:36 +02:00
kikito
1701111bf5
Merge branch 'api-dev-PRs' of https://github.com/amiedes/consul into amiedes-api-dev-PRs-2
2017-06-13 12:07:28 +02:00
Bertocq
798b646135
Cleanup Settings values modified after specs are run
2017-06-07 20:55:42 +02:00
rgarcia
1a46b4d4cb
fixes conflicts with master
2017-05-31 10:36:38 +02:00
Juanjo Bazán
6fd50d96c0
Merge pull request #1566 from bertocq/fix/recount_spec_flaky_test
...
Avoid creating objects, on poll recount spec, with fixed id numbers
2017-05-30 10:42:52 +02:00
decabeza
0e581896c0
improves message when not enough money
2017-05-26 17:12:21 +02:00
Bertocq
3dde935051
Avoid creating objects, on poll recount spec, with fixed id numbers
...
This was generating a flaky test that sometimes generated a unique key value constraint violation
2017-05-25 11:58:18 +02:00
Bertocq
9e74249b02
Always use Time.current (aliases internally to Time.zone.now)
...
Some specs where breaking close to midnight because 30.years.ago uses zone.now and Time.now.utc.to_date doesn't.
Also this will make all codebase consistent in the way time is deal with
2017-05-24 07:54:57 +02:00
decabeza
5e0d5fc8c3
Merge branch 'legislation-module-stable' of https://github.com/medialab-prado/consul into medialab-legislation
2017-05-22 18:43:49 +02:00
rgarcia
0b68f3c619
cleans up
2017-05-19 14:07:30 +02:00
rgarcia
65eb2bb160
adds budget result specs
2017-05-19 14:04:46 +02:00
Juanjo Bazán
f0d7acd087
Merge pull request #1550 from consul/budgets-unfeasible
...
Investments reclassified as unfeasible
2017-05-18 14:37:32 +02:00
rgarcia
a63ca9649e
cleans up
2017-05-17 20:32:05 +02:00
Juanjo Bazán
d08af6193e
changes unselected scope to include undecided feasibility
2017-05-17 15:13:29 +02:00
rgarcia
42f62e5c36
stores reclassified votes
2017-05-17 15:13:28 +02:00
Alberto Miedes Garcés
ad8aba0739
Revised public fields, wrote more exhaustive specs
2017-05-15 20:22:11 +02:00
rgarcia
84f63c7a6f
fixes specs
2017-05-14 19:19:05 +02:00
rgarcia
62b2f4812b
fixes false positive when storing previous heading id
2017-05-14 11:38:05 +02:00
rgarcia
1ca16d9d40
removes votes from reclassified investments
2017-05-13 13:10:04 +02:00
Alberto Miedes Garcés
5d9054d284
Merge branch 'master' into api-dev-PRs
...
Conflicts:
Gemfile.lock
config/routes.rb
db/dev_seeds.rb
db/schema.rb
2017-05-11 21:59:42 +02:00
Juanjo Bazán
04b95df696
Merge pull request #1514 from consul/budgets-ballot-db-constraint
...
Adds DB constraint to avoid duplicate balloted investments
2017-05-10 12:29:46 +02:00
Juanjo Bazán
33e8ebf043
adds balloting_or_later? method to Budget
2017-05-09 17:27:58 +02:00
rgarcia
fa825185f5
adds model specs for investment filters
2017-05-06 03:37:11 +02:00
rgarcia
767a43bb0f
Adds DB constraint to avoid duplicate balloted investments
2017-05-03 18:43:22 +02:00
rgarcia
8083f259c2
takes into account headings without balloted investments
2017-05-03 17:49:29 +02:00
rgarcia
2f6c1bc7bc
displays the correct amount spent in review my ballot
...
returns the first heading with investments for a group
2017-05-03 17:06:27 +02:00
Juanjo Bazán
3f04854626
adds missing method specs
2017-04-17 13:17:01 +02:00
Juanjo Bazán
61e5c187da
shows investment price info only if phase is balloting or later
2017-04-17 13:15:17 +02:00
Raimond Garcia
0c7332c4b7
Merge pull request #1471 from consul/activity-valuation
...
Log valuators activity
2017-04-12 10:36:41 +02:00
Amaia Castro
9e5324cc1b
Merge branch 'master' into site-customization
2017-04-07 17:29:33 +02:00
Amaia Castro
c1de2dced4
Custom content blocks for top_links and footer
2017-04-06 17:00:05 +02:00
Amaia Castro
255b57cc85
Admin for custom pages
2017-04-06 16:25:07 +02:00
Alberto
6bbcc71ecb
Merge branch 'master' into polls
2017-04-06 14:16:49 +02:00
Juanjo Bazán
83e2df7410
adds signature sheets for budget investments
2017-04-05 12:59:42 +02:00
Juanjo Bazán
12c00a714d
adds demographic info to signature users
2017-04-05 11:31:56 +02:00
Amaia Castro
6e71774504
Merge branch 'master' into legislation-module-stable
2017-03-29 14:28:22 +02:00
Juanjo Bazán
d9d38482b3
extends Activity to include Investment valuations
2017-03-27 13:56:16 +02:00
Juanjo Bazán
3c2ab9fb05
adds validation for price when investment is feasible
2017-03-27 13:14:26 +02:00
Amaia Castro
5caa31dba1
Merge branch 'master' into legislation-module-stable
2017-03-25 13:34:49 +01:00
Juanjo Bazán
e64cf012e7
Merge pull request #1446 from consul/budget-permissions
...
adds comprehensive specs for permissions to vote an investment
2017-03-21 13:48:01 +01:00
Amaia Castro
483d7c6e2b
Merge branch 'master' into legislation-module-stable
2017-03-17 18:08:22 +01:00
Juanjo Bazán
b8b7cda4e6
keeps Budget::Investment's group in sync with heading
2017-03-16 14:30:31 +01:00
rgarcia
85c5e584fb
adds comprehensive specs for permissions to vote an investment
2017-03-15 18:49:17 +01:00