Commit Graph

6907 Commits

Author SHA1 Message Date
Raimond Garcia
da1d98efd1 Merge pull request #1492 from consul/price-info
Price explanation only visible when budget phase is balloting and later
2017-04-17 14:05:45 +02:00
Juanjo Bazán
0bc260a105 adds feature spec for price explanation visibility 2017-04-17 13:31:31 +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
83e7911c11 Merge pull request #1329 from amiedes/iss-1192-test
Track email digests
2017-04-12 12:06:05 +02:00
Raimond Garcia
ead9b58d07 Merge branch 'master' into iss-1192-test 2017-04-12 11:51:48 +02:00
Raimond Garcia
0c7332c4b7 Merge pull request #1471 from consul/activity-valuation
Log valuators activity
2017-04-12 10:36:41 +02:00
Alberto Garcia Cabeza
b341a5538e improves english i18n to more info pages 2017-04-11 17:00:08 +02:00
Raimond Garcia
1770630470 Merge pull request #1484 from PopulateTools/site-customization
Site customization
2017-04-11 13:48:17 +02:00
Juanjo Bazán
d5e559f652 Merge pull request #1487 from consul/more-info-polls
More info polls
2017-04-09 14:00:20 +02:00
Alberto Garcia Cabeza
910d615017 removes details page info of proposals and budgets 2017-04-07 18:33:26 +02:00
Alberto Garcia Cabeza
e2cbdfe480 adds polls section on more info pages 2017-04-07 18:30:30 +02:00
Amaia Castro
9e5324cc1b Merge branch 'master' into site-customization 2017-04-07 17:29:33 +02:00
Juanjo Bazán
d988acb18b Merge pull request #1483 from consul/polls
Polls
2017-04-07 13:06:10 +02:00
Juanjo Bazán
f04fbd47b2 Merge pull request #1485 from consul/telegram-handle
adds telegram handle to dev seeds and admin settings
2017-04-07 11:29:15 +02:00
Alberto Garcia Cabeza
3d45c0ca1a adds telegram handle to dev seeds and admin settings 2017-04-06 18:34:50 +02:00
Amaia Castro
613f5521a2 Put footer block inside row div 2017-04-06 17:24:09 +02:00
Amaia Castro
b0b39d9f8a Remove sandbox
Revert "Implement Sandbox"

This reverts commit e806a39820c2920d18b80dc560d05db36ecb6ede.
2017-04-06 17:00:05 +02:00
Fernando Blat
e126a2ded0 Add information about content blocks 2017-04-06 17:00:05 +02:00
Fernando Blat
3a275ea850 Use open data setting in footer links 2017-04-06 17:00:05 +02:00
Fernando Blat
d5669fbbae Add settings translation 2017-04-06 17:00:05 +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
Martín González
019037ebdd Add delete page button 2017-04-06 16:03:00 +02:00
Martín González
75554e5e4f Implement markup 2017-04-06 15:04:39 +02:00
Martín González
b35683f75e Implement Sandbox 2017-04-06 15:04:23 +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
Alberto
70bb08564f Merge pull request #1481 from PopulateTools/add-telegram
Add telegram
2017-04-05 18:22:38 +02:00
Enrique García
548e67fbca Merge pull request #1482 from consul/signatures
Signature sheets for budget investments
2017-04-05 14:07:36 +02:00
Juanjo Bazán
ee07dd5784 adds missing i18n files and keys 2017-04-05 13:32:28 +02:00
Amaia Castro
485f8c15b1 Icon for telegram 2017-04-05 13:07:08 +02:00
Amaia Castro
5ee2c9efa0 Add telegram to footer and to social share button 2017-04-05 13:07:08 +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
Juanjo Bazán
f9a09c3d02 Merge pull request #1480 from consul/i18n-pages
Adds i18n to more info pages
2017-04-04 18:40:00 +02:00
Alberto Garcia Cabeza
6a8f9593b8 fixes cropped proposals image 2017-04-04 18:24:58 +02:00
Alberto Garcia Cabeza
e0ef93880e translates images on more info index page 2017-04-04 18:17:57 +02:00
Alberto Garcia Cabeza
d401633c26 adds i18n to more info pages 2017-04-04 18:02:37 +02:00
Alberto Garcia Cabeza
533a7492a1 changes more information to more info 2017-04-04 18:01:30 +02:00
kikito
1d456b0459 updates capistrano to match the Gemfile 2017-04-04 13:20:45 +02:00
Enrique García
7fd3bc8d77 Merge pull request #1478 from consul/kaminari-updated
removes not needed code
2017-04-03 12:57:53 +02:00
Juanjo Bazán
d6cb76e491 removes not needed code
Kaminari has been updated
2017-04-03 12:30:57 +02:00
Enrique García
cfa804040a Merge pull request #1468 from consul/update-dependencies
Update dependencies
2017-03-31 12:03:29 +02:00
Juanjo Bazán
986a133394 Merge pull request #1476 from consul/more-info-pages
More info pages
2017-03-31 11:56:10 +02:00
Juanjo Bazán
ada8596b01 Merge branch 'master' into update-dependencies 2017-03-31 11:50:55 +02:00
Juanjo Bazán
3fbcae2147 Merge pull request #1475 from consul/nokogiri
updates nokogiri
2017-03-31 11:28:04 +02:00