kikito
52d182f099
Removes geozone from budget heading
2017-01-03 18:51:21 +01:00
kikito
18bd44d91f
do not use html in generation of unfeasibility reason
2017-01-03 18:00:35 +01:00
kikito
68d598a43d
Merge branch 'master' into budgets
2017-01-02 12:10:23 +01:00
kikito
f14f7b9a70
Adds new descriptions to budget in dev_seeds
2017-01-02 10:02:57 +01:00
kikito
07a99b8e3f
Modifies the phase field in Budget
2017-01-02 10:02:05 +01:00
kikito
d80dedaad8
Adds sanitized descriptions for all phases to budget model
2017-01-01 12:51:17 +01:00
kikito
181749b4f6
Removes valuating boolean from budgets
2016-12-30 18:41:35 +01:00
Alberto Garcia Cabeza
00581fcacc
adds setting key deleted by mistake
2016-12-30 17:21:50 +01:00
Alberto Garcia Cabeza
d8b4af5add
adds meta description and keywords
2016-12-30 17:17:46 +01:00
kikito
110a4091f8
Adds budget investment location
2016-12-29 17:30:21 +01:00
rgarcia
2a0267a1af
updates db schema
2016-12-29 12:34:50 +01:00
rgarcia
365faeff31
removes physical votes from proposals
2016-12-29 12:05:29 +01:00
kikito
9d97421b0e
Merge branch 'master' into budgets
2016-12-27 14:02:12 +01:00
Juanjo Bazán
d057c9457d
Merge branch 'master' into signature-sheets
2016-12-23 20:23:56 +01:00
Fernando Blat
05a00df8ed
Set the default from address as consul.dev
2016-12-23 15:46:39 +01:00
Fernando Blat
a07fbc5b41
Extract mailer from name and address to a setting
2016-12-23 11:28:53 +01:00
kikito
430507ec1e
Adds budget_lines.selected
2016-12-22 20:24:59 +01:00
rgarcia
25729ac259
cleans up
2016-12-21 18:55:28 +01:00
rgarcia
675081141c
refactors signatures
2016-12-21 18:46:31 +01:00
rgarcia
53ac18f68f
updates views
2016-12-20 17:06:03 +01:00
rgarcia
25868ee5eb
fixes conflicts
2016-12-20 16:55:07 +01:00
rgarcia
4eb700e3d4
refactors signature sheets
2016-12-20 16:46:08 +01:00
Alberto Garcia Cabeza
7e9b903622
adds setting signature sheets on dev_seeds
2016-12-20 14:57:43 +01:00
rgarcia
7ec6a874b6
updates seeds with signature sheet feature
2016-12-20 12:25:34 +01:00
rgarcia
7d3cb112ac
updates seeds
2016-12-20 12:21:23 +01:00
rgarcia
3c682b8a9b
adds signature sheets
2016-12-20 12:21:05 +01:00
Alberto Miedes Garcés
c2006526c9
Better way to set geozone codes when seeding
2016-12-13 12:40:11 +01:00
kikito
4b7cf22b18
Adds manager to dev_seeds
2016-12-05 17:29:43 +01:00
Alberto Miedes Garcés
c23ce8bdc6
Modified Geozone factory and seeds to be more complete
2016-12-04 21:20:06 +01:00
kikito
2a2179d0f3
Merge branch 'master' into budget
2016-11-28 11:41:49 +01:00
kikito
f0b8cfd4a2
Time.now -> Time.current
2016-11-23 19:19:19 +01:00
rgarcia
bb3c4c6399
adds consistency to ruby code style
...
Keep a blank line before and after private
Keep a blank line before and after protected
Remove extra empty line at class body end
Remove extra blank line
Add final newline
Use 2 (not 3) spaces for indentation
Use 2 (not 4) spaces for indentation
Remove space before comma
Add space after comma
Remove trailing whitespaces
Remove unnecessary spacing
Use snake_case for variable names
Do not use then for multi-line if
Remove unused block argument - i
Use the new Ruby 1.9 hash syntax
Remove unused assignment to variable
Indent when as deep as case
Align attributes
Align end with def
2016-11-15 11:18:43 +01:00
rgarcia
1a8f7e119f
sets default value for password_changed_at
2016-11-02 14:51:52 +01:00
Marcia
1f72c5cc74
improves expired password view
2016-09-30 10:10:20 +02:00
Marcia
4269f3810b
Merge remote-tracking branch 'upstream/master' into admin_password_expired
2016-09-27 13:26:08 +02:00
Enrique García
03dca699ac
removes unused budget feature info from schema.rb
2016-09-21 15:53:38 +02:00
rgarcia
0c873649c5
updates dev seed with archived proposals
2016-09-16 20:24:25 +02:00
Alberto Garcia Cabeza
910b24936d
Merge branch 'master' into voting-proposals
...
Conflicts:
app/models/proposal.rb
app/views/proposals/_proposal.html.erb
app/views/proposals/index.html.erb
app/views/proposals/show.html.erb
spec/support/common_actions.rb
2016-09-15 13:58:53 +02:00
Marcia
8d883b1e17
mejoras de codigo
2016-09-15 11:45:03 +02:00
rgarcia
a6a53659ae
updates dev seeds
2016-09-10 16:22:41 +02:00
Alberto Garcia Cabeza
3bbc2862d2
Adds admin setting 'months to archive proposals'
2016-09-09 18:02:02 +02:00
Juanjo Bazán
11a5ed15ea
adds question marks to seed data
2016-09-08 15:45:29 +02:00
Alberto Garcia Cabeza
a527de4f92
Adds proposal ballots controller and views
2016-09-07 12:43:12 +02:00
Juanjo Bazán
40cdeb568e
adds missing associations to dev_seeds
2016-09-05 13:11:57 +02:00
Juanjo Bazán
ee2e0b864f
denormalizes investments
2016-09-05 11:56:53 +02:00
rgarcia
c2c7cdb18d
Merge branch 'budget' into budget-public-controllers
2016-09-02 13:15:40 +02:00
Juanjo Bazán
b8b71d0ab0
Merge branch 'master' into budget
2016-09-02 12:47:54 +02:00
rgarcia
6281af2a7d
adds emailed_at attribute to notifications
2016-08-03 19:33:23 +02:00
Juanjo Bazán
1ad78d599e
adds admin budgets index
2016-07-28 12:36:39 +02:00
rgarcia
35f7f58fa8
removes obsolete attribute reference
2016-07-27 13:03:49 +02:00
