Commit Graph

1552 Commits

Author SHA1 Message Date
rgarcia
1a46b4d4cb fixes conflicts with master 2017-05-31 10:36:38 +02:00
Juanjo Bazán
2382dc56b5 fixes wording 2017-05-30 10:46:34 +02:00
Juanjo Bazán
1ae55a59f6 Merge pull request #1560 from bertocq/feature/admin_administrators_management
Administrators management in admin area
2017-05-30 10:44:50 +02:00
decabeza
0e581896c0 improves message when not enough money 2017-05-26 17:12:21 +02:00
decabeza
a49b206b42 adds help message to how change ballot 2017-05-26 14:55:27 +02:00
Bertocq
fe5ddd019b Add logic to prevent the current user from removing himself from the administrator list, and a flash error notice for that scenario 2017-05-25 11:29:39 +02:00
Juanjo Bazán
26b186a740 Merge pull request #1557 from bertocq/feature/newsletter_users_emails_zip
Allow admins to download Newsletter's users emails list in zip
2017-05-24 13:13:34 +02:00
Bertocq
7cc1745a29 Add missing Admin menu administrator translation 2017-05-24 00:00:44 +02:00
Bertocq
115feb20ae Fix admin translations for administrators management panel actions 2017-05-23 23:33:50 +02:00
Bertocq
cafb6837d6 Fix trailing single quote on admin english translations 2017-05-23 23:29:12 +02:00
Bertocq
312e229569 Add Administrator management views and en/es translations 2017-05-23 22:50:17 +02:00
Bertocq
9506855a44 Add Admin Administrator route, controller and manage ability for admin users 2017-05-23 22:49:44 +02:00
decabeza
d28c45a926 adds missing i18n keys 2017-05-23 18:38:59 +02:00
Alberto Garcia Cabeza
04c33d1327 Improves styles for admin newsletters 2017-05-23 16:49:11 +02:00
rgarcia
9110fdad3a adds translations 2017-05-23 16:46:16 +02:00
rgarcia
2a7ff2270e sends zip file with test data 2017-05-23 16:45:34 +02:00
decabeza
c7bdad791e removes key dates svg text 2017-05-23 11:50:11 +02:00
decabeza
5e0d5fc8c3 Merge branch 'legislation-module-stable' of https://github.com/medialab-prado/consul into medialab-legislation 2017-05-22 18:43:49 +02:00
decabeza
b42533062e Improves styles and i18n for budget results 2017-05-19 17:32:10 +02:00
rgarcia
0b68f3c619 cleans up 2017-05-19 14:07:30 +02:00
rgarcia
ed5a1cecbb adds budget results 2017-05-19 14:04:46 +02:00
decabeza
f4c1c556af adds telegram setting and include on footer 2017-05-16 18:03:48 +02:00
rgarcia
cf5234d6f5 Update link text to unselected investments 2017-05-14 18:18:10 +02:00
Alberto
b6eaaea62e Merge pull request #1535 from consul/sidebar-msg
Proper message in sidebar depending on user's ballot status
2017-05-12 19:49:05 +02:00
decabeza
962dd097b7 fixes i18n 2017-05-12 19:12:19 +02:00
decabeza
e8be4508fd improves i18n of budgets mailers 2017-05-12 18:50:03 +02:00
Juanjo Bazán
0395970b24 uses proper i18n key 2017-05-12 14:06:16 +02:00
rgarcia
712e576e75 adds email delivery of selected and unselected investments 2017-05-12 13:57:31 +02:00
decabeza
53d3282d8b adds budget mailer for selected and unselected 2017-05-12 12:43:30 +02:00
Juanjo Bazán
224eb03ca2 shows right message depending on voting status in budget group 2017-05-12 12:03:42 +02:00
decabeza
cd4d37470b removes bold on links and make consistent text 2017-05-11 17:24:39 +02:00
decabeza
36078ab604 adds link and move to top sidebar message 2017-05-11 17:24:05 +02:00
decabeza
ebdb265388 changes add button text to vote 2017-05-11 13:36:29 +02:00
Juanjo Bazán
3b90a40476 changes copy
proposal -> investment
2017-05-10 12:20:38 +02:00
Juanjo Bazán
4ae6ec75e7 adds links in ballot view to no voted groups 2017-05-09 11:27:07 +02:00
Alberto Garcia Cabeza
6ab6986d9e adds unselected investment link 2017-05-05 19:07:37 +02:00
Alberto Garcia Cabeza
98a76a1ae5 show price on index/show if feasible && selected 2017-05-05 17:14:54 +02:00
rgarcia
012d5297ed removes capistrano template configuration 2017-05-04 01:21:08 +02:00
Juanjo Bazán
29e5cff13f updates capistrano 2017-05-01 12:20:52 +02:00
Enrique García
453dd2e8a7 Merge pull request #1506 from consul/support-column
add total supports to admin's budget investments list
2017-04-28 15:03:48 +02:00
Juanjo Bazán
23c05dcac5 adds supports column to admin's budget investments list 2017-04-28 13:45:24 +02:00
Juanjo Bazán
08591645f9 Merge pull request #1505 from consul/design
Design
2017-04-28 13:34:25 +02:00
Alberto Garcia Cabeza
73e46bf3f1 removes old back links 2017-04-28 13:04:23 +02:00
Alberto Garcia Cabeza
80279ca638 improves admin banners index page 2017-04-28 12:44:38 +02:00
Alberto Garcia Cabeza
078d8da30d changes page paths on sitemap.rb 2017-04-27 16:37:41 +02:00
Juanjo Bazán
e60ee138b0 Merge pull request #1500 from consul/budgets-stats
adds budgets on admin stats
2017-04-26 14:09:56 +02:00
Alberto Garcia Cabeza
96a54397ab fixes typo on pages.en.yml 2017-04-26 12:30:37 +02:00
Alberto Garcia Cabeza
45af9ce5aa adds budget investments numbers and chart on admin stats 2017-04-25 16:46:20 +02:00
Alberto Garcia Cabeza
13c5eb9812 improves valuation budget investment form 2017-04-24 13:03:09 +02:00
Alberto Garcia Cabeza
d8bc2ef67d changes name of budgets menu 2017-04-24 12:52:45 +02:00