rgarcia
|
545e0a3d0e
|
udpates translation keys
|
2016-04-04 14:41:43 +02:00 |
|
Raimond Garcia
|
b62aea431c
|
Merge pull request #1030 from consul/vote_url
adds missing local variable passing
|
2016-04-04 14:30:49 +02:00 |
|
kikito
|
3eca6b31bd
|
changes the format of the Spending proposal code
|
2016-04-04 14:14:10 +02:00 |
|
Juanjo Bazán
|
b443cdc038
|
adds missing local variable passing
|
2016-04-04 13:51:20 +02:00 |
|
Raimond Garcia
|
fcf1b83740
|
Merge pull request #1009 from inobCR/Add_stats_for_Investment_Proyect_#918
Add stats for Investment Proyect (spending proposals) #918
|
2016-04-04 13:45:03 +02:00 |
|
Alberto Garcia Cabeza
|
a9f3781745
|
Merge branch 'Ana06-master'
|
2016-04-04 13:19:57 +02:00 |
|
Alberto Garcia Cabeza
|
115868d207
|
Fixes issue in i18n
|
2016-04-04 13:19:15 +02:00 |
|
Alberto Garcia Cabeza
|
3ceee75850
|
Adds share buttons on spending proposals show
|
2016-04-04 13:18:20 +02:00 |
|
Juanjo Bazán
|
4f4c42da54
|
Merge pull request #1029 from consul/share-spending-proposal
Adds share buttons on spending proposals show
|
2016-04-04 11:36:09 +02:00 |
|
Alberto Garcia Cabeza
|
ad003500fa
|
Adds share buttons on spending proposals show
|
2016-04-04 11:26:17 +02:00 |
|
Ana
|
d16ea0dfaa
|
Translation problem fixed
|
2016-04-04 00:29:25 +02:00 |
|
Juanjo Bazán
|
0c524a0733
|
updates dependencies
|
2016-04-02 21:48:22 +02:00 |
|
Enrique García
|
7790ef9df3
|
Merge pull request #1025 from consul/investment-project-share
Improves styles for investment project share
|
2016-03-31 11:12:13 +02:00 |
|
Alberto Garcia Cabeza
|
cb4ea3f540
|
Improves styles for investment project share
|
2016-03-31 10:53:21 +02:00 |
|
Enrique García
|
dc7fdc2b26
|
Merge pull request #1024 from consul/polishing-index
adds voting to spending proposals index
|
2016-03-30 19:14:04 +02:00 |
|
Juanjo Bazán
|
dc8cd13230
|
adds geozone info to spending proposals in index
|
2016-03-30 18:53:22 +02:00 |
|
Juanjo Bazán
|
c536a12e3d
|
adds voting to spending proposals index
|
2016-03-30 18:47:40 +02:00 |
|
Enrique García
|
b3ed70dbbc
|
Merge pull request #1023 from consul/index
adds geozone and unfeasible filters to spending proposals index
|
2016-03-30 15:28:09 +02:00 |
|
Juanjo Bazán
|
4fad283947
|
adds geozone and unfeasible filters to index
|
2016-03-30 14:04:01 +02:00 |
|
Juanjo Bazán
|
3b9da7b463
|
Merge pull request #1022 from consul/design-investment-project
Improves styles for spending proposals show
|
2016-03-30 13:32:16 +02:00 |
|
Alberto Garcia Cabeza
|
d526c2effa
|
Improves styles for spending proposals show
|
2016-03-30 12:58:15 +02:00 |
|
Enrique García
|
c826424356
|
Merge pull request #1021 from consul/spending-plus
SpendingProposal index
|
2016-03-30 12:27:44 +02:00 |
|
Juanjo Bazán
|
948436f130
|
adds rake task to touch all spending proposals
(it triggers the recalculating of the tsvector for pg_search)
|
2016-03-30 12:11:15 +02:00 |
|
Juanjo Bazán
|
207479ec59
|
shows search terms in search results view
|
2016-03-30 12:10:43 +02:00 |
|
Juanjo Bazán
|
195e759f47
|
favors before_action vs before_filter
|
2016-03-30 12:10:24 +02:00 |
|
Juanjo Bazán
|
24bbbcec97
|
fixes i18n
|
2016-03-30 11:47:49 +02:00 |
|
Juanjo Bazán
|
6649b0fbdd
|
adds default value for cached_votes_up
|
2016-03-30 11:47:40 +02:00 |
|
Juanjo Bazán
|
18d304ea03
|
adds spending proposals search spec
|
2016-03-30 10:59:27 +02:00 |
|
Juanjo Bazán
|
cb681883f8
|
adds pg_search to spending proposals
|
2016-03-30 10:59:27 +02:00 |
|
Juanjo Bazán
|
d3ccc71c22
|
fixes search terms
|
2016-03-30 10:58:15 +02:00 |
|
Raimond Garcia
|
c581aad9bf
|
Merge pull request #1018 from consul/investment-project-vote
Investment project vote
|
2016-03-29 18:57:05 +02:00 |
|
rgarcia
|
34f9ce2ece
|
fixes specs
|
2016-03-29 18:47:49 +02:00 |
|
Juanjo Bazán
|
5166d0ce06
|
Merge pull request #1020 from consul/cannot-delete-proposals
allows only admins to delete spending proposals
|
2016-03-29 18:23:34 +02:00 |
|
kikito
|
98e895dec0
|
adds missing i18n
|
2016-03-29 18:13:28 +02:00 |
|
kikito
|
ee4c6dd267
|
merges with master
|
2016-03-29 17:44:16 +02:00 |
|
rgarcia
|
d5453f1733
|
fixes spec
|
2016-03-29 17:36:31 +02:00 |
|
Alberto García Cabeza
|
f2291070b2
|
Merge pull request #1007 from palomahnhp/embed_videos_in_show_proposal
embed video in proposal show #949
|
2016-03-29 17:33:31 +02:00 |
|
kikito
|
3e3c32d247
|
fixes errors in translation and adds missing ones
|
2016-03-29 17:26:18 +02:00 |
|
Alberto García Cabeza
|
16bf4137ee
|
Merge pull request #1019 from consul/spending-proposals-index
Spending proposals index
|
2016-03-29 17:16:07 +02:00 |
|
Juanjo Bazán
|
bd1c0dfa19
|
changes i18n text
|
2016-03-29 17:10:14 +02:00 |
|
rgarcia
|
6f723a871f
|
allows only admins to delete spending proposals
|
2016-03-29 17:08:31 +02:00 |
|
Juanjo Bazán
|
d507007384
|
adds missing i18n keys
|
2016-03-29 17:04:12 +02:00 |
|
Juanjo Bazán
|
d97ebf4104
|
Merge pull request #1017 from consul/investment_projects_styles
Adds styles for investment projects
|
2016-03-29 16:56:45 +02:00 |
|
Juanjo Bazán
|
4aab02e2a0
|
Merge pull request #1015 from consul/investment-project-show
adds permissions for everyone to see investment projects
|
2016-03-29 16:50:42 +02:00 |
|
Juanjo Bazán
|
6008244ecf
|
adds basic spending_proposals index
|
2016-03-29 16:46:24 +02:00 |
|
rgarcia
|
a6d7f9b323
|
runs all specs
|
2016-03-29 16:44:15 +02:00 |
|
Alberto Garcia Cabeza
|
d8a0af13eb
|
Adds styles for investment projects
|
2016-03-29 16:39:58 +02:00 |
|
rgarcia
|
ed1ec1c553
|
adds votes to spending proposals
|
2016-03-29 14:53:46 +02:00 |
|
Juanjo Bazán
|
4ddb778bed
|
refactors scopes and methods used only in admin
|
2016-03-29 14:12:19 +02:00 |
|
Enrique García
|
c3ad94cbc9
|
Merge pull request #1016 from consul/spending-proposals-index
adds scopes for feasible values to spending props
|
2016-03-29 13:42:25 +02:00 |
|