consul/nairobi
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
8,675 Commits 1 Branch 0 Tags
087c8b0a99619e59df97fd27f1b51e7dea742733
Commit Graph

197 Commits

Author SHA1 Message Date
Bertocq
cd66ba5d54 Rubocop autocorrections 2017-11-13 02:22:00 +01:00
María Checa
841ef2a3a2 Merge branch 'master' into 1856-legislation_processes_proposals_phase 2017-10-09 17:19:07 +02:00
María Checa
ac5620c583 Merge branch 'master' into 1856-legislation_processes_proposals_phase 2017-09-21 21:24:56 +02:00
María Checa
ba041f90c8 Removed unnecessary parts in Legislation Proposals 2017-09-21 16:17:11 +02:00
BertoCQ
f67ba62c49 Merge branch 'master' into user-recomendations 2017-09-19 18:56:12 +02:00
María Checa
c1672bdbf4 Legislation proposals adaptation in some models and initializers 2017-09-19 10:10:10 +02:00
Bertocq
e4e78c8f16 Rubocop autocorrections 2017-09-14 15:08:35 +02:00
Raimond Garcia
2519f232ab Merge branch 'master' into user-recomendations 2017-09-05 17:15:42 +02:00
taitus
90518d4f99 Refactor participants. Add scopes on User. 2017-09-05 12:54:32 +02:00
taitus
0d76004636 Simplify and refactor method to calculate community participants 2017-09-05 12:54:32 +02:00
taitus
4539c5fa00 Refactor and tests. 2017-09-05 12:52:14 +02:00
taitus
08f58b845d Add participants to community 2017-09-05 12:51:08 +02:00
taitus
edbbe6174b Refactor specs because now recommendations only return results asociated to user interests 2017-08-03 00:23:06 +02:00
rgarcia
43b636de09 avoids postgres exception regarding subquery limits 
We have apparently reached a postgres limit for the number of
attributes we query. Using ids instead of the proposal objects seems to
fix it

Using `Array` and `map` instead of `pluck`, because the proposals
attribute can be a single object
 2017-08-02 21:34:40 +02:00
taitus
fe3bb7a389 Add recommended tab on proposals and debates index. 2017-08-01 16:31:44 +02:00
taitus
c6a9ffc19c Remove recommended investments 2017-08-01 16:28:01 +02:00
taitus
9aeb5eb758 Always display results when user has interests. 2017-08-01 16:28:01 +02:00
Senén Rodero Rodríguez
3068224a50 Add scope to followable concern to get all followable object followed by given user. 2017-08-01 16:28:01 +02:00
taitus
56511a154a Add feature and model specs. 2017-08-01 16:28:01 +02:00
taitus
36c76996e3 Display proposals and debates recommended when user have not interests. 2017-08-01 16:28:01 +02:00
taitus
e82e8f5787 Do not show proposals and investments as recommended when already followed 2017-08-01 16:28:01 +02:00
taitus
ff6471982c Add recommended debates, proposals and investement to Home page. 2017-08-01 15:48:21 +02:00
Senén Rodero Rodríguez
4b2310c135 Move and refactor method from follow to user model to get user interests. Add specification to check the discard of duplicate interests. 2017-07-07 15:18:34 +02:00
Senén Rodero Rodríguez
84dbef16a4 Create followable concern, follow model. Add followable to proposal model. 2017-07-07 12:02:00 +02:00
Bertocq
2888c20489 Fix all Style/RedundantSelf rubocop issues 2017-07-05 11:55:52 +02:00
Bertocq
1c8e039862 Fix all Layout/SpaceInsideParens rubocop issues and remove files from rubocop_todo list 2017-06-26 18:06:01 +02:00
Bertocq
c4d90691b1 Fix all Layout/SpaceInLambdaLiteral rubocop issues and remove files from rubocop_todo list 2017-06-26 18:05:14 +02:00
Bertocq
e6dd33bd66 Fix all Layout/SpaceAfterComma issues and remove from rubocop_todo list 2017-06-26 17:57:53 +02:00
rgarcia
9ebc5ccf34 removes user locale validation 2017-06-21 13:11:59 +02:00
Juanjo Bazán
315c57929a allows managers to create users without email 
allows managers to create users without email

hides email preferences from account page for email-less users

prevents email delivery to users with no email

adds spec for user creation from management

adds specs for user's email requirement

adds spec for no deliveries if no email
 2017-06-19 13:02:48 +02:00
kikito
782a68e9d3 Merge branch 'master' into amiedes-api-dev-PRs-2 2017-06-14 09:58:17 +02:00
Juanjo Bazán
2f895d2f6b removes else case 2017-06-13 12:22:48 +02:00
kikito
1701111bf5 Merge branch 'api-dev-PRs' of https://github.com/amiedes/consul into amiedes-api-dev-PRs-2 2017-06-13 12:07:28 +02:00
Juanjo Bazán
ed30051653 avoids conflicts with users using email as username 2017-06-12 18:54:39 +02:00
Juanjo Bazán
3f11dbe1d5 allows login using username or email 2017-06-12 17:26:38 +02:00
Bertocq
02524b164a Rubocop autocorrections (indentations, revers unless to if, extra spaces) 2017-06-08 12:14:35 +02:00
Alberto Miedes Garcés
9ec8b166d7 Use scopes for better query performance 2017-06-01 20:04:51 +02:00
rgarcia
1a46b4d4cb fixes conflicts with master 2017-05-31 10:36:38 +02:00
rgarcia
8f4eec2b8e zips all users with newsletter activated 2017-05-23 16:46:05 +02:00
decabeza
5e0d5fc8c3 Merge branch 'legislation-module-stable' of https://github.com/medialab-prado/consul into medialab-legislation 2017-05-22 18:43:49 +02:00
Alberto Miedes Garcés
ad8aba0739 Revised public fields, wrote more exhaustive specs 2017-05-15 20:22:11 +02:00
Alberto Miedes Garcés
5d9054d284 Merge branch 'master' into api-dev-PRs 
Conflicts:
	Gemfile.lock
	config/routes.rb
	db/dev_seeds.rb
	db/schema.rb
 2017-05-11 21:59:42 +02:00
Juanjo Bazán
35078848c3 adds methods to take votes from other user (generic & erased) 2017-02-09 20:09:06 +01:00
Juanjo Bazán
ae5ba97f1e adds erased scope to User 2017-02-09 18:43:50 +01:00
kikito
ba87eaa47c Moves Age calculation to a module instead of monkeypatching Date 2017-02-03 15:35:41 +01:00
kikito
95f80651b1 uses Date#age_in_years when calculating ages 2017-02-03 12:56:40 +01:00
Alberto Miedes Garcés
5b7cbccd19 Merge branch 'master' into api-dev 2017-01-26 12:39:59 +01:00
Alberto Miedes Garcés
83267330a7 Group methods related to text generation for GraphQL documentation into a module 2017-01-26 10:47:12 +01:00
Juanjo Bazán
cc6d841978 refactors age calculation 2017-01-25 17:16:17 +01:00
Juanjo Bazán
0b2454fb97 adds User#age 2017-01-25 14:17:49 +01:00