MaiteHdezRivas
|
f771a61a50
|
Refactoring method on debates controller
|
2016-04-21 11:13:58 +02:00 |
|
MaiteHdezRivas
|
3e7db9d1b5
|
Best practices code changes
|
2016-04-20 16:40:58 +02:00 |
|
palomahnhp
|
bf5d253e12
|
Merge branch 'master' into tracking_user_verifications_and_others
Conflicts:
app/controllers/admin/stats_controller.rb
db/dev_seeds.rb
|
2016-04-20 11:44:33 +02:00 |
|
palomahnhp
|
b4ec077f16
|
Merge remote-tracking branch 'origin/master' into tracking_user_verifications_and_others
Conflicts:
app/assets/javascripts/application.js
|
2016-04-20 11:28:06 +02:00 |
|
kikito
|
f86912c77c
|
Adapts to new User api
|
2016-04-19 13:33:16 +02:00 |
|
kikito
|
c2b205da89
|
Makes redirect in spending proposal go back to the full page after editing
|
2016-04-13 13:55:29 +02:00 |
|
kikito
|
d794c1b79d
|
Adds fields to admin/spendingproposals/edit view & controller
|
2016-04-13 13:54:57 +02:00 |
|
Juanjo Bazán
|
3087b2dac9
|
changes default order in valuation/sps to votes up
|
2016-04-11 16:12:03 +02:00 |
|
Juanjo Bazán
|
991b189610
|
refactors triplicated code
|
2016-04-08 12:16:09 +02:00 |
|
Juanjo Bazán
|
83e58f0cc9
|
adds account section to management
for now it only has the option to delete account
|
2016-04-08 11:43:26 +02:00 |
|
Juanjo Bazán
|
ce477273da
|
adds managers option to delete a level 2 account
|
2016-04-08 11:03:30 +02:00 |
|
kikito
|
3e8150ceae
|
hides the not-pending sps in valuation
|
2016-04-07 12:16:11 +02:00 |
|
kikito
|
d03864adb2
|
replaces the select in the valuators index with a list of links + pending count
|
2016-04-07 10:49:58 +02:00 |
|
Juanjo Bazán
|
785170213b
|
adds print page to management/spending_proposals
includes search and filtering by geozone
|
2016-04-06 19:04:03 +02:00 |
|
Juanjo Bazán
|
fc5f5eec8b
|
changes default order in management sps to votes
|
2016-04-06 18:45:58 +02:00 |
|
Juanjo Bazán
|
cb05231794
|
adds index/show/voting to management for sps
|
2016-04-06 12:05:43 +02:00 |
|
Alberto Garcia Cabeza
|
3fd8e76a79
|
Merge branch 'select_debates_which_display_as_featured' of https://github.com/MaiteHdezRivas/consul into MaiteHdezRivas-select_debates_which_display_as_featured
Conflicts:
db/schema.rb
|
2016-04-05 14:05:27 +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 |
|
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 |
|
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 |
|
MaiteHdezRivas
|
68f9a76cea
|
Mark debates as featured
|
2016-03-20 13:56:05 +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 |
|
palomahnhp
|
7d4936b577
|
track user verification and add statistics of verified users who did not vote proposals
|
2016-03-13 21:38:05 +01:00 |
|
Juanjo Bazán
|
32c155999e
|
adds radio to mark feasibility as undefined (nil)
|
2016-03-09 12:37:22 +01:00 |
|