Commit Graph

3700 Commits

Author SHA1 Message Date
Alberto Garcia Cabeza
219f4e2c15 Deletes sitemap 2016-07-06 12:32:14 +02:00
Alberto Garcia Cabeza
d24efbad60 Changes .com urls examples to .consul 2016-07-06 12:32:07 +02:00
Alberto Garcia Cabeza
42722080fc Changes references to Madrid 2016-07-05 13:47:14 +02:00
Alberto Garcia Cabeza
ece2f6f019 Removes Madrid references on pages 2016-07-04 18:07:45 +02:00
Alberto Garcia Cabeza
22e1b533bc Removes Madrid from translations 2016-07-04 18:06:51 +02:00
Raimond Garcia
aab890c006 Merge pull request #1167 from consul/invitation-emails
Invitations polish
2016-06-29 22:04:20 +02:00
rgarcia
96630f88f2 takes into account emails separated by commas without spaces 2016-06-29 21:46:03 +02:00
Juanjo Bazán
47a6480652 updates monitoring dependencies 2016-06-28 21:30:22 +02:00
Juanjo Bazán
9e55d4f719 updates nokogiri (security update) 2016-06-28 21:28:21 +02:00
Enrique García
c899f4da19 Merge pull request #1166 from consul/management-invitations
Management invitations
2016-06-28 13:12:46 +02:00
rgarcia
ad1720ba02 uses applications's default locale 2016-06-27 23:38:23 +02:00
rgarcia
745de9bb77 sends invitation email to users 2016-06-27 23:37:58 +02:00
Alberto Garcia Cabeza
0bb948a013 Updates mailer texts 2016-06-27 16:01:03 +02:00
Alberto Garcia Cabeza
a2a2960867 Adds mailer template for user invites 2016-06-27 15:37:45 +02:00
Alberto Garcia Cabeza
947b2bcb0d Adds user invites views on management 2016-06-27 14:25:20 +02:00
kikito
73d3d0c8c3 hides the retire proposal link for admins in User#show 2016-06-23 17:48:30 +02:00
Juanjo Bazán
577a7435a9 Merge pull request #1163 from consul/ie-improvements
Creates new scss file for IE styles
2016-06-23 14:33:24 +02:00
Alberto Garcia Cabeza
0972f5284a Creates new scss file for IE styles 2016-06-23 13:56:57 +02:00
Juanjo Bazán
0320abe1cf Merge pull request #1161 from consul/ie-message-alert
Changes message for ie alert
2016-06-22 13:53:44 +02:00
Alberto Garcia Cabeza
e01162bc7a Changes message for ie alert 2016-06-22 11:17:27 +02:00
Enrique García
dc849a6103 Merge pull request #1159 from consul/official_positions
Official position badges
2016-06-21 12:08:15 +02:00
rgarcia
1f7e86e206 fixes specs 2016-06-20 22:06:49 +02:00
rgarcia
00dbbd0689 fixes specs (unauthenticated users can view spending proposal show) 2016-06-20 21:54:45 +02:00
rgarcia
9e910a834b Displays badge for official positions 2016-06-20 21:37:25 +02:00
rgarcia
51d688897a displays badge option if official position is level 1 2016-06-20 21:37:03 +02:00
rgarcia
98040e191e fixes conflicts with fork 2016-06-20 21:33:34 +02:00
Raimond Garcia
9f195350a3 Merge pull request #1158 from consul/proposal-notification-mailer
Adds info text on proposal notification digest
2016-06-20 18:14:13 +02:00
Alberto Garcia Cabeza
ecd9d514af Improves translation 2016-06-20 16:33:08 +02:00
Alberto Garcia Cabeza
3299b595aa Adds info text on proposal notification digest 2016-06-20 16:28:56 +02:00
Raimond Garcia
6ba532a6db Merge pull request #1153 from consul/no-roadmap
removes deprecated roadmap
2016-06-16 18:56:17 +02:00
Enrique García
588a2d84e4 Merge pull request #1154 from consul/stats
Adds stats for proposal notifications and direct messages
2016-06-16 18:42:10 +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
974d04ca7f Merge branch 'master' of github.com:AyuntamientoMadrid/participacion 2016-06-16 18:23:42 +02:00
Juanjo Bazán
fc1ca8f823 adds doc/locales folder with contributed locales
adds fr & pt-br
2016-06-16 18:23:20 +02:00
rgarcia
32736110f9 adds missing translation 2016-06-16 18:20:14 +02:00
Alberto Garcia Cabeza
352f3fa2f9 Resolves conflicts and improves styles for stats 2016-06-16 18:07:13 +02:00
rgarcia
f9a2f5d5dc adds specs for stats 2016-06-16 17:59:56 +02:00
rgarcia
0abc9c8376 adds stats for direct messages and proposal notifications 2016-06-16 17:42:16 +02:00
Juanjo Bazán
1c4a572993 removes deprecated roadmap
"If you have a roadmap, you are locked in an old version of the future" - David Heinemeier Hansson
2016-06-16 16:58:05 +02:00
Juanjo Bazán
75c6dde8d7 Merge pull request #1152 from consul/direct_message_polish
Direct message polish
2016-06-16 16:38:27 +02:00
Alberto Garcia Cabeza
38fded40d8 Changes translations 2016-06-16 16:22:48 +02:00
rgarcia
d40af1e94c do not display button to send message to myself 2016-06-16 16:05:09 +02:00
rgarcia
8ee7d535ba generic message for max_per_day setting 2016-06-16 15:54:19 +02:00
rgarcia
86fcd4fa76 removes blank space in setting's key 2016-06-16 15:45:33 +02:00
Juanjo Bazán
31fc2ae927 Merge pull request #1151 from consul/admin-styles
Improves styles for admin pages
2016-06-16 14:12:33 +02:00
Alberto Garcia Cabeza
7f20d4eb23 Improves styles for admin pages 2016-06-16 13:44:06 +02:00
Enrique García
5417adee4a Merge pull request #1140 from consul/proposal-notifications
Proposal notifications and Direct Messages
2016-06-16 12:35:37 +02:00
rgarcia
18dd9c95f3 fixes specs 2016-06-16 12:06:26 +02:00
rgarcia
b3fd5e225a Merge branch 'proposal-notifications' of github.com:AyuntamientoMadrid/participacion into proposal-notifications 2016-06-16 11:23:23 +02:00