kikito
9d97421b0e
Merge branch 'master' into budgets
2016-12-27 14:02:12 +01:00
rgarcia
316f9a0370
creates users with email nil to avoid index constraint
2016-12-26 14:28:45 +01:00
rgarcia
5281bb8181
fixes typo
2016-12-26 12:59:23 +01:00
rgarcia
c1b06b6501
creates user without email nor username
2016-12-26 12:45:48 +01:00
rgarcia
42b0ff2696
optimize census call to return after finding a valid element
2016-12-26 11:51:28 +01:00
kikito
53233c365a
Adds a new reason for not being ballotable
2016-12-25 12:55:03 +01:00
rgarcia
ddeca6f06d
fixes specs
2016-12-23 19:05:25 +01:00
kikito
a589d8a76d
Simplifies ballot.add_investment using automatic denormalization
2016-12-23 15:37:32 +01:00
kikito
f125941bbf
Tweaks unselected error in ballot/line
2016-12-23 15:22:19 +01:00
kikito
430507ec1e
Adds budget_lines.selected
2016-12-22 20:24:59 +01:00
rgarcia
25729ac259
cleans up
2016-12-21 18:55:28 +01:00
rgarcia
675081141c
refactors signatures
2016-12-21 18:46:31 +01:00
rgarcia
b10dbd7cb5
adds specs
2016-12-20 18:00:36 +01:00
rgarcia
4eb700e3d4
refactors signature sheets
2016-12-20 16:46:08 +01:00
rgarcia
3c682b8a9b
adds signature sheets
2016-12-20 12:21:05 +01:00
kikito
be2543cf61
Uncomments ability section
2016-12-19 19:03:46 +01:00
kikito
19e19e5c43
Fixes error when trying to denormalize a model whose dependent field is nil
2016-12-16 18:00:18 +01:00
kikito
316c0cff62
Adds missing method to budget
2016-12-16 17:59:03 +01:00
kikito
355e286608
De-normalizes references in budgetballotline automatically
2016-12-15 18:17:52 +01:00
Raimond Garcia
392f00cdbd
Merge pull request #1282 from amiedes/crud-geozones-PRs
...
[Finished] Allow admins to manage geozones
2016-12-14 19:25:17 +01:00
kikito
8d60ea1d3c
Refactors apply_filters_and_search to inside investment model
2016-12-14 13:39:54 +01:00
kikito
4434a601d3
Implements several helper methods for formatting amounts
2016-12-14 11:49:16 +01:00
kikito
d5065fe021
fixes typo: ammount -> amount
2016-12-14 11:11:06 +01:00
Alberto Miedes Garcés
c22a80b48f
Move geozone 'safe to destroy' check from controller to model
2016-12-13 12:30:47 +01:00
rgarcia
6b0f8eb62b
do not allow verification of deregistered accounts
2016-12-12 19:11:00 +01:00
rgarcia
b12c8d3a5d
validates document uniqueness only for active accounts
2016-12-12 19:11:00 +01:00
rgarcia
93841b87ad
maintains associated document number when erasing account
2016-12-12 19:11:00 +01:00
Alberto Miedes Garcés
fea2009396
Ability to edit geozones from admin dashboard
2016-12-07 22:08:22 +01:00
Alberto Miedes Garcés
4b31360d2e
Updated geozone model associations
2016-12-07 22:04:39 +01:00
kikito
748fd8becf
Makes all tests pass in bi management
2016-12-07 19:16:37 +01:00
kikito
1e3a44b380
everyone can print budget investments
2016-12-07 17:46:46 +01:00
kikito
b3be1633af
Fixes all management bi issues except filtering by geozone
2016-12-07 16:35:27 +01:00
kikito
5538c70931
Introduces budget.translated_phase
2016-12-06 17:52:14 +01:00
kikito
2ced3e91d6
Fixes typo
2016-12-05 17:32:46 +01:00
kikito
703cc72953
Replace helper function by decorator methods
2016-12-05 17:28:30 +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
f677d90f73
Implements bi.should_show_ballots?
2016-12-02 20:10:07 +01:00
kikito
3508c6d59c
Implements decorator methods in investment
2016-12-02 19:24:01 +01:00
kikito
00cfb95913
Starts fixing management budget investments
2016-12-01 16:31:05 +01:00
kikito
424d0201c4
Adds denormalized ids to budget investment
2016-12-01 14:14: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
Marcia
680c0636ed
expired password last
2016-10-06 14:19:48 +02:00
Marcia
1e87810593
improves expired password view
2016-09-29 14:34:37 +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
8d883b1e17
mejoras de codigo
2016-09-15 11:45:03 +02:00
