kikito
5b56336941
Fixes valuation features
2016-12-13 15:51:58 +01:00
kikito
2f446cf056
Renames "open" to "current" to avoid issues with existing method called "open"
2016-12-13 12:39:53 +01:00
kikito
f4130047b2
Fixes spec and removes flackyness from tests
2016-12-12 18:52:12 +01:00
kikito
2e8650c324
merge with master
2016-12-12 16:09:05 +01:00
kikito
748fd8becf
Makes all tests pass in bi management
2016-12-07 19:16:37 +01:00
Alberto Garcia Cabeza
7ef9bafbf9
fixes specs of remove link on debates and proposals description
2016-12-07 18:42:56 +01:00
kikito
b3be1633af
Fixes all management bi issues except filtering by geozone
2016-12-07 16:35:27 +01:00
kikito
2760e751e7
fixes several specs
2016-12-06 20:09:17 +01:00
kikito
e793a0d8e1
Adapts management::budget_investments to new budgets
2016-12-06 18:05:58 +01:00
kikito
83fe74d530
Adds .js-class for specs
2016-12-05 17:33:20 +01:00
kikito
09539028a2
Replaces "search by district" by "search by heading". Fixes typo in spec
2016-12-05 11:27:04 +01:00
kikito
dee409cfc8
Fixes budget_helper issues
2016-12-02 20:10:42 +01:00
kikito
00cfb95913
Starts fixing management budget investments
2016-12-01 16:31: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
Raimond Garcia
14af1a1961
Merge pull request #1259 from consul/accessibility
...
Accessibility
2016-11-15 11:39:40 +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
Alberto Garcia Cabeza
5e487bb85f
fixes specs
2016-11-14 18:06:39 +01:00
Marcia
680c0636ed
expired password last
2016-10-06 14:19:48 +02:00
Marcia
1f72c5cc74
improves expired password view
2016-09-30 10:10:20 +02:00
Marcia
4269f3810b
Merge remote-tracking branch 'upstream/master' into admin_password_expired
2016-09-27 13:26:08 +02:00
Marcia
78c6a30424
optimize code
2016-09-27 13:07:06 +02:00
rgarcia
7d4d9b0ead
sorts archived proposals by votes
2016-09-16 19:42:18 +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
Marcia
fa833f5a4a
modificado otro mensaje en los test
2016-09-15 13:06:03 +02:00
Marcia
4832558948
modificado mensaje en el test
2016-09-15 12:21:25 +02:00
Marcia
8d883b1e17
mejoras de codigo
2016-09-15 11:45:03 +02:00
Alberto Garcia Cabeza
89340d4647
Deletes author_id on specs
2016-09-14 12:20:22 +02:00
Alberto Garcia Cabeza
30c11c9e22
Fixes specs
2016-09-14 11:41:29 +02:00
Raimond Garcia
9a2d45f25d
Merge pull request #1219 from consul/budget-management
...
Budget management
2016-09-13 18:45:30 +02:00
Juanjo Bazán
2142351743
archived proposals should not appear in 'featured'
2016-09-13 12:56:49 +02:00
Juanjo Bazán
11dbc05a80
removes archived proposals from index/search pages
2016-09-13 12:56:10 +02:00
kikito
13ffd73fee
UNFINISHED budget management
2016-09-13 12:33:34 +02:00
Juanjo Bazán
acae610995
adds model specs for archived proposal
2016-09-12 18:15:18 +02:00
Juanjo Bazán
aa05b0259e
fixes featured proposal creation in failing spec
2016-09-12 17:37:55 +02:00
kikito
2bc9e7be78
started working on budget manatement
2016-09-12 12:11:47 +02:00
rgarcia
e38e89aea0
fixes specs
2016-09-10 16:22:43 +02:00
rgarcia
fdb1d4aac9
refactors specs
2016-09-10 16:22:43 +02:00
rgarcia
16794c580c
groups and headings navigation
2016-09-10 16:22:43 +02:00
rgarcia
3730b0315c
runs all specs
2016-09-10 16:22:43 +02:00
rgarcia
263b729ede
removes delegation specs and voting via get
2016-09-10 16:22:43 +02:00
rgarcia
65f029f34c
Fixes permissions and feasibility specs
2016-09-10 16:22:42 +02:00
rgarcia
4ded0350a1
removes investments from sidebar
2016-09-10 16:22:42 +02:00
rgarcia
24740578ff
displays money remaining in each group
2016-09-10 16:22:42 +02:00
rgarcia
5aeec32704
simplifies spec
2016-09-10 16:22:42 +02:00
rgarcia
94d3cbb380
adds pending spec
2016-09-10 16:22:42 +02:00
rgarcia
22373c3ddd
Review my votes page
2016-09-10 16:22:41 +02:00
rgarcia
1c8f4d5ff0
can remove investment projects
2016-09-10 16:22:41 +02:00
rgarcia
9839d7afd0
can add investments to ballot
2016-09-10 16:22:40 +02:00
rgarcia
53d53ea9fb
moves vote specs to budget scoped folder
2016-09-10 16:22:40 +02:00
