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
Alberto Miedes Garcés
e7f55b10e2
Remove obsolete specs
2017-01-25 13:58:44 +01:00
Juanjo Bazán
113f9b32d7
Merge branch 'master' into polls
2017-01-19 16:51:19 +01:00
Amaia Castro
00b488fe84
Merge branch 'master' into legislation-module-stable
2017-01-17 10:46:33 +01:00
rgarcia
b2b9954e6d
allows user to support only in one heading per group
2017-01-13 15:24:57 +01:00
Amaia Castro
a2a61341fe
Merge branch 'master' into legislation-module-stable
2017-01-11 22:54:41 +01:00
Juanjo Bazán
220e7397e1
adds Setting: minimum age to participate
2017-01-09 16:04:49 +01:00
Alberto Miedes Garcés
0b4004042f
Expose age_range instead of date_of_birth for Voter/User class
2017-01-02 14:12:37 +01:00
Alberto Miedes Garcés
508360cfa5
Remove unused User scope
2017-01-02 11:35:19 +01:00
Alberto Miedes Garcés
4783f14eb4
Show voter info in api
2017-01-02 00:13:16 +01:00
Alberto Miedes Garcés
90130f20e7
Add Votes info to api
2016-12-29 12:03:00 +01:00
Juanjo Bazán
402d709930
adds menu item to main bar for poll officers
2016-12-27 18:48:36 +01:00
Juanjo Bazán
5ec12e4b5b
Merge branch 'master' into redux-polling
2016-12-27 18:22:06 +01:00
Amaia Castro
5e01b380cd
Legislation Answer model
2016-12-27 18:21:50 +01:00
kikito
9d97421b0e
Merge branch 'master' into budgets
2016-12-27 14:02:12 +01:00
Juanjo Bazán
ee8c057a46
adds officer search to admin polls
2016-12-27 12:36:16 +01:00
Alberto Miedes Garcés
2311cd4b1d
Renamed User::public_activity scope
2016-12-26 18:42:12 +01:00
Juanjo Bazán
f0156c5b5a
adds admin search/add/remove question to poll
2016-12-26 16:19:35 +01:00
Alberto Miedes Garcés
d4b049175c
Merge branch 'master' into api-dev-0.18.11
2016-12-26 12:55:17 +01:00
Alberto Miedes Garcés
402b07d959
Expose Proposal public_author using scopes instead of modules
2016-12-13 14:04:53 +01:00
rgarcia
93841b87ad
maintains associated document number when erasing account
2016-12-12 19:11:00 +01:00
kikito
2a2179d0f3
Merge branch 'master' into budget
2016-11-28 11:41:49 +01:00
kikito
f0b8cfd4a2
Time.now -> Time.current
2016-11-23 19:19:19 +01:00
rgarcia
bb3c4c6399
adds consistency to ruby code style
...
Keep a blank line before and after private
Keep a blank line before and after protected
Remove extra empty line at class body end
Remove extra blank line
Add final newline
Use 2 (not 3) spaces for indentation
Use 2 (not 4) spaces for indentation
Remove space before comma
Add space after comma
Remove trailing whitespaces
Remove unnecessary spacing
Use snake_case for variable names
Do not use then for multi-line if
Remove unused block argument - i
Use the new Ruby 1.9 hash syntax
Remove unused assignment to variable
Indent when as deep as case
Align attributes
Align end with def
2016-11-15 11:18:43 +01:00
Marcia
680c0636ed
expired password last
2016-10-06 14:19:48 +02:00
Marcia
1e87810593
improves expired password view
2016-09-29 14:34:37 +02:00
Marcia
78c6a30424
optimize code
2016-09-27 13:07:06 +02:00
Marcia
8d883b1e17
mejoras de codigo
2016-09-15 11:45:03 +02:00
kikito
50f82211a9
Add User has_many budget_investments
2016-09-09 12:20:58 +02:00
