Commit Graph

312 Commits

Author SHA1 Message Date
Alberto Garcia Cabeza
3752f3a53b Adds foundation 6 🎉 2016-02-26 19:33:33 +01:00
kikito
81b5ae7089 Implements /cuentasegura 2016-02-22 13:40:49 +01:00
kikito
cc17986745 changes welcome screen to stress verification and demote view proposals 2016-02-22 11:03:56 +01:00
rgarcia
7699b99655 allows authors and admins to view their spending proposals in my activity 2016-02-21 18:02:55 +01:00
rgarcia
e924736932 updates form label for association name 2016-02-20 20:20:38 +01:00
rgarcia
d68ed5228c adds association name to spending proposals 2016-02-20 19:21:30 +01:00
rgarcia
f82a590e1e reverts debate links 2016-02-19 19:08:35 +01:00
Alberto Garcia Cabeza
b81b560bd6 Deletes top debates link 2016-02-17 14:40:52 +01:00
Alberto Garcia Cabeza
ee5e20a0b6 Adds new links on popular section 2016-02-16 19:21:12 +01:00
Alberto Garcia Cabeza
1158e764ca Adds styles to proposals summary 2016-02-16 13:04:40 +01:00
Enrique García
be8f6da9ea Merge pull request #892 from consul/public-stats
Public stats
2016-02-15 13:34:00 +01:00
Juanjo Bazán
28bdd6b426 Merge pull request #875 from palomahnhp/inform_users_in_vote_comments
show link to sign in for no connect users
2016-02-11 17:28:17 +01:00
Juanjo Bazán
16db3f8537 adds minimal public stats 2016-02-08 14:12:37 +01:00
palomahnhp
2ee90ac76e share links to debate 2016-02-08 10:32:57 +01:00
rgarcia
eb04266772 removes unused translations 2016-02-05 13:08:49 +01:00
rgarcia
a5f7211d82 corrects error translations keys 2016-02-05 12:54:21 +01:00
palomahnhp
837da1b6b2 show link to sign in for no connect users 2016-02-04 10:40:13 +01:00
rgarcia
41cdf6cec2 organizes translations according to view structure 2016-02-03 19:57:42 +01:00
Juanjo Bazán
eda2c419f7 fixes typo in es locale 2016-02-03 11:39:16 +01:00
Maite
8f1431ec3f corrections about coding style 2016-02-01 17:11:29 +01:00
MaiteHdezRivas
5dd4633d6a Merge branch 'suggest_before_creating'
Conflicts:
	app/assets/javascripts/application.js
	app/controllers/debates_controller.rb
	app/controllers/proposals_controller.rb
	config/locales/es.yml
	config/routes.rb
	db/schema.rb
	spec/features/debates_spec.rb
	spec/features/proposals_spec.rb
2016-01-27 13:11:23 +01:00
MaiteHdezRivas
7406904c51 adding suggest with coffescript 2016-01-27 12:32:44 +01:00
kikito
248bff712c fixes failing i18n specs
Eliminates registering_with_oauth attr_accessor

ELIMINATE

Conflicts:
	app/views/users/registrations/finish_signup.html.erb

improves devise confirmation message

improves devise omniauth confirmation message

improves devise omniauth confirmation message

do not use nils on finish_signup fields

Fixes auth specs after changing the i18n
2016-01-26 18:15:36 +01:00
kikito
c6c01fc9f2 Adds 'registering_with_oauth' boolean to users
Conflicts:
	db/schema.rb

Changes title in finish_signup page

Conflicts:
	config/locales/en.yml
	config/locales/es.yml
2016-01-26 18:11:04 +01:00
Alberto Garcia Cabeza
e3ad813b4f Improves styles for districts map page 2016-01-26 13:28:33 +01:00
rgarcia
df04992405 adds translations 2016-01-25 22:28:46 +01:00
rgarcia
a86f6bc5b7 fixes conflicts with master 2016-01-25 22:28:46 +01:00
Perisso
93d794c089 change locales 2016-01-25 22:28:17 +01:00
Perisso
7d1d4cea4a filter by districts and categories 2016-01-25 22:28:17 +01:00
Juanjo Bazán
9c7e2b83dd Merge pull request #843 from consul/search-dates
Advanced search - datepicker
2016-01-20 17:01:28 +01:00
Alberto Garcia Cabeza
ffbbdb3358 Adds custom styles for date picker 2016-01-20 15:57:14 +01:00
Juanjo Bazán
34456320e1 adds spending proposals to Management 2016-01-20 13:08:54 +01:00
Juanjo Bazán
09b53a3d0a Merge pull request #822 from consul/advanced-search
Advanced search
2016-01-18 15:17:17 +01:00
Josep Jaume Rey Peroy
ba74542c3d Parameterize social links 2016-01-18 12:43:36 +01:00
Alberto Garcia Cabeza
8ef74f1e11 Merges master branch 2016-01-18 11:33:49 +01:00
rgarcia
609feb0116 fixes specs 2016-01-16 22:18:46 +01:00
rgarcia
44769d96f4 adds comprehensive specs for author type and date range searches 2016-01-16 21:45:59 +01:00
Juanjo Bazán
8fc76ef67a normalizes i18n keys 2016-01-16 18:40:24 +01:00
Alberto Garcia Cabeza
933fa75a3b Changes icon and text for spending proposals 2016-01-14 14:20:07 +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
Ana
7d3dff3222 Translation changed 2016-01-13 19:25:47 +01:00
Ana
48d6a76491 Advanced search added to debates 2016-01-13 19:25:47 +01:00
Ana
b6472f6492 Advanced search moved to locales files 2016-01-13 19:25:46 +01:00
Alberto Garcia Cabeza
f1844411c4 Adds title to notifications page 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
Alberto Garcia Cabeza
edc20e9a0c Improves styles for featured debates 2016-01-12 15:51:13 +01:00
Juanjo Bazán
e5caf84c02 adds show view in admin for spending proposals 2016-01-11 14:25:33 +01:00
Alberto Garcia Cabeza
f03558fff3 Adds title to notifications page 2016-01-11 13:58:04 +01:00
Juanjo Bazán
bc8c14e4a1 adds geozone to spending_proposals 2016-01-11 12:18:23 +01:00