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
rgarcia
c2c7cdb18d
Merge branch 'budget' into budget-public-controllers
2016-09-02 13:15:40 +02:00
rgarcia
9d9bf488fc
does not create notifications for blocked or erased users
2016-08-02 20:52:20 +02:00
rgarcia
3c55d66591
fixes conflicts with budget
2016-07-27 11:41:46 +02:00
rgarcia
9e910a834b
Displays badge for official positions
2016-06-20 21:37:25 +02:00
rgarcia
25ebb325d1
limits maximum number of messages able to send per day
2016-06-16 11:10:26 +02:00
rgarcia
6e800c5120
adds email digest for proposal notifications
2016-06-14 17:53:36 +02:00
rgarcia
c3d06c8bd0
adds direct messages
2016-06-08 20:44:54 +02:00
kikito
c6c3e22a40
Adds methods for investments in models
2016-06-03 18:44:34 +02:00
Juanjo Bazán
d1e50d70d6
managers can login to /management
2016-05-10 19:10:02 +02:00
kikito
dea1a28a69
purges simple_captcha
2016-04-27 16:07:47 +02:00
kikito
aa351256d0
spanish typo
...
spanish typo
style
2016-04-19 15:59:24 +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
3504a27ca3
limits username uniqueness when registering with oauth
2016-04-19 13:33:16 +02:00
