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
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
Alberto Miedes Garcés
c23ce8bdc6
Modified Geozone factory and seeds to be more complete
2016-12-04 21:20:06 +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
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
rgarcia
6281af2a7d
adds emailed_at attribute to notifications
2016-08-03 19:33:23 +02:00
Andrés Pereira
c5e6735caa
Change madrid.es to consul.dev - closes #1169
2016-07-14 16:28:16 +02:00
rgarcia
98040e191e
fixes conflicts with fork
2016-06-20 21:33:34 +02:00
rgarcia
86fcd4fa76
removes blank space in setting's key
2016-06-16 15:45:33 +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
18dd9c95f3
fixes specs
2016-06-16 12:06:26 +02:00
rgarcia
25ebb325d1
limits maximum number of messages able to send per day
2016-06-16 11:10:26 +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
a3ffbd77b2
adds missing migration file (external_link)
2016-06-09 13:51:07 +02:00
rgarcia
c3d06c8bd0
adds direct messages
2016-06-08 20:44:54 +02:00
rgarcia
8e12fbdd55
adds time limit between notifications
2016-06-07 13:48:09 +02:00
rgarcia
ad697cd2c1
adds preference to receive proposal notifications
2016-06-06 12:55:33 +02:00
rgarcia
f5375e813d
stores a proposal notification
2016-06-01 17:23:56 +02:00
Juanjo Bazán
7c22c9d6fa
changes texts to english
2016-05-23 19:53:36 +02:00
Juanjo Bazán
6614f365cc
fixes indentation
2016-05-23 19:53:09 +02:00
Alberto Garcia Cabeza
5c166dc8ee
Removes old schema tables
2016-05-23 16:53:53 +02:00
Alberto Garcia Cabeza
cdf3011a45
Fixes dev seeds
2016-05-23 16:53:36 +02:00
Alberto Garcia Cabeza
8954ea6cb5
Improves styles, removes blank spaces and changes banners img
2016-05-23 16:49:40 +02:00
MaiteHdezRivas
550f61ed51
Merge with consul
2016-05-19 13:55:25 +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
