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 |
|
Juanjo Bazán
|
90f79e4bd5
|
Merge pull request #876 from consul/stats
removes unused combined stats
|
2016-02-04 13:23:38 +01:00 |
|
rgarcia
|
36aee45908
|
removes unused combined stats
|
2016-02-04 12:36:14 +01:00 |
|
Juanjo Bazán
|
519272956b
|
Merge pull request #873 from consul/suggest-cleanup
Suggest cleanup
|
2016-02-04 11:02:30 +01:00 |
|
rgarcia
|
77fc851748
|
fixes specs
|
2016-02-03 19:57:42 +01:00 |
|
rgarcia
|
41cdf6cec2
|
organizes translations according to view structure
|
2016-02-03 19:57:42 +01:00 |
|
rgarcia
|
e4a49f802e
|
removes duplication between debate and proposal suggestions
|
2016-02-03 19:57:37 +01:00 |
|
Raimond Garcia
|
37012fda5c
|
Merge pull request #872 from consul/refactor-search
refactors proposals search
|
2016-02-03 18:49:05 +01:00 |
|
kikito
|
b1534c1f56
|
moves html escaping to search_cache
|
2016-02-03 18:39:07 +01:00 |
|
kikito
|
986919503a
|
refactors proposals search
|
2016-02-03 18:26:48 +01:00 |
|
Juanjo Bazán
|
13b74fdb2a
|
Merge pull request #871 from consul/suggest-order
sorts suggested proposals by default order(relevance)
|
2016-02-03 16:36:54 +01:00 |
|
rgarcia
|
5b1b6de6cc
|
sorts suggested proposals by default order(relevance)
|
2016-02-03 16:12:02 +01:00 |
|
Juanjo Bazán
|
bfee555b2c
|
Merge pull request #869 from consul/cancel-login
includes a "cancel" option when logging in via omniauth
|
2016-02-03 12:09:07 +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
|
eda2c419f7
|
fixes typo in es locale
|
2016-02-03 11:39:16 +01:00 |
|
Juanjo Bazán
|
84cacf7cd8
|
updates dependencies
|
2016-02-03 11:38:31 +01:00 |
|
Juanjo Bazán
|
dac7e86d81
|
Merge pull request #870 from consul/faster-suggestions
makes the pr work on keyup and change instead of blur
|
2016-02-03 11:03:21 +01:00 |
|
kikito
|
99f95b4f32
|
makes the pr work on keyup and change instead of blur
|
2016-02-02 18:11:42 +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
|
282348ef4b
|
updates dependencies
|
2016-01-30 20:23:52 +01:00 |
|
Juanjo Bazán
|
ff03f20f4e
|
refactors spec to avoid flaky test errors
|
2016-01-29 11:41:41 +01:00 |
|
Juanjo Bazán
|
73aea8f127
|
rescues ahoy error stoping user verifications
|
2016-01-29 11:41:16 +01:00 |
|
Juanjo Bazán
|
75f03499bc
|
fixes social media meta tags
|
2016-01-28 13:09:13 +01:00 |
|
kikito
|
4bac9e6ea1
|
updates oauth code to handle faulty facebook responses better
|
2016-01-27 18:36:22 +01:00 |
|
Enrique García
|
67303159fa
|
Merge pull request #865 from consul/trending-tags
Trending tags
|
2016-01-27 15:50:38 +01:00 |
|
rgarcia
|
5bea145d71
|
scopes tags only for Proposals
|
2016-01-27 15:11:59 +01:00 |
|
rgarcia
|
48b5aba1c5
|
removes unused helper
|
2016-01-27 14:55:42 +01:00 |
|
rgarcia
|
eed3623466
|
users full text search of tag
|
2016-01-27 14:19:21 +01:00 |
|
rgarcia
|
5a3dc42dea
|
removes tag count
|
2016-01-27 14:18:40 +01:00 |
|
rgarcia
|
209b6407d3
|
increases tag limit to 10
|
2016-01-27 14:17:32 +01:00 |
|
rgarcia
|
5d4b6fae92
|
scopes tags by category or geozone
|
2016-01-27 14:15:12 +01:00 |
|
rgarcia
|
0175cd2c68
|
does not display category tags nor geozone names
|
2016-01-27 13:52:11 +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 |
|
rgarcia
|
e7e5c531a0
|
moves tag_cloud logic to a model
|
2016-01-27 13:02:18 +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 |
|
kikito
|
957e07489a
|
remove unuseful comment
|
2016-01-26 19:59:20 +01:00 |
|
kikito
|
a796dade7a
|
extracts methods into user.rb
|
2016-01-26 19:48:01 +01:00 |
|
Raimond Garcia
|
c7309ae6fc
|
Merge pull request #859 from consul/clickable-geozone
makes geozone clickable in proposal show
|
2016-01-26 19:45:59 +01:00 |
|
rgarcia
|
606a87bbbf
|
force build
|
2016-01-26 18:51:59 +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
|
a23d0ebbd8
|
fixes issues after squashing
|
2016-01-26 18:19:18 +01:00 |
|
kikito
|
646ca8a686
|
Splits omniauth_callbacks_controller#login_with method in two smaller ones
Uses new hash syntax in specs
|
2016-01-26 18:15:45 +01:00 |
|