Commit Graph

97 Commits

Author SHA1 Message Date
Angel Perez
ab9d612128 'Proposals' feature can be enabled/disabled
Fixes #1886
2017-11-17 13:10:55 -04:00
Alberto García
164bc19b3e Merge pull request #1906 from consul/1856-legislation_processes_proposals_phase
[WIP] Legislation Process Proposals
2017-10-27 12:41:09 +02:00
decabeza
9ba96becd2 Merge branch 'master' into admin-profiles 2017-10-25 18:29:01 +02:00
decabeza
f0cfe50de4 Merge branch 'master' into 1856-legislation_processes_proposals_phase 2017-10-25 11:52:31 +02:00
decabeza
e0a1a73e0b fixes active class on polls admin menu 2017-10-21 18:20:26 +02:00
decabeza
3b2f3ae40b changes admin menu order 2017-10-21 18:20:09 +02:00
decabeza
c333522b47 improves styles for admin activity views 2017-10-20 10:40:07 +02:00
Bertocq
45d91a7e50 Add Poll booth_assignments and :Poll::BoothAssignment manage routes, actions and views 2017-10-19 19:27:26 +02:00
decabeza
2e6072ef19 adds missing icons on admin menu 2017-10-13 18:54:48 +02:00
María Checa
841ef2a3a2 Merge branch 'master' into 1856-legislation_processes_proposals_phase 2017-10-09 17:19:07 +02:00
María Checa
37c9ca0973 Fixed admin menu 2017-10-06 01:25:41 +02:00
decabeza
d069d903a1 fixes active classes on admin menu 2017-10-05 11:08:45 +02:00
decabeza
9de8ef2e14 sets data-multi-open to false on admin menu 2017-09-25 19:40:24 +02:00
Bertocq
3c2b5281e8 Fix Admin Polls menu active flags 2017-09-22 18:05:53 +02:00
María Checa
2629837306 Fixed admin menu active states 2017-09-22 17:25:33 +02:00
BertoCQ
8cbdc5a6fd Merge pull request #1874 from wairbut-m2c/iagirre-admin-menu-wrongful-active-items
When "Profiles" submenus are selected, the "Site custom" menu doesn't…
2017-09-19 18:52:44 +02:00
iagirre
4bcb9ba81b Extra indentation spaces erased. 2017-09-15 13:19:58 +02:00
iagirre
d629aef3b9 When "Profiles" submenus are selected, the "Site custom" menu doesn't open. Moreover, when "Site custom" submenus are selected, the menu remains opened. 2017-09-15 12:33:31 +02:00
Manuel Lucena
e93ac4e570 20170915 - fixed additional spacing and implemented suggested change of controller conditions 2017-09-15 11:10:48 +02:00
Manuel Lucena
823031af31 20170915 - Fixed behavior for sub menus under legislation section
On branch mlucena-admin-menu
 Changes to be committed:
	modified:   app/views/admin/_menu.html.erb
2017-09-15 10:59:58 +02:00
Manuel Lucena
2c2646d0a7 20170912 - Disabled user questions for polls into budgets view. …
Committer: Manuel Lucena <mlucenap@venet.com.ve>

 On branch mlucena-admin-menu
 Changes to be committed:
	modified:   app/views/admin/_menu.html.erb
2017-09-13 17:40:55 +02:00
rgarcia
0ad24c1080 highlights correct item in admin menu 2017-09-08 22:00:45 +02:00
rgarcia
bf192f3b58 highlights shift's menu instead of booths 2017-08-04 21:27:30 +02:00
Amaia Castro
b616210607 View and search users from admin panel 2017-06-09 17:30:06 +02:00
Amaia Castro
29d994dd4a Rename users to hidden users in admin 2017-06-09 17:19:01 +02:00
rgarcia
1a46b4d4cb fixes conflicts with master 2017-05-31 10:36:38 +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
5aa8017aa8 fixes admin menu active classes 2017-05-24 13:16:12 +02:00
Bertocq
312e229569 Add Administrator management views and en/es translations 2017-05-23 22:50:17 +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
78ab48a7f3 removes duplicate admin menu 2017-05-23 13:58:14 +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
Alberto Garcia Cabeza
cb60fb5a14 changes menu order 2017-04-17 17:48:38 +02:00
Amaia Castro
9e5324cc1b Merge branch 'master' into site-customization 2017-04-07 17:29:33 +02:00
Amaia Castro
c1de2dced4 Custom content blocks for top_links and footer 2017-04-06 17:00:05 +02:00
Amaia Castro
8143fe1037 Site customization: images uploads 2017-04-06 17:00:04 +02:00
Amaia Castro
255b57cc85 Admin for custom pages 2017-04-06 16:25:07 +02:00
Juanjo Bazán
0bd87c7e43 extracts results from admin's poll/show 2017-02-14 14:26:46 +01:00
Juanjo Bazán
2fae5c3b73 makes admin menu aware of recounts 2017-02-14 14:08:19 +01:00
Juanjo Bazán
113f9b32d7 Merge branch 'master' into polls 2017-01-19 16:51:19 +01:00
Amaia Castro
a2a61341fe Merge branch 'master' into legislation-module-stable 2017-01-11 22:54:41 +01:00
Juanjo Bazán
186be1e7cc adds booth_assignments controller to admin menu 2017-01-04 21:00:55 +01:00
Alberto Garcia Cabeza
a511480ce2 improves styles for admin menu 2016-12-28 12:41:04 +01:00
Amaia Castro
a6ceab6d73 Answer legislation questions 2016-12-27 19:49:03 +01:00
Juanjo Bazán
3fc4896529 adds unsettled geozones menu item to admin menu 2016-12-27 18:37:04 +01:00
Juanjo Bazán
5ec12e4b5b Merge branch 'master' into redux-polling 2016-12-27 18:22:06 +01:00
Juanjo Bazán
3ad648dd63 display correct submenu in admin menu 2016-12-27 17:47:54 +01:00
Amaia Castro
04b23cfc7b Merge branch 'master' into legislation-module-stable 2016-12-27 16:43:43 +01:00