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
Alberto Miedes Garcés
6445fffc0d
Merge branch 'master' into api-dev-0.18.11
2017-01-04 16:21:32 +01:00
Juanjo Bazán
b2c9d5e6b0
Merge branch 'master' into polls
2017-01-03 23:04:21 +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
Juanjo Bazán
55fea6c037
adds polls-related seed data
2017-01-02 19:29:43 +01:00
Juanjo Bazán
08ea4b35eb
Merge branch 'master' into polls
2017-01-02 12:14:40 +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
Juanjo Bazán
ab61d94d2d
changes Time.now to Time.current
2016-12-27 18:26:03 +01:00
Juanjo Bazán
5ec12e4b5b
Merge branch 'master' into redux-polling
2016-12-27 18:22:06 +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
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
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
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
Juanjo Bazán
21c9f2c44b
fixes Booth creation in dev_seeds
2016-12-07 15:09:00 +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
rgarcia
f268cd0677
removes question attribute from seeds
2016-11-24 10:56:31 +01:00
kikito
f0b8cfd4a2
Time.now -> Time.current
2016-11-23 19:19:19 +01:00
rgarcia
e12f183775
fixes typo
2016-11-19 14:03:10 +01:00
rgarcia
54d9ca3e67
updates dev seeds with successful proposals
2016-11-18 20:49:03 +01:00
rgarcia
5894a169d6
updates dev seeds with poll questions from proposals
2016-11-18 20:39:02 +01:00
rgarcia
b48ee1c7a2
updates dev seeds with comments for poll questions
2016-11-18 20:35:05 +01:00
rgarcia
665c6bbc65
updates poll dev seeds
2016-11-18 20:21:44 +01:00
rgarcia
5f6d0590e8
tmp commit refactoring answerable questions
2016-11-18 03:57:31 +01:00
rgarcia
d9ad658758
adds admin interface for poll questions
2016-11-17 09:30:42 +01:00
rgarcia
127cbcc5c7
adds dev seeds for polls and poll questions
2016-11-16 19:38:41 +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
c4bc484afb
updates dev seeds with booths
2016-11-14 13:56:49 +01:00
rgarcia
00721bac12
updates dev_seeds with polls
2016-11-14 13:51:09 +01:00
rgarcia
0c873649c5
updates dev seed with archived proposals
2016-09-16 20:24:25 +02:00
