consul/grecia
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
4,173 Commits 1 Branch 0 Tags
2b6df62dd74906b51a06d971841db5af5d256aae
Commit Graph

71 Commits

Author SHA1 Message Date
Amaia Castro
a3b8d30567 Merge branch 'master' into legislation-module-stable 2017-01-03 19:38:01 +01:00
Fernando Blat
04a3a4177d Merge branch 'master' into 1315-manage-offices_url-as-setting 2017-01-03 08:57:02 +01:00
Amaia Castro
3de48353da Merge branch 'master' into legislation-module-stable 2017-01-02 11:56:17 +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
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
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
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
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
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
Andrés Pereira
c5e6735caa Change madrid.es to consul.dev - closes #1169 2016-07-14 16:28:16 +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
rgarcia
0505be08e8 fixes conflicts 2016-01-25 22:24:58 +01:00
Juanjo Bazán
0772150426 adds values for new settings to dev_seeds 2016-01-20 13:16:21 +01:00
nachogomez
d16f1ccd08 merge with master two 2016-01-19 11:09:47 +01:00
nachogomez
326dd04ae7 merge with master 2016-01-14 13:03:48 +01:00
Juanjo Bazán
abe5085040 adds geozone info to admin spending proposal index 2016-01-11 14:04:41 +01:00
Juanjo Bazán
0510d211b3 adds spending resolutions to dev_seeds 2016-01-11 13:45:15 +01:00
Juanjo Bazán
af0ef726fb includes geozones in dev_seeds 2016-01-11 12:18:23 +01:00
nachogomez
51d9d186af Add Thematic structure and Districts - Iss685 2016-01-08 13:49:23 +01:00
rgarcia
f2c14968f3 adds legislation seed 2015-12-16 11:45:47 +01:00