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
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
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
Juanjo Bazán
8d48eccfed
adds not_archived scope to proposal
2016-09-13 12:10:31 +02:00
Juanjo Bazán
da03311f99
archived proposals can not accept votes
2016-09-12 18:47:56 +02:00
rgarcia
24740578ff
displays money remaining in each group
2016-09-10 16:22:42 +02:00
rgarcia
22373c3ddd
Review my votes page
2016-09-10 16:22:41 +02:00
rgarcia
9d4f2d1aff
Displays budget groups
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
Alberto Garcia Cabeza
3bbc2862d2
Adds admin setting 'months to archive proposals'
2016-09-09 18:02:02 +02:00
Alberto Garcia Cabeza
41312ca2a5
Creates archived proposals method
2016-09-09 17:31:05 +02:00
Juanjo Bazán
8aa62f8ce7
Merge branch 'budget' into admin-budgets
2016-09-09 15:13:05 +02:00
Juanjo Bazán
0fc31b1259
adds budget/budget_investment indexes to valuators
2016-09-09 13:39:08 +02:00
kikito
50f82211a9
Add User has_many budget_investments
2016-09-09 12:20:58 +02:00
kikito
f456400218
Removes duplicated relationship between budget and investment
2016-09-09 12:17:05 +02:00
Juanjo Bazán
e330b704c0
removes half-baked feature
...
archived proposals is a separate issue now
2016-09-08 17:06:16 +02:00
Alberto Garcia Cabeza
22487592cf
Adds scope for archived proposals
2016-09-07 12:57:53 +02:00
Alberto Garcia Cabeza
b107790039
Adds links, texts and i18n
2016-09-07 12:46:29 +02:00
Juanjo Bazán
31ef3f4c98
adds heading filter to index
2016-09-06 17:03:35 +02:00
Juanjo Bazán
6d06a59403
uses direct associations when managing investments
2016-09-05 13:02:08 +02:00
rgarcia
c2c7cdb18d
Merge branch 'budget' into budget-public-controllers
2016-09-02 13:15:40 +02:00
rgarcia
3e0786b555
Merge branch 'budget' of github.com:AyuntamientoMadrid/participacion into budget
2016-09-02 13:15:30 +02:00
Juanjo Bazán
b8b71d0ab0
Merge branch 'master' into budget
2016-09-02 12:47:54 +02:00
Juanjo Bazán
46563f8222
Merge pull request #1194 from consul/notifications-polish
...
Notifications polish
2016-08-04 11:29:21 +02:00
Juanjo Bazán
0f7e23bec4
adds budget's groups & headings to admin
2016-08-03 20:23:41 +02:00
rgarcia
b087fe8fb7
refactors email digest
2016-08-03 19:33:37 +02:00
rgarcia
9d9bf488fc
does not create notifications for blocked or erased users
2016-08-02 20:52:20 +02:00
Juanjo Bazán
49bc6533e8
adds explicit permission to admin to read budgets
2016-07-29 13:39:08 +02:00
Juanjo Bazán
9014de2693
adds budgets_helper
2016-07-29 13:34:11 +02:00
