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
523988a291
Replace old open_phase? method for new phase/publication open? on Legislative Process
2017-06-13 22:04:36 +02:00
Bertocq
10954859c7
Add debate/allegations phases and draft/result publications helper methods to Legislation Process
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
edee908fc1
Create Legislation Process Phase and Publication classes to enclose enabled?/started?/open? logic
2017-06-13 22:04:36 +02:00
kikito
430e020a6a
refactors public_for_api in vote
2017-06-13 16:27:09 +02:00
Raimond Garcia
300634443c
Merge pull request #1645 from consul/login-by-username
...
Allow users to login using username
2017-06-13 13:23:49 +02:00
Juanjo Bazán
2f895d2f6b
removes else case
2017-06-13 12:22:48 +02:00
kikito
92633195d9
refactors proposal_notification.public_for_api
2017-06-13 12:19:02 +02:00
kikito
0ad1ff5845
changes the way public_for_api is calculated in comment
2017-06-13 12:11:20 +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
Juanjo Bazán
ed30051653
avoids conflicts with users using email as username
2017-06-12 18:54:39 +02:00
Juanjo Bazán
3f11dbe1d5
allows login using username or email
2017-06-12 17:26:38 +02:00
Raimond Garcia
58da3b43e6
Merge pull request #1638 from entantoencuanto/issue#1595-results_url_permissions
...
Issue#1595 results url permissions
2017-06-12 13:09:27 +02:00
Raimond Garcia
05afaacf3d
Merge pull request #1635 from entantoencuanto/issue#1354-suggest_on_investments_creation
...
Issue#1354 suggest on investments creation
2017-06-12 13:09:09 +02:00
Eduardo Martinez Echevarria
2380b97bd0
Make budgets result show action available only when budget is finished
2017-06-11 23:33:05 +02:00
Eduardo Martinez Echevarria
180ed1ce99
Set cancan permissions for suggest on Budget::Investment
2017-06-11 13:13:50 +02:00
Bertocq
b79df113cd
Switch all Time.curren.to_date for Date.current, same result but better syntax
2017-06-11 10:41:09 +02:00
Bertocq
e14a5b2eaf
Avoid using Date.today, better to use Date.current that takes timezone into account
2017-06-11 10:41:06 +02:00
Amaia Castro
b616210607
View and search users from admin panel
2017-06-09 17:30:06 +02:00
Bertocq
02524b164a
Rubocop autocorrections (indentations, revers unless to if, extra spaces)
2017-06-08 12:14:35 +02:00
Juanjo Bazán
16edbf15a2
Merge pull request #1620 from consul/medialab-legislation
...
Adds Collaborative Legislation
2017-06-07 18:06:15 +02:00
Alberto Miedes Garcés
9ec8b166d7
Use scopes for better query performance
2017-06-01 20:04:51 +02:00
Bertocq
b2c79174aa
Add new Proposal share endpoint, plus ability for ereryone to use it
2017-05-31 10:59:30 +02:00
rgarcia
1a46b4d4cb
fixes conflicts with master
2017-05-31 10:36:38 +02:00
Juanjo Bazán
1ae55a59f6
Merge pull request #1560 from bertocq/feature/admin_administrators_management
...
Administrators management in admin area
2017-05-30 10:44:50 +02:00
decabeza
0e581896c0
improves message when not enough money
2017-05-26 17:12:21 +02:00
Juanjo Bazán
26b186a740
Merge pull request #1557 from bertocq/feature/newsletter_users_emails_zip
...
Allow admins to download Newsletter's users emails list in zip
2017-05-24 13:13:34 +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
Bertocq
9506855a44
Add Admin Administrator route, controller and manage ability for admin users
2017-05-23 22:49:44 +02:00
rgarcia
8f4eec2b8e
zips all users with newsletter activated
2017-05-23 16:46:05 +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
ed5a1cecbb
adds budget results
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
Alberto
8167203e6e
Merge pull request #1546 from consul/no-money-error
...
Fix no money error
2017-05-17 17:36:20 +02:00
rgarcia
47f97e342d
extracts reclassification to a module
2017-05-17 15:18:39 +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
Juanjo Bazán
3eb22ab7b9
removes exception on invalid vote
...
responds rendering correct error message instead
2017-05-16 13:12:32 +02:00
Alberto Miedes Garcés
ad8aba0739
Revised public fields, wrote more exhaustive specs
2017-05-15 20:22:11 +02:00
rgarcia
9a75067d73
Do not display voting button for unselected investments
2017-05-14 18:15:04 +02:00
rgarcia
62b2f4812b
fixes false positive when storing previous heading id
2017-05-14 11:38:05 +02:00
Raimond Garcia
94361eb663
Merge pull request #1537 from consul/budgets-reclassification
...
Removes votes from reclassified investments
2017-05-14 10:15:19 +02:00
rgarcia
1ca16d9d40
removes votes from reclassified investments
2017-05-13 13:10:04 +02:00
rgarcia
712e576e75
adds email delivery of selected and unselected investments
2017-05-12 13:57:31 +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
33e8ebf043
adds balloting_or_later? method to Budget
2017-05-09 17:27:58 +02:00
rgarcia
c0488c3b3c
refactors investment filters
2017-05-06 04:57:06 +02:00
Alberto Garcia Cabeza
5727969eac
adds specs for unselected budget investments
2017-05-05 20:01:32 +02:00
