Juanjo Bazán
d057c9457d
Merge branch 'master' into signature-sheets
2016-12-23 20:23:56 +01:00
Alberto Miedes Garcés
d83c370c6a
Remove duplicated code in Admin::BannersController
2016-12-22 17:18:27 +01:00
rgarcia
675081141c
refactors signatures
2016-12-21 18:46:31 +01:00
rgarcia
4eb700e3d4
refactors signature sheets
2016-12-20 16:46:08 +01:00
rgarcia
3c682b8a9b
adds signature sheets
2016-12-20 12:21:05 +01:00
Alberto Miedes Garcés
c22a80b48f
Move geozone 'safe to destroy' check from controller to model
2016-12-13 12:30:47 +01:00
Alberto Miedes Garcés
60da2a875b
CRUD html_map_coordinates geozone attribute
2016-12-08 16:50:36 +01:00
Alberto Miedes Garcés
6b53020185
Show districts ordered by name
2016-12-08 13:47:23 +01:00
Alberto Miedes Garcés
93e79228a7
Ability to delete geozones from admin dashboard
2016-12-08 13:16:42 +01:00
Alberto Miedes Garcés
fea2009396
Ability to edit geozones from admin dashboard
2016-12-07 22:08:22 +01:00
Alberto Miedes Garcés
323c1b7593
Fixed layout for Admin::GeozonesController
2016-12-07 19:19:24 +01:00
Alberto Miedes Garcés
6175990533
Admin geozones: index, create
...
Modified Geozone factory and seeds to be more complete
2016-12-04 21:19:36 +01:00
rgarcia
bb3c4c6399
adds consistency to ruby code style
...
Keep a blank line before and after private
Keep a blank line before and after protected
Remove extra empty line at class body end
Remove extra blank line
Add final newline
Use 2 (not 3) spaces for indentation
Use 2 (not 4) spaces for indentation
Remove space before comma
Add space after comma
Remove trailing whitespaces
Remove unnecessary spacing
Use snake_case for variable names
Do not use then for multi-line if
Remove unused block argument - i
Use the new Ruby 1.9 hash syntax
Remove unused assignment to variable
Indent when as deep as case
Align attributes
Align end with def
2016-11-15 11:18:43 +01:00
rgarcia
3c2098eb14
improves legibility of counts
2016-06-16 18:40:05 +02:00
rgarcia
b7e3129ec1
uses more efficient count
2016-06-16 18:35:34 +02:00
rgarcia
0abc9c8376
adds stats for direct messages and proposal notifications
2016-06-16 17:42:16 +02:00
Alberto Garcia Cabeza
7c65a6ee1a
Merge branch 'add_banners_admin' of https://github.com/MaiteHdezRivas/consul into MaiteHdezRivas-add_banners_admin
2016-05-23 12:14:52 +02:00
Juanjo Bazán
65335d1344
optimizes stat query
2016-05-20 11:05:10 +02:00
MaiteHdezRivas
3b2bfc46cf
Admin option to add banners and show banners
2016-05-19 13:18:30 +02:00
Juanjo Bazán
c4bf90f576
adds managers section to admin
2016-05-11 11:24:38 +02:00
rgarcia
aaca99b46f
orders valuators by spending proposal count
2016-04-26 23:33:19 +02:00
rgarcia
4bbd3d7233
adds summary of spending proposals by valuator
2016-04-26 22:06:02 +02:00
rgarcia
64bab02a7c
adds more explicit order for admin summary
2016-04-26 18:56:59 +02:00
rgarcia
4b751d513f
orders admin summary by geozone
2016-04-26 18:26:41 +02:00
rgarcia
d51fe779e2
displays summary info for supported spending proposals
2016-04-26 15:13:53 +02:00
rgarcia
ab1216af3d
adds more info to admin summary for spending proposals
2016-04-26 14:47:44 +02:00
Juanjo Bazán
d69d752f58
Merge pull request #1089 from consul/admin-sp-errors-on-update
...
displays error on failed update
2016-04-26 11:22:27 +02:00
rgarcia
23e325896f
displays error on failed update
2016-04-26 11:12:07 +02:00
Juanjo Bazán
1c92ac4089
adds new filter 'All' to admin sps index
2016-04-26 10:20:07 +02:00
kikito
6e8a310ee1
Sorts spending proposals by votes and creation in admin
2016-04-25 18:33:18 +02:00
Juanjo Bazán
32f971f0ad
Merge pull request #1084 from consul/spending-proposals-summary
...
Spending proposals admin summary
2016-04-25 11:29:07 +02:00
rgarcia
de84480788
adds admin summary page for spending proposals
2016-04-22 15:03:46 +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
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
