kikito
2a2179d0f3
Merge branch 'master' into budget
2016-11-28 11:41:49 +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
8d883b1e17
mejoras de codigo
2016-09-15 11:45:03 +02:00
Juanjo Bazán
ee2e0b864f
denormalizes investments
2016-09-05 11:56:53 +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
rgarcia
f24a8887bb
fixes conflicts with master
2016-07-19 14:49:27 +02:00
rgarcia
98040e191e
fixes conflicts with fork
2016-06-20 21:33:34 +02:00
Enrique García
5417adee4a
Merge pull request #1140 from consul/proposal-notifications
...
Proposal notifications and Direct Messages
2016-06-16 12:35:37 +02:00
rgarcia
fd67294075
adds option to receive direct messages
2016-06-14 18:20:36 +02:00
rgarcia
6e800c5120
adds email digest for proposal notifications
2016-06-14 17:53:36 +02:00
Juanjo Bazán
1b57e14a86
removes heading reference in ballot
...
heading info is stored per group in ballot_lines
2016-06-14 14:04:27 +02:00
Juanjo Bazán
ab008ed4e9
adds denormalization to budget::ballot::lines
2016-06-11 14:57:07 +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
Juanjo Bazán
a3ffbd77b2
adds missing migration file (external_link)
2016-06-09 13:51:07 +02:00
Juanjo Bazán
3fae269c40
adds missing migration file (external_link)
2016-06-09 13:30:01 +02:00
rgarcia
c3d06c8bd0
adds direct messages
2016-06-08 20:44:54 +02:00
rgarcia
ad697cd2c1
adds preference to receive proposal notifications
2016-06-06 12:55:33 +02:00
Juanjo Bazán
e4a7989b15
Merge branch 'master' into budget
2016-06-02 12:35:44 +02:00
rgarcia
f5375e813d
stores a proposal notification
2016-06-01 17:23:56 +02:00
kikito
56f5983dc4
Adds budget dev_seeds
2016-05-31 12:53:11 +02:00
kikito
2409cccd8f
Adds budget.price and ballot.heading_id
2016-05-24 17:38:41 +02:00
kikito
d4d16d3006
Adds responsible_name migration for investments
2016-05-24 14:34:04 +02:00
kikito
20108639cb
migrates
2016-05-24 14:34:04 +02:00
kikito
cf0b7a53b0
Adds missing budget_id to investments
2016-05-24 14:33:30 +02:00
Juanjo Bazán
c48059594b
removes belongs_to :heading relation from ballot
2016-05-24 13:04:12 +02:00
Juanjo Bazán
6614f365cc
fixes indentation
2016-05-23 19:53:09 +02:00
kikito
f1b8ba0457
Adds headings via migrations
2016-05-20 14:06:32 +02:00
kikito
40ae4efe26
Adds migrations
2016-05-20 12:40:52 +02:00
MaiteHdezRivas
3b2bfc46cf
Admin option to add banners and show banners
2016-05-19 13:18:30 +02:00
Juanjo Bazán
9ed3fa2a22
creates manager role
2016-05-10 18:31:50 +02:00
kikito
dea1a28a69
purges simple_captcha
2016-04-27 16:07:47 +02:00
rgarcia
aaca99b46f
orders valuators by spending proposal count
2016-04-26 23:33:19 +02:00
Juanjo Bazán
66dd511979
Merge pull request #1041 from consul/select-featured-debates
...
Select featured debates
2016-04-25 18:19:40 +02:00
Juanjo Bazán
be011a10dc
adds retired reason & explanation to proposals
2016-04-23 13:24:15 +02:00
Juanjo Bazán
69d2c14b49
adds retired_at to proposals
2016-04-23 13:24:15 +02:00
kikito
d752a334f8
adds index for username
2016-04-19 13:33:52 +02:00
rgarcia
f2e0059c96
activates newsletter by default
2016-04-18 19:58:01 +02:00
kikito
3adcd9c304
Adds physical votes to sps table
2016-04-15 17:16:13 +02:00
kikito
ba67396539
Adds migration for renaming genre to gender
2016-04-13 14:25:14 +02:00
kikito
3b754fd998
Adds two new fields to user
2016-04-11 18:28:28 +02:00
kikito
3c8416e863
Adds responsible_name to spending_proposals
2016-04-06 19:18:10 +02:00
Alberto Garcia Cabeza
3fd8e76a79
Merge branch 'select_debates_which_display_as_featured' of https://github.com/MaiteHdezRivas/consul into MaiteHdezRivas-select_debates_which_display_as_featured
...
Conflicts:
db/schema.rb
2016-04-05 14:05:27 +02:00
Juanjo Bazán
6649b0fbdd
adds default value for cached_votes_up
2016-03-30 11:47:40 +02:00
Juanjo Bazán
cb681883f8
adds pg_search to spending proposals
2016-03-30 10:59:27 +02:00
rgarcia
ed1ec1c553
adds votes to spending proposals
2016-03-29 14:53:46 +02:00
rgarcia
467c06c3ca
allows unfeasible emails only to be send out once
2016-03-28 18:06:43 +02:00
MaiteHdezRivas
69bd24d2c8
merge with consul
2016-03-21 18:28:20 +01:00
