Commit Graph

2672 Commits

Author SHA1 Message Date
Josep Jaume Rey Peroy
ba74542c3d Parameterize social links 2016-01-18 12:43:36 +01:00
Josep Jaume Rey Peroy
5de3d700e4 Simplify Settings API 2016-01-18 12:43:34 +01:00
Raimond Garcia
89ece16fe8 Merge pull request #829 from consul/normalize-i18n-keys
normalizes i18n keys
2016-01-16 19:28:35 +01:00
Juanjo Bazán
8fc76ef67a normalizes i18n keys 2016-01-16 18:40:24 +01:00
Juanjo Bazán
d175f11f13 Merge pull request #826 from consul/design_spending_proposals
Design spending proposals
2016-01-15 11:25:27 +01:00
Juanjo Bazán
d36ee4cdaf changes text 2016-01-15 11:18:00 +01:00
Juanjo Bazán
167911e427 Merge branch 'pardoam-five_last_week' 2016-01-15 11:11:54 +01:00
Juanjo Bazán
d31c846a1f cleans format 2016-01-15 11:10:58 +01:00
Juanjo Bazán
0c6e21aa59 Merge branch 'five_last_week' of https://github.com/pardoam/participacion into pardoam-five_last_week 2016-01-15 10:55:24 +01:00
Juanjo Bazán
347aaf416b Merge pull request #827 from atd/issue-793
Adds Tolk gem for i18n web interface
2016-01-14 15:04:31 +01:00
Antonio Tapiador del Dujo
9610a6a933 Adds Tolk gem for i18n web interface
Closes #793
2016-01-14 14:57:06 +01:00
Alberto Garcia Cabeza
933fa75a3b Changes icon and text for spending proposals 2016-01-14 14:20:07 +01:00
MaiteHdezRivas
b3ee6d4921 adds specs 2016-01-14 13:12:34 +01:00
Alberto Garcia Cabeza
7a907d5e23 Updates icons font 2016-01-14 13:11:40 +01:00
Juanjo Bazán
ed008f1b28 Merge pull request #825 from consul/auth_footer
Improves auth pages footer
2016-01-14 11:34:11 +01:00
Alberto Garcia Cabeza
8df8a21ed3 Changes checkbox font size 2016-01-14 11:24:27 +01:00
Alberto Garcia Cabeza
3164fe7be1 Improves layout and footer for auth pages 2016-01-14 11:18:04 +01:00
Raimond Garcia
0a6639834d Merge pull request #823 from consul/featured_and_filters
Featured and filters
2016-01-13 20:20:53 +01:00
Enrique García
15ce538ea2 Merge pull request #821 from consul/spending_proposals
Spending proposals
2016-01-13 17:17:31 +01:00
Juanjo Bazán
0c6aa3d59c Merge pull request #824 from consul/spending_proposals_cancancan
Uses Abilities instead of exceptions in the proposals controller
2016-01-13 17:08:59 +01:00
kikito
e014b3ad83 fixes failing specs 2016-01-13 16:58:17 +01:00
kikito
ae6d70b1c1 Uses Abilities instead of exceptions in the proposals controller 2016-01-13 16:32:10 +01:00
Juanjo Bazán
56c2348998 updates dependencies 2016-01-13 16:24:46 +01:00
Alberto Garcia Cabeza
f1844411c4 Adds title to notifications page 2016-01-13 16:24:46 +01:00
Alberto Garcia Cabeza
e5dff0552d Fixes styles for filters on admin pages 2016-01-13 16:24:46 +01:00
Juanjo Bazán
1ab0b31d4b only level 2 users can create spending proposals 2016-01-13 13:35:21 +01:00
Juanjo Bazán
e4dc496b89 adds geozone_select_options helper method 2016-01-13 13:07:03 +01:00
Juanjo Bazán
9a31795615 removes default scope from Geozone 2016-01-13 13:06:20 +01:00
Juanjo Bazán
eb4c352f7d removes before_action in favor of cancancan 2016-01-13 12:56:27 +01:00
Alberto Garcia Cabeza
0f5237b52f Removes unused code for filters 2016-01-12 18:38:31 +01:00
Alberto Garcia Cabeza
6dff64a920 Improves styles for featured proposals 2016-01-12 17:50:18 +01:00
Alberto Garcia Cabeza
a219b909b3 Removes unused styles for filters 2016-01-12 15:52:02 +01:00
Alberto Garcia Cabeza
edc20e9a0c Improves styles for featured debates 2016-01-12 15:51:13 +01:00
Juanjo Bazán
e165f1de9f updates dependencies 2016-01-12 13:32:43 +01:00
Juanjo Bazán
e5caf84c02 adds show view in admin for spending proposals 2016-01-11 14:25:33 +01:00
Raimond Garcia
5ee8111143 Merge pull request #820 from consul/design_filters
Design filters
2016-01-11 14:18:57 +01:00
Juanjo Bazán
abe5085040 adds geozone info to admin spending proposal index 2016-01-11 14:04:41 +01:00
Juanjo Bazán
aee9a9d7c0 adds geozone helper 2016-01-11 14:01:50 +01:00
Alberto Garcia Cabeza
f03558fff3 Adds title to notifications page 2016-01-11 13:58:04 +01:00
Alberto Garcia Cabeza
51e44357ff Fixes styles for filters on admin pages 2016-01-11 13:51:29 +01:00
Juanjo Bazán
0510d211b3 adds spending resolutions to dev_seeds 2016-01-11 13:45:15 +01:00
Juanjo Bazán
3f05864a16 adds spending proposals to admin 2016-01-11 13:45:10 +01:00
Juanjo Bazán
7c92a92537 adds resolution query methods 2016-01-11 12:53:05 +01:00
Juanjo Bazán
9a8dcd660f adds resolution scopes 2016-01-11 12:18:46 +01:00
Juanjo Bazán
facf6183d7 adds resolution to spending proposals 2016-01-11 12:18:45 +01:00
Juanjo Bazán
b3677fc044 fixes typo 2016-01-11 12:18:23 +01:00
Juanjo Bazán
7b9285f93f defaults to order geozones by name 2016-01-11 12:18:23 +01:00
Juanjo Bazán
af0ef726fb includes geozones in dev_seeds 2016-01-11 12:18:23 +01:00
Juanjo Bazán
bc8c14e4a1 adds geozone to spending_proposals 2016-01-11 12:18:23 +01:00
Juanjo Bazán
8aebfecae0 removes tags from spending proposals 2016-01-11 12:18:01 +01:00