Commit Graph

20144 Commits

Author SHA1 Message Date
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
nachogomez
326dd04ae7 merge with master 2016-01-14 13:03:48 +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
rgarcia
7dcbf11860 adds missing translation 2016-01-13 19:31:13 +01:00
rgarcia
44677c0ec2 fixes specs 2016-01-13 19:25:49 +01:00
rgarcia
92de6546b7 removes obsolete order select 2016-01-13 19:25:49 +01:00
rgarcia
c68c2b9f1d maintains search criteria 2016-01-13 19:25:49 +01:00
rgarcia
afca5c2b90 refactors javascript 2016-01-13 19:25:48 +01:00
rgarcia
9ff3b1dd2f removes duplicate search form partial 2016-01-13 19:25:48 +01:00
rgarcia
33cfd92b09 adds naming consistency 2016-01-13 19:25:48 +01:00
rgarcia
66b704b3b9 refactors filterable concern 2016-01-13 19:25:48 +01:00
rgarcia
0cfddca432 uses scopes 2016-01-13 19:25:48 +01:00
rgarcia
d147cec929 moves filters to a concern 2016-01-13 19:25:48 +01:00
rgarcia
4c27e66bb2 adds integration specs 2016-01-13 19:25:48 +01:00
Ana
0993a6ec1a Error corrected 2016-01-13 19:25:47 +01:00
Ana
7d3dff3222 Translation changed 2016-01-13 19:25:47 +01:00
Ana
7635c5978b debates.index.search_form replaced by i18n_namespace 2016-01-13 19:25:47 +01:00
Ana
d3f9920e28 Advanced search corrections 2016-01-13 19:25:47 +01:00
Ana
48d6a76491 Advanced search added to debates 2016-01-13 19:25:47 +01:00
Ana
a7b70f50e2 Advanced search - author type finished 2016-01-13 19:25:46 +01:00
Ana
258416de19 Advanced search translated 2016-01-13 19:25:46 +01:00
Ana
b6472f6492 Advanced search moved to locales files 2016-01-13 19:25:46 +01:00
Ana
4d3e3f2e09 Advanced search - except author type 2016-01-13 19:25:46 +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
nachogomez
bcfe50b41e Add Thematic structure and Districts - Iss685 - 12 january 2016 2016-01-13 12:11:33 +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