consul/nairobi
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
4,195 Commits 1 Branch 0 Tags
69fc161b8338fbec6f1b65703d3d2b00fd276f3c
Commit Graph

348 Commits

Author SHA1 Message Date
Alberto Miedes Garcés
e3fca5c49f Remove functionality related to votes demographic info 
Since this was giving me too much pain and nobody actually requested
this functionality, I decided to remove it.
 2017-01-25 13:37:29 +01:00
Alberto Miedes Garcés
a31f6be3bd Add proposal notifications to seeds 2017-01-07 22:16:17 +01:00
Alberto Miedes Garcés
1e95cdfce3 Fix dev_seeds 2017-01-07 21:58:29 +01:00
Alberto Miedes Garcés
861a723724 Only show public_voter if votable.total_votes are above threshold 2017-01-07 17:22:18 +01:00
Alberto Miedes Garcés
6445fffc0d Merge branch 'master' into api-dev-0.18.11 2017-01-04 16:21:32 +01:00
Fernando Blat
04a3a4177d Merge branch 'master' into 1315-manage-offices_url-as-setting 2017-01-03 08:57:02 +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
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
Fernando Blat
ca2370eb7c Manage offices url as a setting 2016-12-29 10:31:38 +01:00
Alberto Miedes Garcés
d4b049175c Merge branch 'master' into api-dev-0.18.11 2016-12-26 12:55:17 +01:00
Alberto Miedes Garcés
64cf3cde34 Modified seeds to provide more meaningful data 2016-12-26 12:52:23 +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
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
c155da5e10 Change seeds to provide meaningful data for querying public_author from API 2016-12-13 14:20:43 +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