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

80 Commits

Author SHA1 Message Date
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
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
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
Alberto Garcia Cabeza
7e9b903622 adds setting signature sheets on dev_seeds 2016-12-20 14:57:43 +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
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