Commit Graph

5383 Commits

Author SHA1 Message Date
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
rgarcia
a4ff3c6a6d displays categories and districts correctly capitalized 2016-02-19 18:21:45 +01:00
Juanjo Bazán
2b8d8a0ac3 Merge pull request #897 from Perisso/direct_link_comment#800
Direct link for e- mail response to a conversation
2016-02-18 10:39:54 +01:00
Perisso
731e7e81cf Direct link for e- mail response to a conversation 2016-02-18 10:08:52 +01:00
rgarcia
9a767caa27 avoids duplicate categories 2016-02-17 20:07:28 +01:00
rgarcia
d6e3cb5520 displays proposal summary instead of description 2016-02-17 19:52:45 +01:00
Alberto Garcia Cabeza
ca39fdfdb5 Changes path for proposals summary 2016-02-17 14:44:37 +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
Enrique García
399f83ebe3 Merge pull request #900 from consul/summary-polish
Summary polish
2016-02-16 17:39:47 +01:00
Enrique García
3eb53332ae Merge pull request #899 from consul/report-info-for-spending-proposals
Dossier info for spending proposals
2016-02-16 17:33:43 +01:00
rgarcia
f730d7f0d6 removes shadow effect in proposal description 2016-02-16 17:16:04 +01:00
rgarcia
f3de8892e8 removes link in proposal description 2016-02-16 17:15:26 +01:00
Juanjo Bazán
0ad56c4f51 adds dossier info to admin' spending proposal show 2016-02-16 14:26:30 +01:00
rgarcia
14ddeaaa2e displays sidebar in proposal summary page 2016-02-16 13:58:58 +01:00
rgarcia
42fdc52329 adds specs for proposal summary 2016-02-16 13:53:39 +01:00
Alberto Garcia Cabeza
1158e764ca Adds styles to proposals summary 2016-02-16 13:04:40 +01:00
rgarcia
6540092bcd displays the top 3 proposals for every category 2016-02-16 12:17:37 +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
403a3ab3f9 adds caching to proposals info fragment in index 2016-02-14 13:27:13 +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
3bd767e36f collapsable comments on proposals/debates 2016-02-10 19:27:15 +01:00
Juanjo Bazán
22e5ba344a adds id to children comments container 2016-02-09 20:59:27 +01:00
Juanjo Bazán
07c009e0de adds json view for basic stats 2016-02-08 18:05:30 +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
Enrique García
2bc272f8a4 Merge pull request #879 from consul/features-helper-refactor
refactors settings/flags helper
2016-02-04 18:07:11 +01:00
Juanjo Bazán
0325dd6199 refactors settings/flags helper to memoize values 2016-02-04 17:45:43 +01:00
Juanjo Bazán
9d693a3bd5 Merge pull request #877 from consul/stats-verified-users
differentiates between level 2 and level 3 users
2016-02-04 17:19:41 +01:00
rgarcia
3faadacc15 differentiates between level 2 and level 3 users 2016-02-04 13:38:56 +01:00
rgarcia
36aee45908 removes unused combined stats 2016-02-04 12:36:14 +01:00
palomahnhp
837da1b6b2 show link to sign in for no connect users 2016-02-04 10:40:13 +01:00
rgarcia
e4a49f802e removes duplication between debate and proposal suggestions 2016-02-03 19:57:37 +01:00
kikito
6ba1db1a02 includes a "cancel" option when logging in via omniauth
restores missing proposal in common_actions
2016-02-03 11:59:19 +01:00
Juanjo Bazán
543d760069 Merge pull request #867 from palomahnhp/improve_statistics
improved display of statistics
2016-02-02 09:56:47 +01:00
palomahnhp
f84265e7d8 improved display of statistics 2016-02-02 09:31:52 +01:00
Raimond Garcia
f1672180a8 Merge pull request #860 from MaiteHdezRivas/suggest_before_creating
Suggest before creating
2016-02-01 18:41:21 +01:00
Maite
8f1431ec3f corrections about coding style 2016-02-01 17:11:29 +01:00
Juanjo Bazán
75f03499bc fixes social media meta tags 2016-01-28 13:09:13 +01:00
rgarcia
48b5aba1c5 removes unused helper 2016-01-27 14:55:42 +01:00
rgarcia
5a3dc42dea removes tag count 2016-01-27 14:18:40 +01:00
rgarcia
5d4b6fae92 scopes tags by category or geozone 2016-01-27 14:15:12 +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
Juanjo Bazán
4b1430c9d6 Merge pull request #848 from consul/omniauth2
Omniauth2
2016-01-27 10:04:26 +01:00
Alberto Garcia Cabeza
fc857ea603 Adds styles for geozone on proposal show 2016-01-26 18:42:28 +01:00
rgarcia
4e7e0e3a7a makes geozone clickable in proposal show 2016-01-26 18:27:47 +01:00
kikito
9e0494a82d Activates omniauth functionality 2016-01-26 18:15:45 +01:00
kikito
d5eab64568 adds feature flags for omniauth login buttons/controls
Conflicts:
	app/controllers/users/omniauth_callbacks_controller.rb
	app/views/devise/_omniauth_form.html.erb
2016-01-26 18:15:39 +01:00