rgarcia
42b0ff2696
optimize census call to return after finding a valid element
2016-12-26 11:51:28 +01:00
rgarcia
ddeca6f06d
fixes specs
2016-12-23 19:05:25 +01:00
rgarcia
25729ac259
cleans up
2016-12-21 18:55:28 +01:00
rgarcia
675081141c
refactors signatures
2016-12-21 18:46:31 +01:00
rgarcia
b10dbd7cb5
adds specs
2016-12-20 18:00:36 +01:00
rgarcia
4eb700e3d4
refactors signature sheets
2016-12-20 16:46:08 +01:00
rgarcia
3c682b8a9b
adds signature sheets
2016-12-20 12:21:05 +01:00
Raimond Garcia
392f00cdbd
Merge pull request #1282 from amiedes/crud-geozones-PRs
...
[Finished] Allow admins to manage geozones
2016-12-14 19:25:17 +01:00
Alberto Miedes Garcés
c22a80b48f
Move geozone 'safe to destroy' check from controller to model
2016-12-13 12:30:47 +01:00
rgarcia
6b0f8eb62b
do not allow verification of deregistered accounts
2016-12-12 19:11:00 +01:00
rgarcia
b12c8d3a5d
validates document uniqueness only for active accounts
2016-12-12 19:11:00 +01:00
rgarcia
93841b87ad
maintains associated document number when erasing account
2016-12-12 19:11:00 +01:00
Alberto Miedes Garcés
fea2009396
Ability to edit geozones from admin dashboard
2016-12-07 22:08:22 +01:00
Alberto Miedes Garcés
4b31360d2e
Updated geozone model associations
2016-12-07 22:04:39 +01:00
Alberto Miedes Garcés
6175990533
Admin geozones: index, create
...
Modified Geozone factory and seeds to be more complete
2016-12-04 21:19:36 +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
4269f3810b
Merge remote-tracking branch 'upstream/master' into admin_password_expired
2016-09-27 13:26:08 +02:00
Marcia
78c6a30424
optimize code
2016-09-27 13:07:06 +02:00
rgarcia
7d4d9b0ead
sorts archived proposals by votes
2016-09-16 19:42:18 +02:00
Alberto Garcia Cabeza
910b24936d
Merge branch 'master' into voting-proposals
...
Conflicts:
app/models/proposal.rb
app/views/proposals/_proposal.html.erb
app/views/proposals/index.html.erb
app/views/proposals/show.html.erb
spec/support/common_actions.rb
2016-09-15 13:58:53 +02:00
Marcia
8d883b1e17
mejoras de codigo
2016-09-15 11:45:03 +02:00
Juanjo Bazán
8d48eccfed
adds not_archived scope to proposal
2016-09-13 12:10:31 +02:00
Juanjo Bazán
da03311f99
archived proposals can not accept votes
2016-09-12 18:47:56 +02:00
Alberto Garcia Cabeza
3bbc2862d2
Adds admin setting 'months to archive proposals'
2016-09-09 18:02:02 +02:00
Alberto Garcia Cabeza
41312ca2a5
Creates archived proposals method
2016-09-09 17:31:05 +02:00
Juanjo Bazán
e330b704c0
removes half-baked feature
...
archived proposals is a separate issue now
2016-09-08 17:06:16 +02:00
Alberto Garcia Cabeza
22487592cf
Adds scope for archived proposals
2016-09-07 12:57:53 +02:00
Alberto Garcia Cabeza
b107790039
Adds links, texts and i18n
2016-09-07 12:46:29 +02:00
Juanjo Bazán
46563f8222
Merge pull request #1194 from consul/notifications-polish
...
Notifications polish
2016-08-04 11:29:21 +02:00
rgarcia
b087fe8fb7
refactors email digest
2016-08-03 19:33:37 +02:00
rgarcia
9d9bf488fc
does not create notifications for blocked or erased users
2016-08-02 20:52:20 +02:00
rgarcia
a23666683f
fixes conflicts with master
2016-07-19 15:50:22 +02:00
rgarcia
9e910a834b
Displays badge for official positions
2016-06-20 21:37:25 +02:00
rgarcia
8ee7d535ba
generic message for max_per_day setting
2016-06-16 15:54:19 +02:00
rgarcia
25ebb325d1
limits maximum number of messages able to send per day
2016-06-16 11:10:26 +02:00
kikito
0c469bc362
fixes the way permissions work for proposalnotifications
2016-06-15 14:02:13 +02:00
rgarcia
e2689d640c
refactors notification helpers
2016-06-15 12:12:56 +02:00
rgarcia
6e800c5120
adds email digest for proposal notifications
2016-06-14 17:53:36 +02:00
rgarcia
00fc5b77e5
adds permissions in view for direct messages
2016-06-09 17:42:13 +02:00
rgarcia
fea3aef5bb
updates permissions for direct messages
2016-06-09 17:35:19 +02:00
rgarcia
c3d06c8bd0
adds direct messages
2016-06-08 20:44:54 +02:00
rgarcia
0e86cd89d6
adds permissions with cancan for new, create and show
2016-06-08 13:46:17 +02:00
rgarcia
16f10e34ef
fixes specs
2016-06-07 23:17:00 +02:00
rgarcia
a0ddde16e9
adds notifications for proposals
2016-06-07 22:03:14 +02:00
rgarcia
8e12fbdd55
adds time limit between notifications
2016-06-07 13:48:09 +02:00
rgarcia
fc6cc090f8
displays notifications in proposal view
2016-06-06 12:21:48 +02:00
rgarcia
ca26b3423b
sends notification email to each voter
2016-06-01 21:40:23 +02:00
