Amaia Castro
a2a61341fe
Merge branch 'master' into legislation-module-stable
2017-01-11 22:54:41 +01:00
rgarcia
53c5ea7e90
fixes specs
2017-01-10 21:30:38 +01:00
rgarcia
f2d23b56e0
fixes conflicts with budgets
2017-01-09 13:33:01 +01:00
Alberto Garcia Cabeza
8722699cd8
fixes typos and spec for budgets investments
2017-01-08 22:17:14 +01:00
rgarcia
3ba57bbab2
adds valuator tags
2017-01-08 13:24:05 +01:00
kikito
5f108944a8
final attempt at fixing travis
2017-01-05 12:49:53 +01:00
kikito
5eec8c7da2
attempts to fix travis again
2017-01-05 12:32:36 +01:00
kikito
2a792a5499
attempts to fix failing spec in travis
2017-01-05 12:05:40 +01:00
Alberto Garcia Cabeza
a42c1387cf
fixes specs
2017-01-04 19:38:49 +01:00
kikito
0f174df5fe
Removes geozones from budget heading views and specs
2017-01-04 12:46:11 +01:00
Amaia Castro
99e3afd6ca
Merge branch 'legislation-module-stable' into 13-draft-version-page
2017-01-03 09:28:26 +01:00
Fernando Blat
c47993ec91
Merge pull request #49 from medialab-prado/47-fix-bug-deleting-questions
...
Fix stack level too deep bug when deleting questions with answers
2017-01-03 09:23:56 +01:00
Amaia Castro
98b6dd75ea
Fix stack level too deep bug when deleting questions with answers
2017-01-02 20:45:20 +01:00
Amaia Castro
5627b18be2
Draft Version page
2017-01-02 18:05:15 +01:00
kikito
68d598a43d
Merge branch 'master' into budgets
2017-01-02 12:10:23 +01:00
kikito
98e9e8de0f
Fixes errors in specs related to changes in budget phases
2017-01-02 10:37:37 +01:00
Amaia Castro
0cd2b62e2c
Integrate admin html and css from sandbox
2016-12-30 11:00:34 +01:00
Alberto Garcia Cabeza
73e3ea3560
fixes specs
2016-12-29 19:16:20 +01:00
kikito
d2356c18d0
Adds toggle_selection action
2016-12-28 19:11:59 +01:00
Amaia Castro
525ad3ebd1
Merge branch 'master' into legislation-module-stable
2016-12-28 17:51:15 +01:00
rgarcia
d554ec810a
adds document counter to signature sheet
2016-12-28 11:40:20 +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
rgarcia
ddeca6f06d
fixes specs
2016-12-23 19:05:25 +01:00
rgarcia
0deba76db1
adds specs
2016-12-21 18:46:38 +01:00
Amaia Castro
d25d6c178c
Legislation Questions model and basic admin
2016-12-20 18:52:43 +01:00
rgarcia
76723070e2
adds pending specs
2016-12-20 12:21:45 +01:00
Amaia Castro
e4315f94c8
Merge branch 'master' into legislation-module-stable
2016-12-15 11:26:22 +01:00
Amaia Castro
400b510b71
Store the processed html from the markdown text body field
2016-12-14 11:32:28 +01:00
Alberto Miedes Garcés
db029964fa
Check geozone 'safe_to_delete' behavior as unit test instead of integration test
2016-12-13 18:38:13 +01:00
Alberto Miedes Garcés
419905fb59
Set expectations for flash inside admin geozones spec
2016-12-13 13:25:38 +01:00
kikito
2f446cf056
Renames "open" to "current" to avoid issues with existing method called "open"
2016-12-13 12:39:53 +01:00
Alberto Miedes Garcés
2a3dfdd595
Refactor admin geozones specs
2016-12-13 12:33:58 +01:00
kikito
f4130047b2
Fixes spec and removes flackyness from tests
2016-12-12 18:52:12 +01:00
Alberto Miedes Garcés
0e1cea48c4
Fixed admin edit geozone spec
2016-12-08 13:17:05 +01:00
Alberto Miedes Garcés
93e79228a7
Ability to delete geozones from admin dashboard
2016-12-08 13:16:42 +01:00
Alberto Miedes Garcés
fea2009396
Ability to edit geozones from admin dashboard
2016-12-07 22:08:22 +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
6175990533
Admin geozones: index, create
...
Modified Geozone factory and seeds to be more complete
2016-12-04 21:19:36 +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
Juanjo Bazán
0fc31b1259
adds budget/budget_investment indexes to valuators
2016-09-09 13:39:08 +02:00
Juanjo Bazán
2d56415048
adds feature flag for admin/budgets management
2016-09-07 15:13:39 +02:00
Juanjo Bazán
8890380804
adds investment editing to admin
2016-09-07 14:13:40 +02:00
Juanjo Bazán
31ef3f4c98
adds heading filter to index
2016-09-06 17:03:35 +02:00
Juanjo Bazán
b0358e4867
adds index of investments with filters to admin
2016-09-05 17:50:58 +02:00
Juanjo Bazán
0f7e23bec4
adds budget's groups & headings to admin
2016-08-03 20:23:41 +02:00
Juanjo Bazán
724ccf175c
adds budget show to admin
2016-07-29 14:52:37 +02:00