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

97 Commits

Author SHA1 Message Date
Amaia Castro
00b488fe84 Merge branch 'master' into legislation-module-stable 2017-01-17 10:46:33 +01:00
Alberto Garcia Cabeza
e18751ce5c verifies admin in dev seeds 2017-01-14 18:14:32 +01:00
Amaia Castro
a2a61341fe Merge branch 'master' into legislation-module-stable 2017-01-11 22:54:41 +01:00
rgarcia
4d5b885b7e sets spending proposal's settings to nil 2017-01-10 20:13:48 +01:00
Juanjo Bazán
be0cbb9ea1 adds setting to dev_seeds values 2017-01-09 16:05:33 +01:00
rgarcia
64366ba1f6 tmp fix for heading geozones 2017-01-08 20:03:30 +01:00
Juanjo Bazán
a5b4a79f62 Merge pull request #1325 from consul/budgets-gaspar 
Budgets - several fixes
 2017-01-05 13:06:48 +01:00
rgarcia
dde1d34172 fixes conflicts with master 2017-01-05 01:56:35 +01:00
Amaia Castro
a3b8d30567 Merge branch 'master' into legislation-module-stable 2017-01-03 19:38:01 +01:00
kikito
18bd44d91f do not use html in generation of unfeasibility reason 2017-01-03 18:00:35 +01:00
Fernando Blat
04a3a4177d Merge branch 'master' into 1315-manage-offices_url-as-setting 2017-01-03 08:57:02 +01:00
kikito
68d598a43d Merge branch 'master' into budgets 2017-01-02 12:10:23 +01:00
Amaia Castro
3de48353da Merge branch 'master' into legislation-module-stable 2017-01-02 11:56:17 +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
Fernando Blat
ca2370eb7c Manage offices url as a setting 2016-12-29 10:31:38 +01:00
Amaia Castro
04b23cfc7b Merge branch 'master' into legislation-module-stable 2016-12-27 16:43:43 +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
Amaia Castro
e4315f94c8 Merge branch 'master' into legislation-module-stable 2016-12-15 11:26:22 +01:00
Alberto Miedes Garcés
c2006526c9 Better way to set geozone codes when seeding 2016-12-13 12:40:11 +01:00
Amaia Castro
e4fe499e66 DraftVersion base model and very basic admin pages 2016-12-06 12:10:20 +01:00
kikito
4b7cf22b18 Adds manager to dev_seeds 2016-12-05 17:29:43 +01:00
Amaia Castro
369804a2ba Base Legislation::Process model and admin page 2016-12-05 13:24:23 +01:00
Alberto Miedes Garcés
c23ce8bdc6 Modified Geozone factory and seeds to be more complete 2016-12-04 21:20:06 +01:00
Amaia Castro
9a9f1da5a0 Renames Legislation model to LegacyLegislation 
Renames the model and related stuff from Legislation 
to LegacyLegislation to avoid name clashes with 
the future Legislation module.
 2016-11-30 12:00:05 +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