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
|
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 |
|
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
|
4ddb778bed
|
refactors scopes and methods used only in admin
|
2016-03-29 14:12:19 +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 |
|
palomahnhp
|
7d4936b577
|
track user verification and add statistics of verified users who did not vote proposals
|
2016-03-13 21:38:05 +01:00 |
|
kikito
|
2ac12ef4a9
|
makes admin/spending_proposal/edit visually pleasant
|
2016-03-08 15:26:13 +01:00 |
|
rgarcia
|
cd8cbef389
|
adds filtering of tags for spending proposals
|
2016-03-08 13:57:58 +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
|
fb5e2beb54
|
adds new filters to admin valuations
|
2016-03-03 19:02:13 +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
|
9eea8fd4a9
|
adds valuation status filtering to admin
|
2016-02-26 11:45:29 +01:00 |
|
Juanjo Bazán
|
fa33859c58
|
fights a flaky test
|
2016-02-26 11:18:31 +01:00 |
|
Juanjo Bazán
|
43635f41b0
|
adds without_validators filter
|
2016-02-25 18:43:35 +01:00 |
|
Juanjo Bazán
|
0e1e0ce371
|
adds filters: by geozone and without_admin
|
2016-02-25 18:18:40 +01:00 |
|
Juanjo Bazán
|
77ee316ed8
|
adds assignment info to admin's valuations index
|
2016-02-25 14:44:11 +01:00 |
|
Juanjo Bazán
|
2cddad22d6
|
redux admin for spending proposals
adds dossier info
adds assignments to admin and valuators
|
2016-02-24 19:39:02 +01:00 |
|
Juanjo Bazán
|
00eec532a6
|
removes resolution status from spending proposals
|
2016-02-24 18:50:39 +01:00 |
|
inobcr
|
04bf7e7476
|
Ordenar admin/organizaciones por orden de llegada
|
2016-02-08 14:03:59 +01:00 |
|
Juanjo Bazán
|
7931ae914b
|
adds specific treatment for feature flags in admin
|
2016-01-25 14:52:57 +01:00 |
|
Josep Jaume Rey Peroy
|
57f5296e49
|
Feature flag spending proposals
|
2016-01-18 13:05:00 +01:00 |
|
Josep Jaume Rey Peroy
|
2d45828cad
|
Feature-flag debates
|
2016-01-18 13:05:00 +01:00 |
|
kikito
|
e014b3ad83
|
fixes failing specs
|
2016-01-13 16:58:17 +01:00 |
|
kikito
|
ae6d70b1c1
|
Uses Abilities instead of exceptions in the proposals controller
|
2016-01-13 16:32:10 +01:00 |
|
Juanjo Bazán
|
eb4c352f7d
|
removes before_action in favor of cancancan
|
2016-01-13 12:56:27 +01:00 |
|
Juanjo Bazán
|
e5caf84c02
|
adds show view in admin for spending proposals
|
2016-01-11 14:25:33 +01:00 |
|
Juanjo Bazán
|
3f05864a16
|
adds spending proposals to admin
|
2016-01-11 13:45:10 +01:00 |
|
rgarcia
|
adb1dd6f2b
|
fixes conflicts with master [#500]
|
2015-09-28 12:00:48 +02:00 |
|
rgarcia
|
86dd709c13
|
fixes conflicts with master [#500]
|
2015-09-28 11:51:26 +02:00 |
|
rgarcia
|
dc52271881
|
displays stats summary
|
2015-09-26 13:07:21 +02:00 |
|
Juanjo Bazán
|
0dc9224ce6
|
ignores in moderation the admin restored comments
|
2015-09-25 13:24:34 +02:00 |
|
Juanjo Bazán
|
13fc4e5a3d
|
ignores in moderation the admin restored debates
|
2015-09-25 13:24:22 +02:00 |
|
Juanjo Bazán
|
03342e164b
|
ignores in moderation the admin restored proposals
|
2015-09-25 13:24:12 +02:00 |
|
rgarcia
|
8c56e28cce
|
improves incomplete verification scope [#500]
|
2015-09-24 17:21:09 +02:00 |
|
rgarcia
|
3bfbdcaf01
|
adds search of unverified users [#500]
|
2015-09-24 17:21:08 +02:00 |
|
rgarcia
|
bc84b455d2
|
displays only unverified users [#500]
|
2015-09-24 17:21:08 +02:00 |
|
rgarcia
|
f42a6c9dd7
|
adds incomplete verification view [#500]
|
2015-09-24 17:21:08 +02:00 |
|
rgarcia
|
5d38b49c2b
|
adds incomplete verifications section [#500]
|
2015-09-24 17:21:07 +02:00 |
|
kikito
|
adc8275f5a
|
moves the admin api inside of the /admin namespace
|
2015-09-24 12:11:51 +02:00 |
|