Commit Graph

5383 Commits

Author SHA1 Message Date
rgarcia
8bce72bea3 displays correct admin info for proposals with supports 2016-04-26 17:37:21 +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
Alberto Garcia Cabeza
7320d17bea Moves back links inside a partial 2016-04-26 13:04:57 +02:00
Juanjo Bazán
907737d5fa Merge pull request #1087 from consul/spending_proposal_admin_ui
Spending proposal admin ui
2016-04-25 18:50:03 +02:00
kikito
73ffd3e189 adds feasibility column to sp admin 2016-04-25 18:35:28 +02:00
Juanjo Bazán
66dd511979 Merge pull request #1041 from consul/select-featured-debates
Select featured debates
2016-04-25 18:19:40 +02:00
Juanjo Bazán
11208ebb05 removes unused css class 2016-04-25 18:12:40 +02:00
Juanjo Bazán
479b48796f Merge pull request #1085 from consul/retire-proposals
Retire proposals
2016-04-25 18:00:34 +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
Alberto Garcia Cabeza
a45e112e65 Adds styles to admin spending proposals summary 2016-04-25 11:12:52 +02:00
Alberto Garcia Cabeza
f079bdac8a Improves styles for retire proposals 2016-04-23 13:28:43 +02:00
Juanjo Bazán
5b4a7b8cf8 adds link to explanation 2016-04-23 13:24:15 +02:00
Juanjo Bazán
ed0a4a8525 adds links to filter retired proposals by reason 2016-04-23 13:24:15 +02:00
Juanjo Bazán
d63cf8b392 removes retired proposals from default index
adds a sidebar link to retired proposals list
2016-04-23 13:24:15 +02:00
Juanjo Bazán
58a5e2a283 authors can retire proposals now 2016-04-23 13:24:15 +02:00
Juanjo Bazán
a8bc3095b4 improves activity styles 2016-04-23 13:24:15 +02:00
Juanjo Bazán
e3bbce5bd4 fixes wrong i18n key 2016-04-23 13:23:47 +02:00
rgarcia
13f65b6b71 cleans up 2016-04-22 15:03:50 +02:00
rgarcia
de84480788 adds admin summary page for spending proposals 2016-04-22 15:03:46 +02:00
Alberto Garcia Cabeza
08a17f3b0e Makes generic logos and avatars, and removes unused images 2016-04-21 14:05:30 +02:00
Alberto Garcia Cabeza
a636ddeb83 Removes test page 2016-04-21 14:03:42 +02:00
Juanjo Bazán
f3aafcb29e Merge pull request #1080 from consul/collapse-comments
Collapse comments
2016-04-20 17:49:09 +02:00
Alberto Garcia Cabeza
e3878ff437 Fixes icon animation on reply comments 2016-04-20 17:27: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
Alberto Garcia Cabeza
4a013a65bc Fixes subnavigation layout 2016-04-19 23:45:03 +02:00
rgarcia
0648c7f38d removes duplicate graphs 2016-04-19 20:26:14 +02:00
Juanjo Bazán
59e2c8a122 Merge pull request #1072 from consul/oauth-signup-fix
Oauth signup fix
2016-04-19 16:01:00 +02:00
kikito
3637c95fe2 adds note to finish_signup 2016-04-19 13:33:17 +02:00
Juanjo Bazán
87d2d74f66 updates devise & ahoy 2016-04-19 13:27:16 +02:00
Juanjo Bazán
038a520987 updates dependencies and specs 2016-04-19 13:05:08 +02:00
Juanjo Bazán
856f226937 Merge pull request #1066 from consul/international-phone
Adds label and placeholder for international numbers verification
2016-04-19 10:46:00 +02:00
Juanjo Bazán
c939339020 shows voting button for sps only if voting allowed 2016-04-18 12:04:50 +02:00
Juanjo Bazán
e6a9cb4fcc disable voting on sps if setting disabled
refactors hover messages on sps votes
2016-04-15 23:01:00 +02:00
Alberto Garcia Cabeza
7d32f2a4b0 Adds label and placeholder for international numbers verification 2016-04-15 13:09:54 +02:00
Alberto Garcia Cabeza
e55a4c9f23 Renters videos on proposals show 2016-04-14 16:38:39 +02:00
kikito
64ec5290b9 Adds a new edit link to spending proposals/show and moves the others down 2016-04-13 13:55:59 +02:00
kikito
d794c1b79d Adds fields to admin/spendingproposals/edit view & controller 2016-04-13 13:54:57 +02:00
rgarcia
eb78f01fb2 improves valuator select layout 2016-04-12 17:21:50 +02:00
rgarcia
bcc687d947 adds filtering of spending proposals by valuator 2016-04-12 17:17:02 +02:00
Juanjo Bazán
473cca418d updates management's dashboard index 2016-04-08 11:47:56 +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
e4e87bf548 moves user deletion link to a partial 2016-04-08 11:39:33 +02:00
Juanjo Bazán
ce477273da adds managers option to delete a level 2 account 2016-04-08 11:03:30 +02:00
Alberto Garcia Cabeza
a887b78787 Improves styles for valuation geozones select menu 2016-04-07 10:52:43 +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
Alberto Garcia Cabeza
5d22ea2daf Improves layout for management spending proposals 2016-04-06 13:07:26 +02:00