rgarcia
|
503338e47b
|
adds view placeholders for officing polls
|
2016-11-14 13:51:09 +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 |
|
Alberto Garcia Cabeza
|
076e237320
|
Improves proposal ballot banner, deletes unused partial
|
2016-09-14 10:40:16 +02:00 |
|
Alberto Garcia Cabeza
|
e8b70a48fa
|
Adds tab in index & removes support button in index/show
|
2016-09-09 17:32:03 +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
|
cff1f43a90
|
Adds banner, styles, and updates icons font
|
2016-09-07 16:42:57 +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
|
6d2f28b13d
|
removes unused i18n entries
|
2016-07-20 13:16:59 +02:00 |
|
Alberto Garcia Cabeza
|
c3d70f6e95
|
Adds text for show comment children
|
2016-07-14 18:02:27 +02:00 |
|
Alberto Garcia Cabeza
|
f3e0626709
|
Adds text to notifications icons on header
|
2016-07-12 13:24:49 +02:00 |
|
Alberto Garcia Cabeza
|
d24efbad60
|
Changes .com urls examples to .consul
|
2016-07-06 12:32:07 +02:00 |
|
Alberto Garcia Cabeza
|
22e1b533bc
|
Removes Madrid from translations
|
2016-07-04 18:06:51 +02:00 |
|
Alberto Garcia Cabeza
|
e01162bc7a
|
Changes message for ie alert
|
2016-06-22 11:17:27 +02:00 |
|
rgarcia
|
98040e191e
|
fixes conflicts with fork
|
2016-06-20 21:33:34 +02:00 |
|
Alberto Garcia Cabeza
|
38fded40d8
|
Changes translations
|
2016-06-16 16:22:48 +02:00 |
|
rgarcia
|
b3fd5e225a
|
Merge branch 'proposal-notifications' of github.com:AyuntamientoMadrid/participacion into proposal-notifications
|
2016-06-16 11:23:23 +02:00 |
|
rgarcia
|
91860cb409
|
validates that a user does not want to receive direct messages
|
2016-06-16 11:23:03 +02:00 |
|
Alberto Garcia Cabeza
|
419ced5a18
|
Adds text to form new
|
2016-06-15 21:14:56 +02:00 |
|
Alberto Garcia Cabeza
|
dd7629b5af
|
Adds notification menu and message for empty notifications
|
2016-06-15 21:00:56 +02:00 |
|
Alberto Garcia Cabeza
|
2dc39192b8
|
Adds button to proposal's show to 'Send notification'
|
2016-06-15 17:13:44 +02:00 |
|
Alberto Garcia Cabeza
|
e87fda2c8d
|
Adds comments anchor on form link
|
2016-06-15 17:03:33 +02:00 |
|
rgarcia
|
28d12fe55b
|
removes sending individual proposal notifications via email
|
2016-06-15 10:43:02 +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 |
|
Alberto Garcia Cabeza
|
29f869046a
|
Adds message for no accepting private messages
|
2016-06-10 18:01:59 +02:00 |
|
Alberto Garcia Cabeza
|
900d997000
|
Adds message for unverified users
|
2016-06-09 17:15:11 +02:00 |
|
Alberto Garcia Cabeza
|
ad856521fc
|
Adds translations for direct messages
|
2016-06-09 16:00:13 +02:00 |
|
rgarcia
|
a0ddde16e9
|
adds notifications for proposals
|
2016-06-07 22:03:14 +02:00 |
|
Alberto Garcia Cabeza
|
14f17983f4
|
Improves styles for about receivers message
|
2016-06-06 17:30:31 +02:00 |
|
Alberto Garcia Cabeza
|
bdb5a83911
|
Merge branch 'proposal-notifications' of github.com:consul/consul into proposal-notifications
|
2016-06-06 17:26:56 +02:00 |
|
Alberto Garcia Cabeza
|
84f9dcaa76
|
Adds tabs for notifications on proposal show
|
2016-06-06 17:26:48 +02:00 |
|
rgarcia
|
a2c9756c18
|
displays message about receivers
|
2016-06-06 16:50:00 +02:00 |
|
rgarcia
|
ad697cd2c1
|
adds preference to receive proposal notifications
|
2016-06-06 12:55:33 +02:00 |
|
Alberto Garcia Cabeza
|
0ef316de91
|
Improves styles for proposal notifications
|
2016-06-02 13:36:41 +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
|
ddd061a17f
|
Adds alternative text for sidebar map
|
2016-05-04 11:49:30 +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 |
|
Juanjo Bazán
|
6760199a90
|
Merge pull request #1090 from consul/back-links
Back links
|
2016-04-28 16:52:09 +02:00 |
|
kikito
|
6c9c2f1b96
|
removes obsolete/deprecated code
|
2016-04-28 14:00:20 +02:00 |
|
Juanjo Bazán
|
325d4e0544
|
adds link to management in admin header
|
2016-04-27 17:26:19 +02:00 |
|
kikito
|
4a95c85c48
|
Fixes typo in es.yml
|
2016-04-27 16:13:49 +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 |
|
kikito
|
dea1a28a69
|
purges simple_captcha
|
2016-04-27 16:07:47 +02:00 |
|
Alberto Garcia Cabeza
|
79b0f38e34
|
Removes unused keys
|
2016-04-26 13:10:02 +02:00 |
|
Juanjo Bazán
|
296f41b1ed
|
changes copy
|
2016-04-25 18:19:03 +02:00 |
|
Juanjo Bazán
|
479b48796f
|
Merge pull request #1085 from consul/retire-proposals
Retire proposals
|
2016-04-25 18:00:34 +02:00 |
|