Juanjo Bazán
|
f3aafcb29e
|
Merge pull request #1080 from consul/collapse-comments
Collapse comments
|
2016-04-20 17:49:09 +02:00 |
|
Alberto Garcia Cabeza
|
e3878ff437
|
Fixes icon animation on reply comments
|
2016-04-20 17:27:58 +02:00 |
|
MaiteHdezRivas
|
3e7db9d1b5
|
Best practices code changes
|
2016-04-20 16:40:58 +02:00 |
|
Alberto Garcia Cabeza
|
6a26bfd928
|
Updates icons font
|
2016-04-20 15:57:07 +02:00 |
|
Juanjo Bazán
|
6a08a8d574
|
Merge pull request #933 from palomahnhp/tracking_user_verifications_and_others
Tracking user verifications and supports proposals #571
|
2016-04-20 12:16:29 +02:00 |
|
palomahnhp
|
bf5d253e12
|
Merge branch 'master' into tracking_user_verifications_and_others
Conflicts:
app/controllers/admin/stats_controller.rb
db/dev_seeds.rb
|
2016-04-20 11:44:33 +02:00 |
|
palomahnhp
|
b4ec077f16
|
Merge remote-tracking branch 'origin/master' into tracking_user_verifications_and_others
Conflicts:
app/assets/javascripts/application.js
|
2016-04-20 11:28:06 +02:00 |
|
Raimond Garcia
|
63c24c15ce
|
Merge pull request #1078 from consul/subnavigation-layout
Fixes subnavigation layout
|
2016-04-19 23:59:18 +02:00 |
|
Alberto Garcia Cabeza
|
4a013a65bc
|
Fixes subnavigation layout
|
2016-04-19 23:45:03 +02:00 |
|
Alberto García Cabeza
|
b4298e8358
|
Merge pull request #1077 from consul/stats
removes duplicate graphs
|
2016-04-19 20:47:57 +02:00 |
|
rgarcia
|
0648c7f38d
|
removes duplicate graphs
|
2016-04-19 20:26:14 +02:00 |
|
Juanjo Bazán
|
59e2c8a122
|
Merge pull request #1072 from consul/oauth-signup-fix
Oauth signup fix
|
2016-04-19 16:01:00 +02:00 |
|
kikito
|
aa351256d0
|
spanish typo
spanish typo
style
|
2016-04-19 15:59:24 +02:00 |
|
Raimond Garcia
|
c563220236
|
Merge pull request #1075 from consul/dependencies
Dependencies
|
2016-04-19 13:55:12 +02:00 |
|
kikito
|
d577a2b82e
|
add spec for user identity erasure
|
2016-04-19 13:33:52 +02:00 |
|
kikito
|
8569e4f22e
|
adds rake task to destroy identities from erased users
|
2016-04-19 13:33:52 +02:00 |
|
kikito
|
e6c42860a7
|
destroy the identities associated with an user when the user deletes his account
|
2016-04-19 13:33:52 +02:00 |
|
kikito
|
581253219b
|
adds rake task to mark some users with duplicated usernames so they change them
|
2016-04-19 13:33:52 +02:00 |
|
kikito
|
d752a334f8
|
adds index for username
|
2016-04-19 13:33:52 +02:00 |
|
kikito
|
3637c95fe2
|
adds note to finish_signup
|
2016-04-19 13:33:17 +02:00 |
|
kikito
|
3504a27ca3
|
limits username uniqueness when registering with oauth
|
2016-04-19 13:33:16 +02:00 |
|
kikito
|
f86912c77c
|
Adapts to new User api
|
2016-04-19 13:33:16 +02:00 |
|
kikito
|
3cd12bd6ea
|
Simplifies use of registering_with_oauth in User
Now we just ignore all validations when saving a user for oauth
|
2016-04-19 13:33:16 +02:00 |
|
kikito
|
f776f863bb
|
Adds missing step to oauth spec
|
2016-04-19 13:33:16 +02:00 |
|
Juanjo Bazán
|
87d2d74f66
|
updates devise & ahoy
|
2016-04-19 13:27:16 +02:00 |
|
Juanjo Bazán
|
038a520987
|
updates dependencies and specs
|
2016-04-19 13:05:08 +02:00 |
|
Juanjo Bazán
|
856f226937
|
Merge pull request #1066 from consul/international-phone
Adds label and placeholder for international numbers verification
|
2016-04-19 10:46:00 +02:00 |
|
Juanjo Bazán
|
b202b4a37c
|
Merge pull request #1074 from consul/youtube-videos
Youtube videos
|
2016-04-19 10:22:42 +02:00 |
|
Alberto Garcia Cabeza
|
84a7438786
|
Improves styles for long proposals show texts
|
2016-04-19 00:08:50 +02:00 |
|
Alberto Garcia Cabeza
|
42502cecb7
|
Fixes youtu.be embedded videos
|
2016-04-19 00:08:12 +02:00 |
|
Raimond Garcia
|
59deec596f
|
Merge pull request #1073 from consul/newsletter
activates newsletter by default
|
2016-04-18 20:19:49 +02:00 |
|
rgarcia
|
08db8a6b17
|
fixes specs
|
2016-04-18 20:08:05 +02:00 |
|
rgarcia
|
f2e0059c96
|
activates newsletter by default
|
2016-04-18 19:58:01 +02:00 |
|
Raimond Garcia
|
16a0ac900e
|
Merge pull request #1071 from consul/hide-voting-button
Hide voting button
|
2016-04-18 12:33:37 +02:00 |
|
Juanjo Bazán
|
c939339020
|
shows voting button for sps only if voting allowed
|
2016-04-18 12:04:50 +02:00 |
|
Juanjo Bazán
|
11bcdf0211
|
changes reasons order, :not_voting_allowed first
|
2016-04-18 12:04:18 +02:00 |
|
Juanjo Bazán
|
fc0ea93cef
|
adds setting to dev_seeds
|
2016-04-17 10:55:42 +02:00 |
|
Juanjo Bazán
|
7cb1e9d45a
|
Merge pull request #1070 from amaia/patch-1
Fix typo in README.md
|
2016-04-16 11:15:15 +02:00 |
|
Amaia Castro
|
3a6d9d639a
|
Fix typo in README.md
|
2016-04-16 11:13:01 +02:00 |
|
Enrique García
|
916f50dbce
|
Merge pull request #1069 from consul/disable-sp-voting
Disable sp voting
|
2016-04-15 23:21:09 +02:00 |
|
Juanjo Bazán
|
e6a9cb4fcc
|
disable voting on sps if setting disabled
refactors hover messages on sps votes
|
2016-04-15 23:01:00 +02:00 |
|
Juanjo Bazán
|
5a785ca7ce
|
adds voting on sps as admin feature flag
|
2016-04-15 17:57:02 +02:00 |
|
Raimond Garcia
|
39c0c159f8
|
Merge pull request #1068 from consul/sp_physical_votes
Sp physical votes
|
2016-04-15 17:26:50 +02:00 |
|
kikito
|
d9ec2e2cf3
|
Calculates SP.total_votes using physical_votes
|
2016-04-15 17:16:35 +02:00 |
|
kikito
|
3adcd9c304
|
Adds physical votes to sps table
|
2016-04-15 17:16:13 +02:00 |
|
Alberto Garcia Cabeza
|
7d32f2a4b0
|
Adds label and placeholder for international numbers verification
|
2016-04-15 13:09:54 +02:00 |
|
Juanjo Bazán
|
c5a1b3d1ee
|
adds info to readme about the seed verified user
|
2016-04-15 11:03:38 +02:00 |
|
Juanjo Bazán
|
8d59e3d84f
|
Merge branch 'readme_improvement' of https://github.com/bertocq/consul into bertocq-readme_improvement
|
2016-04-15 10:58:06 +02:00 |
|
Alberto Garcia Cabeza
|
e55a4c9f23
|
Renters videos on proposals show
|
2016-04-14 16:38:39 +02:00 |
|
Raimond Garcia
|
16b306f4e6
|
Merge pull request #1065 from Ana06/patch-1
Update README.md
|
2016-04-14 13:56:47 +02:00 |
|