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 |
|
Juanjo Bazán
|
c536a12e3d
|
adds voting to spending proposals index
|
2016-03-30 18:47:40 +02:00 |
|
Juanjo Bazán
|
4fad283947
|
adds geozone and unfeasible filters to index
|
2016-03-30 14:04:01 +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
|
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
|
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
|
16bf4137ee
|
Merge pull request #1019 from consul/spending-proposals-index
Spending proposals index
|
2016-03-29 17:16:07 +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
|
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 |
|
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 |
|
rgarcia
|
31aac21a2b
|
redirect to login when creating new spending proposal
|
2016-03-29 11:38:04 +02:00 |
|
rgarcia
|
cfe7593288
|
updates method name to be more accurate
|
2016-03-28 18:43:56 +02:00 |
|
rgarcia
|
467c06c3ca
|
allows unfeasible emails only to be send out once
|
2016-03-28 18:06:43 +02:00 |
|
rgarcia
|
9aaeb23e7f
|
sends an email for unfeasible spending proposals
|
2016-03-28 12:16:07 +02:00 |
|
inobcr
|
e2610e15e7
|
Add_stats_for_Investment_Proyect_#918
|
2016-03-21 18:18:18 +01:00 |
|
Juanjo Bazán
|
5b44de3bba
|
makes description nil if blank
|
2016-03-19 12:15:02 +01:00 |
|
Juanjo Bazán
|
f299ea7ebb
|
changes valuator order to include description
|
2016-03-18 19:44:36 +01:00 |
|
Juanjo Bazán
|
95435a0734
|
changes order for valuator list
|
2016-03-16 10:50:07 +01:00 |
|
Juanjo Bazán
|
4546af5be1
|
redux of valuators creation form
|
2016-03-15 15:33:00 +01:00 |
|
kikito
|
b44aad0798
|
Uses SpendingProposal.filter_params in admin/sp controller
|
2016-03-14 18:23:10 +01:00 |
|
Juanjo Bazán
|
c09e6f95d7
|
users can now delete their own spending proposals
via the 'my activity' page
|
2016-03-14 12:53:00 +01:00 |
|
Juanjo Bazán
|
32c155999e
|
adds radio to mark feasibility as undefined (nil)
|
2016-03-09 12:37:22 +01:00 |
|
kikito
|
5151e868f5
|
Merge branch 'master' into valuator-tags
|
2016-03-08 17:19:15 +01:00 |
|
Juanjo Bazán
|
dd65f89597
|
adds validation for price fields
|
2016-03-08 16:24:34 +01:00 |
|
kikito
|
2ac12ef4a9
|
makes admin/spending_proposal/edit visually pleasant
|
2016-03-08 15:26:13 +01:00 |
|
rgarcia
|
e586a1df58
|
fixes conflicts with master
|
2016-03-08 14:31:18 +01:00 |
|
rgarcia
|
cd8cbef389
|
adds filtering of tags for spending proposals
|
2016-03-08 13:57:58 +01:00 |
|
Juanjo Bazán
|
09bb3a1386
|
changes valuation interface to show only assigned
Valuators can only see their assigned spending proposals
Admins can see/edit all but index only shows their assigned items
Removed filter by_valuator
|
2016-03-08 13:32:34 +01:00 |
|
rgarcia
|
57386349a2
|
removes unused code
|
2016-03-08 13:00:57 +01:00 |
|
rgarcia
|
389b89970f
|
adds valuators to spending proposals
Conflicts:
app/views/admin/spending_proposals/show.html.erb
|
2016-03-08 12:42:08 +01:00 |
|
rgarcia
|
07b99bb017
|
adds administrator to spending proposal
|
2016-03-08 12:40:46 +01:00 |
|
rgarcia
|
951505ce7d
|
admins can tag spending proposals
|
2016-03-08 12:40:35 +01:00 |
|
Juanjo Bazán
|
fcd6d0ce8b
|
adds dossier edition to valuators
|
2016-03-08 11:35:04 +01:00 |
|
Juanjo Bazán
|
b3486ede8b
|
adds valuation's spending proposal show
|
2016-03-04 20:43:30 +01:00 |
|
Juanjo Bazán
|
ac9eaec9d9
|
adds spending proposals index to valuation
filters included: valuation_open, valuating, valuation_finished
search by geozone & by valuator
|
2016-03-04 20:19:43 +01:00 |
|
Juanjo Bazán
|
0160ed816c
|
adds valuation namespace
|
2016-03-04 20:19:42 +01:00 |
|
Juanjo Bazán
|
23c6a04179
|
removes highlights
|
2016-03-04 18:46:27 +01:00 |
|
Juanjo Bazán
|
fb5e2beb54
|
adds new filters to admin valuations
|
2016-03-03 19:02:13 +01:00 |
|
Raimond Garcia
|
2a4adc2e60
|
Merge pull request #817 from microweb10/friendly_urls
Friendly urls
|
2016-03-02 17:51:00 +01:00 |
|
rgarcia
|
ec25b388c7
|
adds filtering of spending proposals by admin
|
2016-03-01 20:10:57 +01:00 |
|
rgarcia
|
b38558f2f3
|
adds index and create of valuators
|
2016-03-01 20:10:52 +01:00 |
|
Juanjo Bazán
|
87662b3873
|
makes sure no blank redeemable codes are db stored
|
2016-02-26 17:55:34 +01:00 |
|