Commit Graph

3994 Commits

Author SHA1 Message Date
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
Juanjo Bazán
63e8950d6c adds scopes for feasible values to spending props 2016-03-29 13:36:40 +02:00
rgarcia
e52004edc3 adds permissions for everyone to see investment projects 2016-03-29 13:26:08 +02:00
Enrique García
a14cc1a575 Merge pull request #1014 from consul/email-unfeasible-polish
Email unfeasible polish
2016-03-29 11:48:36 +02:00
rgarcia
595c5485d6 adds code to email body 2016-03-29 11:38:54 +02:00
rgarcia
31aac21a2b redirect to login when creating new spending proposal 2016-03-29 11:38:04 +02:00
Alberto García Cabeza
b640fa887d Merge pull request #1013 from consul/email-unfeasible
Email unfeasible
2016-03-28 19:19:47 +02:00
rgarcia
cfe7593288 updates method name to be more accurate 2016-03-28 18:43:56 +02:00
rgarcia
381b66abdb updates reply email address 2016-03-28 18:29:59 +02:00
rgarcia
57299ec968 adds rake task to send current unfeasible spending proposals 2016-03-28 18:26:09 +02:00
Alberto Garcia Cabeza
26039d4906 Improves styles for email 2016-03-28 18:08:38 +02:00
rgarcia
467c06c3ca allows unfeasible emails only to be send out once 2016-03-28 18:06:43 +02:00
rgarcia
8a8f062398 updates investment project code 2016-03-28 16:37:16 +02:00
rgarcia
034c3b527e adds translations for unfeasible email 2016-03-28 14:08:57 +02:00
rgarcia
db5348938e adds code to email subject 2016-03-28 14:08:39 +02:00
rgarcia
d7996cd01b fixes specs 2016-03-28 12:16:08 +02:00
rgarcia
e31fe00608 updates email text 2016-03-28 12:16:08 +02:00
rgarcia
50b1571126 adds code to spending proposals 2016-03-28 12:16:08 +02:00
rgarcia
2fe1e0d624 adds pending spec for edge case 2016-03-28 12:16:07 +02:00
rgarcia
9aaeb23e7f sends an email for unfeasible spending proposals 2016-03-28 12:16:07 +02:00
Enrique García
1bbc12dc52 Merge pull request #1012 from consul/jwt-gem
updates jwt gem
2016-03-28 11:37:38 +02:00
rgarcia
7a141b8147 updates jwt gem 2016-03-28 11:19:36 +02:00
MaiteHdezRivas
69bd24d2c8 merge with consul 2016-03-21 18:28:20 +01:00
inobcr
e2610e15e7 Add_stats_for_Investment_Proyect_#918 2016-03-21 18:18:18 +01:00
Juanjo Bazán
4eb822a73c improves styles for whatsapp sharing button 2016-03-21 11:56:08 +01:00
Juanjo Bazán
df6e3301b9 uses generic urls in whatsapp sharing button 2016-03-21 11:52:49 +01:00
Alberto García Cabeza
3f63c5af7b Merge pull request #985 from Ana06/master
Share with WhatsApp
2016-03-21 11:33:14 +01:00
palomahnhp
3c7b71018b embed video in proposal show 2016-03-20 20:44:20 +01:00
MaiteHdezRivas
68f9a76cea Mark debates as featured 2016-03-20 13:56:05 +01:00
Alberto García Cabeza
1e90e37447 Merge pull request #1005 from consul/avoid-empty-description
Avoid empty description
2016-03-20 13:38:06 +01:00