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
c4bc484afb
updates dev seeds with booths
2016-11-14 13:56:49 +01:00
rgarcia
00721bac12
updates dev_seeds with polls
2016-11-14 13:51:09 +01: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
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
Juanjo Bazán
40cdeb568e
adds missing associations to dev_seeds
2016-09-05 13:11:57 +02:00
rgarcia
35f7f58fa8
removes obsolete attribute reference
2016-07-27 13:03:49 +02:00
rgarcia
3c55d66591
fixes conflicts with budget
2016-07-27 11:41:46 +02:00
rgarcia
f24a8887bb
fixes conflicts with master
2016-07-19 14:49:27 +02:00
rgarcia
e0e5068c87
updates seeds
...
- investment headings are now required
2016-07-19 14:41:17 +02:00
Andrés Pereira
c5e6735caa
Change madrid.es to consul.dev - closes #1169
2016-07-14 16:28:16 +02:00
Juanjo Bazán
b5a6828e41
adds Budget::Group model to group headings
...
many refactors through budget related models
2016-06-09 18:00:06 +02:00
kikito
d57a6c510f
Activates budget setting in dev_seeds
2016-06-03 18:31:05 +02:00
Juanjo Bazán
e4a7989b15
Merge branch 'master' into budget
2016-06-02 12:35:44 +02:00
kikito
0427395f32
Adds missing currency symbol to dev_seeds
2016-05-31 18:58:50 +02:00
kikito
56f5983dc4
Adds budget dev_seeds
2016-05-31 12:53:11 +02:00
Alberto Garcia Cabeza
cdf3011a45
Fixes dev seeds
2016-05-23 16:53:36 +02:00
MaiteHdezRivas
3b2bfc46cf
Admin option to add banners and show banners
2016-05-19 13:18:30 +02:00
Juanjo Bazán
32f971f0ad
Merge pull request #1084 from consul/spending-proposals-summary
...
Spending proposals admin summary
2016-04-25 11:29:07 +02:00
Juanjo Bazán
a49624b6ad
adds social settings to dev_seeds
2016-04-24 21:56:43 +02:00
rgarcia
6a4177ed59
updates dev seeds
2016-04-22 15:03:50 +02:00
palomahnhp
bf5d253e12
Merge branch 'master' into tracking_user_verifications_and_others
...
Conflicts:
app/controllers/admin/stats_controller.rb
db/dev_seeds.rb
2016-04-20 11:44:33 +02:00
palomahnhp
b4ec077f16
Merge remote-tracking branch 'origin/master' into tracking_user_verifications_and_others
...
Conflicts:
app/assets/javascripts/application.js
2016-04-20 11:28:06 +02:00
Juanjo Bazán
fc0ea93cef
adds setting to dev_seeds
2016-04-17 10:55:42 +02:00
Juanjo Bazán
c71d09d3df
adds verified and level 2 users to dev_seeds
2016-04-06 12:29:50 +02:00
kikito
f4f491748f
adds tags to spending proposals in dev_seeds
2016-03-14 18:23:09 +01:00
palomahnhp
7d4936b577
track user verification and add statistics of verified users who did not vote proposals
2016-03-13 21:38:05 +01:00
palomahnhp
d786f9edea
adds the maximum length of the comments to settings
2016-03-03 15:20:29 +01:00
Juanjo Bazán
310217d65f
adds valuator and assignments to dev_seeds
2016-02-24 19:53:48 +01:00
kikito
d5eab64568
adds feature flags for omniauth login buttons/controls
...
Conflicts:
app/controllers/users/omniauth_callbacks_controller.rb
app/views/devise/_omniauth_form.html.erb
2016-01-26 18:15:39 +01:00
rgarcia
bac19ffebd
makes seeds generic
2016-01-26 12:29:19 +01:00
rgarcia
328f5b4472
updates seeds
2016-01-25 22:28:46 +01:00
Perisso
7d1d4cea4a
filter by districts and categories
2016-01-25 22:28:17 +01:00
rgarcia
0505be08e8
fixes conflicts
2016-01-25 22:24:58 +01:00
Juanjo Bazán
0772150426
adds values for new settings to dev_seeds
2016-01-20 13:16:21 +01:00
nachogomez
d16f1ccd08
merge with master two
2016-01-19 11:09:47 +01:00
nachogomez
326dd04ae7
merge with master
2016-01-14 13:03:48 +01:00
Juanjo Bazán
abe5085040
adds geozone info to admin spending proposal index
2016-01-11 14:04:41 +01:00
Juanjo Bazán
0510d211b3
adds spending resolutions to dev_seeds
2016-01-11 13:45:15 +01:00
Juanjo Bazán
af0ef726fb
includes geozones in dev_seeds
2016-01-11 12:18:23 +01:00
nachogomez
51d9d186af
Add Thematic structure and Districts - Iss685
2016-01-08 13:49:23 +01:00
rgarcia
f2c14968f3
adds legislation seed
2015-12-16 11:45:47 +01:00
kikito
c24eebed3c
Modifies the way dev_seeds verifies users
...
Previously level 3 users did not have level 2 info
2015-09-30 20:53:36 +02:00
Enrique García
ae166a6836
Merge pull request #505 from dgilperez/debates_max_votes_editable
...
Adds setting to control max number of votes for a Debate to be editable
2015-09-22 16:52:52 +02:00
David Gil
3345f91d45
adds max_votes_for_debate_edit setting to dev_seeds
2015-09-17 15:52:35 +02:00
kikito
a00d895fe8
Fixes randomly failing dev_seed errors due to long titles
2015-09-15 15:28:43 +02:00
kikito
157d33f401
fixes in dev_seed
2015-09-14 21:59:51 +02:00
