Commit Graph

4173 Commits

Author SHA1 Message Date
Juanjo Bazán
17a679b01f Merge pull request #1047 from consul/hide_not_pending_sps_in_valuation
hides the not-pending sps in valuation
2016-04-07 12:53:01 +02:00
kikito
3e8150ceae hides the not-pending sps in valuation 2016-04-07 12:16:11 +02:00
Juanjo Bazán
a2b229cb7c Merge pull request #1046 from consul/valuator-extra-links
Valuator extra links
2016-04-07 11:07:21 +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
Raimond Garcia
25c9afb14c Merge pull request #1045 from consul/print-management
Management: print spending proposals
2016-04-06 19:59:18 +02:00
kikito
9a74b79eab Fixes typo in rake task. Adds comment. 2016-04-06 19:27:39 +02:00
kikito
95b0e75427 Rename method 2016-04-06 19:27:18 +02:00
Juanjo Bazán
58fb6e68ea cleans up routes: use blocks only when necessary 2016-04-06 19:25:27 +02:00
kikito
32a60515c6 updates the sp responsible_name when creating/editing a sp 2016-04-06 19:23:05 +02:00
kikito
3c8416e863 Adds responsible_name to spending_proposals 2016-04-06 19:18:10 +02:00
Juanjo Bazán
1d931e7943 removes unnecessary :js 2016-04-06 19:05:00 +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
Juanjo Bazán
fc5f5eec8b changes default order in management sps to votes 2016-04-06 18:45:58 +02:00
Raimond Garcia
1bfed9e397 Merge pull request #1043 from consul/managers-sps
Management spending proposals
2016-04-06 14:55:26 +02:00
Alberto Garcia Cabeza
4faf6f1819 Improves styles for admin menu icons 2016-04-06 13:10:55 +02:00
Alberto Garcia Cabeza
5d22ea2daf Improves layout for management spending proposals 2016-04-06 13:07:26 +02:00
Juanjo Bazán
9c6813b23c changes i18n for spending proposals in management 2016-04-06 12:40:19 +02:00
Juanjo Bazán
c71d09d3df adds verified and level 2 users to dev_seeds 2016-04-06 12:29:50 +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
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