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
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
Alberto Garcia Cabeza
7abd31e4bf
Renames variable, updates text
2016-09-15 13:47:53 +02:00
Alberto Garcia Cabeza
db6f82fa4c
Moves banner to a partial and includes it on debates index
2016-09-14 11:09:36 +02:00
Juanjo Bazán
2142351743
archived proposals should not appear in 'featured'
2016-09-13 12:56:49 +02:00
Juanjo Bazán
11dbc05a80
removes archived proposals from index/search pages
2016-09-13 12:56:10 +02:00
Alberto Garcia Cabeza
41312ca2a5
Creates archived proposals method
2016-09-09 17:31:05 +02:00
Juanjo Bazán
50ef23205f
avoids loading featured proposals if voting notice
2016-09-08 12:42:44 +02:00
Alberto Garcia Cabeza
b107790039
Adds links, texts and i18n
2016-09-07 12:46:29 +02:00
Alberto Garcia Cabeza
a527de4f92
Adds proposal ballots controller and views
2016-09-07 12:43:12 +02:00
Juanjo Bazán
dc7ee45766
uses before_action instead of before_filter
...
before_filter is deprecated
2016-07-18 14:50:28 +02:00
rgarcia
96630f88f2
takes into account emails separated by commas without spaces
2016-06-29 21:46:03 +02:00
rgarcia
745de9bb77
sends invitation email to users
2016-06-27 23:37:58 +02:00
Alberto Garcia Cabeza
947b2bcb0d
Adds user invites views on management
2016-06-27 14:25:20 +02:00
rgarcia
00dbbd0689
fixes specs (unauthenticated users can view spending proposal show)
2016-06-20 21:54:45 +02:00
rgarcia
98040e191e
fixes conflicts with fork
2016-06-20 21:33:34 +02:00
rgarcia
3c2098eb14
improves legibility of counts
2016-06-16 18:40:05 +02:00
rgarcia
b7e3129ec1
uses more efficient count
2016-06-16 18:35:34 +02:00
rgarcia
0abc9c8376
adds stats for direct messages and proposal notifications
2016-06-16 17:42:16 +02:00
rgarcia
18dd9c95f3
fixes specs
2016-06-16 12:06:26 +02:00
rgarcia
28d12fe55b
removes sending individual proposal notifications via email
2016-06-15 10:43:02 +02:00
rgarcia
ce6072d17b
sends a copy of the direct message to the sender
2016-06-14 18:55:28 +02:00
rgarcia
fd67294075
adds option to receive direct messages
2016-06-14 18:20:36 +02:00
rgarcia
9f19a5d143
adds option to receive email digest
2016-06-14 18:08:27 +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
a0ddde16e9
adds notifications for proposals
2016-06-07 22:03:14 +02:00
rgarcia
ad697cd2c1
adds preference to receive proposal notifications
2016-06-06 12:55:33 +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
rgarcia
6e4ed0b895
adds link to send message from my activity
2016-06-01 21:01:24 +02:00
rgarcia
f5375e813d
stores a proposal notification
2016-06-01 17:23:56 +02:00
Alberto Garcia Cabeza
7c65a6ee1a
Merge branch 'add_banners_admin' of https://github.com/MaiteHdezRivas/consul into MaiteHdezRivas-add_banners_admin
2016-05-23 12:14:52 +02:00
Juanjo Bazán
65335d1344
optimizes stat query
2016-05-20 11:05:10 +02:00
MaiteHdezRivas
3b2bfc46cf
Admin option to add banners and show banners
2016-05-19 13:18:30 +02:00
Juanjo Bazán
c4bf90f576
adds managers section to admin
2016-05-11 11:24:38 +02:00
Juanjo Bazán
d1e50d70d6
managers can login to /management
2016-05-10 19:10:02 +02:00
Juanjo Bazán
fd8fb49015
hides retire link if no author/admin
2016-05-06 12:18:38 +02:00
Juanjo Bazán
2d4ac24465
adds missing param
2016-04-28 18:36:22 +02:00
Raimond Garcia
712e42ca9d
Merge pull request #1104 from consul/admin-access-to-management
...
Admin access to management
2016-04-28 16:55:10 +02:00
kikito
6c9c2f1b96
removes obsolete/deprecated code
2016-04-28 14:00:20 +02:00
kikito
9ac6e2d60b
Uses invisible_captcha's default "foo fast" action
2016-04-28 12:47:04 +02:00
Juanjo Bazán
2eabab657a
allows admin to sign in into management
2016-04-27 17:26:19 +02:00
Juanjo Bazán
585f3dd6c7
removes use of current_user in management
...
favors managed_user
to avoid conflicts with logged admin users
2016-04-27 17:26:19 +02:00
kikito
303b17c238
Adds invisible_captcha to user & organization registrations
2016-04-27 16:13:50 +02:00
kikito
7adc706d23
Moves redirect_timestamp_spam to AppController
2016-04-27 16:13:49 +02:00
kikito
289182b145
Adds invisible_captcha to proposals, debates & sps
2016-04-27 16:12:32 +02:00
kikito
eedf02a186
Starts using invisible_captcha in the source code. Pending: tests, proper invisible_captcha gem in Gemfile
2016-04-27 16:07:48 +02:00
