Commit Graph

2781 Commits

Author SHA1 Message Date
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
Juanjo Bazán
d7d277c64d removes unused code 2017-04-05 18:40:18 +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
rgarcia
4da66e3f51 Show should display supports 2017-03-24 13:49:56 +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
Amaia Castro
7d118a0c27 Add draft versions comments count to admin views 2017-03-10 12:10:28 +01:00
Amaia Castro
13ff9816ae Merge pull request #124 from medialab-prado/122-color-intensity
Annotations color intensity according to (comments) weight
2017-03-09 16:27:14 +01:00
Amaia Castro
d95f902fdf Merge branch 'master' into legislation-module-stable 2017-03-07 23:19:26 +01:00
kikito
24920e73f6 Adds permissions for authors to destroy budget investments 2017-03-06 13:42:52 +01:00
Amaia Castro
854d51dd8e Calculate annotations weight and add weight css classes for color intensity 2017-03-02 14:25:23 +01:00
kikito
a8b653739c makes officing residence spec verify users 2017-02-14 17:30:22 +01:00
Amaia Castro
58b9135c71 Add context to annotation in index view 2017-02-13 11:18:33 +01:00
Amaia Castro
8e741a6b4f Refactor and use first node start + quote + last node end for the context 2017-02-13 09:53:36 +01:00
Juanjo Bazán
909114bcf5 cleans common can answer ability 2017-02-12 19:40:08 +01:00
kikito
3b2f2b0fd7 Changes models so that officers can make failed census calls 2017-02-12 14:22:46 +01:00
Juanjo Bazán
db9ee74828 removes max restriction on title length 2017-02-12 13:08:26 +01:00
Amaia Castro
6737d6afdd Make annotation context work with multi-node annotations 2017-02-10 18:16:09 +01:00
Amaia Castro
4cb1bba5a7 Use range offsets instead of quote for substitution 2017-02-10 15:55:03 +01:00
Amaia Castro
b298fb7316 Show annotation context in annotation page
Only works with quotes within the same html node for now
2017-02-10 15:35:42 +01:00