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

1554 Commits

Author SHA1 Message Date
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
Alberto Garcia Cabeza
6ab6986d9e adds unselected investment link 2017-05-05 19:07:37 +02:00
Alberto Garcia Cabeza
98a76a1ae5 show price on index/show if feasible && selected 2017-05-05 17:14:54 +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
a4bfe9c50c adds ballot_lines counter to investments 2017-04-28 13:19:43 +02:00
Juanjo Bazán
8654517743 changes budget name max length 2017-04-27 17:04:25 +02:00
Raimond Garcia
441dee84c4 Merge pull request #1493 from consul/cleanup 
removes unused code
 2017-04-17 19:16:06 +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
ae3690ab5f Validate presence of page slug 2017-04-06 17:00:04 +02:00
Amaia Castro
8143fe1037 Site customization: images uploads 2017-04-06 17:00:04 +02:00
Amaia Castro
54fab919e5 Show custom pages in public site 2017-04-06 16:59:58 +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