kikito
|
2e8650c324
|
merge with master
|
2016-12-12 16:09:05 +01:00 |
|
kikito
|
869f7b39d6
|
fixes i18n
|
2016-12-08 11:49:13 +01:00 |
|
kikito
|
748fd8becf
|
Makes all tests pass in bi management
|
2016-12-07 19:16:37 +01:00 |
|
Alberto Garcia Cabeza
|
cca30801cc
|
updates texts
|
2016-12-07 13:57:48 +01:00 |
|
Alberto Garcia Cabeza
|
442e5df461
|
removes unnecessary heading and nav tag on pagination
|
2016-12-07 12:49:15 +01:00 |
|
Alberto Garcia Cabeza
|
b61b08a2f5
|
adds optgroup on local switcher
|
2016-12-05 17:46:24 +01:00 |
|
Alberto Garcia Cabeza
|
ae12848e23
|
adds text for screen readers on toggle comments
|
2016-12-05 14:26:54 +01:00 |
|
kikito
|
979880f910
|
adds i18n for budget phases
|
2016-11-28 19:08:09 +01:00 |
|
kikito
|
2a2179d0f3
|
Merge branch 'master' into budget
|
2016-11-28 11:41:49 +01:00 |
|
Alberto Garcia Cabeza
|
2249fdbdfa
|
improves outline and structure headings
|
2016-11-14 17:45:20 +01:00 |
|
Alberto Garcia Cabeza
|
7594981964
|
changes text 2% of census to 1%
|
2016-11-02 14:22:37 +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 |
|
kikito
|
fd5dd5984d
|
fixes i18n issues
|
2016-09-09 13:07:01 +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 |
|
rgarcia
|
1c8290faa9
|
refactors budget translations
|
2016-09-02 13:51:16 +02:00 |
|
rgarcia
|
c2c7cdb18d
|
Merge branch 'budget' into budget-public-controllers
|
2016-09-02 13:15:40 +02:00 |
|
Juanjo Bazán
|
b8b71d0ab0
|
Merge branch 'master' into budget
|
2016-09-02 12:47:54 +02:00 |
|
Juanjo Bazán
|
6fce9df451
|
adds admin creation of budgets
|
2016-07-29 13:34:41 +02:00 |
|
Juanjo Bazán
|
1ad78d599e
|
adds admin budgets index
|
2016-07-28 12:36:39 +02:00 |
|
rgarcia
|
3c55d66591
|
fixes conflicts with budget
|
2016-07-27 11:41:46 +02:00 |
|
rgarcia
|
f7810d44dd
|
updates translations
|
2016-07-27 11:33:18 +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
|
0899a0ddb4
|
Improves styles for budget index and show views
|
2016-06-07 19:22:15 +02:00 |
|