consul/nairobi
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
4,003 Commits 1 Branch 0 Tags
19b5887f548dd38e448b6b1caebd17a4fd19d32c
Commit Graph

4003 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Juanjo Bazán
cb05231794 adds index/show/voting to management for sps 2016-04-06 12:05:43 +02:00
Alberto Garcia Cabeza
b4c6e2f160 Removes unused keys 2016-04-06 11:09:24 +02:00
Juanjo Bazán
3c37575f88 adds management spending proposals index to routes 2016-04-06 11:04:22 +02:00
Juanjo Bazán
48c3cc580c adds namespaced helper for spending_proposal route 2016-04-06 11:04:22 +02:00
Alberto Garcia Cabeza
e9bc6ff75f Improves layout for featured debates 2016-04-05 14:14:04 +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
Bertocq
7bcb6695fa Simplify the user verification code for console 2016-04-05 13:58:29 +02:00
Bertocq
37b7d75675 Add OAuth paragraph, translated from spanish version 2016-04-05 13:49:02 +02:00
Bertocq
968f08a18b Improve README with info to use and verify the default admin user 2016-04-05 13:49:02 +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
Alberto Garcia Cabeza
d76f1907cc Fixes typo 2016-04-05 10:19:58 +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
Raimond Garcia
a7d69336da Merge pull request #1035 from consul/show_sp_ids 
Show sp ids
 2016-04-04 19:08:10 +02:00
rgarcia
53502039dc adds specs for spending proposal code 2016-04-04 18:49:46 +02:00
rgarcia
4c52390608 removes unused spec 2016-04-04 18:49:29 +02:00
Alberto Garcia Cabeza
ca99b2b529 Removes code on index, changes styles on show 2016-04-04 18:35:28 +02:00
Alberto Garcia Cabeza
6e89a21786 Fixes commentable i18n 2016-04-04 18:26:07 +02:00
kikito
871fc6e3be shows the sp ids in index/show 2016-04-04 18:16:54 +02:00
kikito
e53de93bee removes the prefix from spending_proposal_code 2016-04-04 18:16:27 +02:00
Raimond Garcia
562e768a46 Merge pull request #1033 from consul/i18n-issues 
fixes i18n calls
 2016-04-04 15:48:46 +02:00
Raimond Garcia
4cd70f86e0 Merge pull request #1031 from consul/spending_proposals_code 
changes the format of the Spending proposal code
 2016-04-04 15:38:37 +02:00
rgarcia
27986c05c6 fixes typo 2016-04-04 15:37:55 +02:00
kikito
dea67a36ca fixes failing email spec 2016-04-04 14:56:16 +02:00
Juanjo Bazán
1e35169694 fixes i18n calls 2016-04-04 14:43:49 +02:00
Enrique García
330a08f2b1 Merge pull request #1032 from consul/fixes-specs 
udpates translation keys
 2016-04-04 14:43:03 +02:00
rgarcia
545e0a3d0e udpates translation keys 2016-04-04 14:41:43 +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
kikito
3eca6b31bd changes the format of the Spending proposal code 2016-04-04 14:14:10 +02:00
Juanjo Bazán
b443cdc038 adds missing local variable passing 2016-04-04 13:51:20 +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
Alberto Garcia Cabeza
a9f3781745 Merge branch 'Ana06-master' 2016-04-04 13:19:57 +02:00
Alberto Garcia Cabeza
115868d207 Fixes issue in i18n 2016-04-04 13:19:15 +02:00
Alberto Garcia Cabeza
3ceee75850 Adds share buttons on spending proposals show 2016-04-04 13:18:20 +02:00
Juanjo Bazán
4f4c42da54 Merge pull request #1029 from consul/share-spending-proposal 
Adds share buttons on spending proposals show
 2016-04-04 11:36:09 +02:00
Alberto Garcia Cabeza
ad003500fa Adds share buttons on spending proposals show 2016-04-04 11:26:17 +02:00
Ana
d16ea0dfaa Translation problem fixed 2016-04-04 00:29:25 +02:00
Juanjo Bazán
0c524a0733 updates dependencies 2016-04-02 21:48:22 +02:00
Enrique García
7790ef9df3 Merge pull request #1025 from consul/investment-project-share 
Improves styles for investment project share
 2016-03-31 11:12:13 +02:00
Alberto Garcia Cabeza
cb4ea3f540 Improves styles for investment project share 2016-03-31 10:53:21 +02:00
Enrique García
dc7fdc2b26 Merge pull request #1024 from consul/polishing-index 
adds voting to spending proposals index
 2016-03-30 19:14:04 +02:00
Juanjo Bazán
dc8cd13230 adds geozone info to spending proposals in index 2016-03-30 18:53:22 +02:00
Juanjo Bazán
c536a12e3d adds voting to spending proposals index 2016-03-30 18:47:40 +02:00
Enrique García
b3ed70dbbc Merge pull request #1023 from consul/index 
adds geozone and unfeasible filters to spending proposals index
 2016-03-30 15:28:09 +02:00
Juanjo Bazán
4fad283947 adds geozone and unfeasible filters to index 2016-03-30 14:04:01 +02:00
Juanjo Bazán
3b9da7b463 Merge pull request #1022 from consul/design-investment-project 
Improves styles for spending proposals show
 2016-03-30 13:32:16 +02:00