kikito
|
e793a0d8e1
|
Adapts management::budget_investments to new budgets
|
2016-12-06 18:05:58 +01:00 |
|
kikito
|
34071a0f9f
|
Unifies budget_headings_helper
|
2016-12-06 18:03:03 +01:00 |
|
kikito
|
0564392964
|
Introduces management budgets
|
2016-12-06 18:02:25 +01:00 |
|
kikito
|
8ef479bf31
|
Changes routes to use budgets resource instead of namespace
|
2016-12-06 18:01:37 +01:00 |
|
kikito
|
5538c70931
|
Introduces budget.translated_phase
|
2016-12-06 17:52:14 +01:00 |
|
kikito
|
350d79d20a
|
management menu: use && . Refactor bi conditions
|
2016-12-06 17:47:45 +01:00 |
|
kikito
|
882565aeca
|
Adds more controller variables and uses them in investment controller
|
2016-12-05 17:35:40 +01:00 |
|
kikito
|
407ad301d1
|
Uses should_show_votes? instead of budget.selecting?
|
2016-12-05 17:35:00 +01:00 |
|
kikito
|
83fe74d530
|
Adds .js-class for specs
|
2016-12-05 17:33:20 +01:00 |
|
kikito
|
e1fcaf66ef
|
Moves ballot/_add and ballot/_remove inside _ballot
|
2016-12-05 17:32:37 +01:00 |
|
kikito
|
703cc72953
|
Replace helper function by decorator methods
|
2016-12-05 17:28:30 +01:00 |
|
kikito
|
c64c88da43
|
Fixes typo
|
2016-12-05 11:13:57 +01:00 |
|
kikito
|
98549d8e61
|
Restores investment/_investment view
|
2016-12-02 20:10:22 +01:00 |
|
kikito
|
f677d90f73
|
Implements bi.should_show_ballots?
|
2016-12-02 20:10:07 +01:00 |
|
kikito
|
6aab9f5253
|
renames _investment to _investment_show
|
2016-12-02 19:32:56 +01:00 |
|
kikito
|
c1f62dd317
|
Reimplements several bi views
|
2016-12-02 19:23:46 +01:00 |
|
kikito
|
4372238df8
|
investment-projects -> budget-investments
|
2016-12-02 19:22:42 +01:00 |
|
kikito
|
e280645511
|
transforms _votes to use parameters instead of @ variables
|
2016-12-02 19:22:11 +01:00 |
|
kikito
|
2ec4f53367
|
investment-project -> budget-investment
|
2016-12-02 19:21:46 +01:00 |
|
kikito
|
bd8d3aaf04
|
Removes old views
|
2016-12-02 19:21:28 +01:00 |
|
kikito
|
84eb6fcfc1
|
Adds _comment_tree view
|
2016-12-02 19:20:33 +01:00 |
|
kikito
|
83d254adae
|
Moves views from one folder to another
|
2016-12-02 19:19:22 +01:00 |
|
kikito
|
104ccf11e4
|
Updates paths
|
2016-12-02 19:16:12 +01:00 |
|
kikito
|
00cfb95913
|
Starts fixing management budget investments
|
2016-12-01 16:31:05 +01:00 |
|
kikito
|
979880f910
|
adds i18n for budget phases
|
2016-11-28 19:08:09 +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 |
|
Alberto Garcia Cabeza
|
a66800afb1
|
fixes styles for spending proposals list and show
|
2016-11-14 17:46:01 +01:00 |
|
Alberto Garcia Cabeza
|
2249fdbdfa
|
improves outline and structure headings
|
2016-11-14 17:45:20 +01:00 |
|
Alberto Garcia Cabeza
|
e778c49e64
|
removes orange blocks and improves contrast on proposals
|
2016-11-02 16:31:38 +01:00 |
|
Alberto Garcia Cabeza
|
2c4b5315c8
|
removes blue blocks and improves contrast on debates
|
2016-11-02 13:07:26 +01:00 |
|
Alberto Garcia Cabeza
|
f8649ad6c2
|
improves styles on comments votes
|
2016-11-02 12:17:15 +01:00 |
|
Alberto Garcia Cabeza
|
e9b5a8980e
|
removes redundant link on header
|
2016-10-31 18:39:57 +01:00 |
|
Juanjo Bazán
|
87ec74b49f
|
Merge pull request #1253 from consul/refactor-styles
Refactor styles
|
2016-10-31 17:27:52 +01:00 |
|
Alberto Garcia Cabeza
|
6fd5e6a67a
|
unifies styles for participation not allowed
|
2016-10-31 16:50:13 +01:00 |
|
Alberto Garcia Cabeza
|
7d4f92f10a
|
unifies styles of page forms
|
2016-10-31 13:11:23 +01:00 |
|
rgarcia
|
c0f400a4d9
|
Adds custom locale name for Português
|
2016-10-31 11:50:24 +01:00 |
|
Alberto Garcia Cabeza
|
5c1e1f96ea
|
deletes unused wrap class
|
2016-10-25 16:23:45 +02:00 |
|
Juanjo Bazán
|
179cb3d611
|
Merge pull request #1247 from consul/direct-messages-format
fixes text format on direct messages
|
2016-10-19 11:26:30 +02:00 |
|
Alberto Garcia Cabeza
|
c835d9b1d1
|
improves styles for flash notices
|
2016-10-19 10:54:48 +02:00 |
|
Alberto Garcia Cabeza
|
e8312ff86a
|
fixes text format on direct messages
|
2016-10-18 16:40:59 +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 |
|
rgarcia
|
72e173b8ea
|
closes missing div
|
2016-09-16 20:25:12 +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 |
|
Alberto Garcia Cabeza
|
7abd31e4bf
|
Renames variable, updates text
|
2016-09-15 13:47:53 +02:00 |
|
Juanjo Bazán
|
e0c3f7c029
|
Merge pull request #1213 from consul/archived-proposals
Archived proposals
|
2016-09-15 13:22:05 +02:00 |
|
Marcia
|
8d883b1e17
|
mejoras de codigo
|
2016-09-15 11:45:03 +02:00 |
|
Alberto Garcia Cabeza
|
db6f82fa4c
|
Moves banner to a partial and includes it on debates index
|
2016-09-14 11:09:36 +02:00 |
|
Alberto Garcia Cabeza
|
076e237320
|
Improves proposal ballot banner, deletes unused partial
|
2016-09-14 10:40:16 +02:00 |
|