consul/nairobi
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
3,434 Commits 1 Branch 0 Tags
f079bdac8a00a6c608d3c239e8b1496afaf42df2
Commit Graph

1215 Commits

Author SHA1 Message Date
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
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
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
Juanjo Bazán
1e8204e676 adds support for spending proposals to mgmt menu 2016-04-06 12:06:07 +02:00
Juanjo Bazán
cb05231794 adds index/show/voting to management for sps 2016-04-06 12:05:43 +02:00
kikito
55b7617ef0 fixes misspelled url when sharing sps via whatsapp 2016-04-05 12:50:10 +02:00
Enrique García
2d59e4739d Merge pull request #1038 from consul/embed-video 
Moves and makes bigger embed video on proposals
 2016-04-05 12:08:02 +02:00
Alberto García Cabeza
a2eb983791 Merge pull request #1037 from bertocq/master 
Hashtag al compartir en redes sociales #65 @AyuntamientoMadrid/consul
 2016-04-05 11:31:04 +02:00
Alberto Garcia Cabeza
5bef2f193c Moves and makes bigger embed video on proposals 2016-04-05 11:27:20 +02:00
Juanjo Bazán
3ea9cb9cba Merge pull request #1036 from consul/management-header 
Fixes header for management section
 2016-04-04 21:01:03 +02:00
Bertocq
f18a1778ff Hashtag al compartir en redes sociales #65 @AyuntamientoMadrid/consul 2016-04-04 20:56:29 +02:00
Alberto Garcia Cabeza
be844b1ad6 Fixes header for management section 2016-04-04 20:50:15 +02:00
rgarcia
53502039dc adds specs for spending proposal code 2016-04-04 18:49:46 +02:00
Alberto Garcia Cabeza
ca99b2b529 Removes code on index, changes styles on show 2016-04-04 18:35:28 +02:00
kikito
871fc6e3be shows the sp ids in index/show 2016-04-04 18:16:54 +02:00
Raimond Garcia
b62aea431c Merge pull request #1030 from consul/vote_url 
adds missing local variable passing
 2016-04-04 14:30:49 +02:00
Juanjo Bazán
b443cdc038 adds missing local variable passing 2016-04-04 13:51:20 +02:00