Commit Graph

1687 Commits

Author SHA1 Message Date
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
Bertocq
e8d748a881 Add Poll Total recount to officing and admin 2017-09-14 15:33: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
María Checa
c811fd46f0 Proposals description migration and form
- Added to legislation processes a new attribute called `proposals_description`.
- Then created new views to show a form for the `@process` to edit this attribute **from in the proposals section**.
- Completed translations for new views.
2017-09-13 15:48:07 +02:00
María Checa
dc9fe973f4 Added proposals phase attributes to legislation processes form
Also added them to the list of accepted params and completed translations.
2017-09-13 12:33:16 +02:00
decabeza
7aa876f0a7 avoids button overflow on admin tags table 2017-09-12 21:36:24 +02:00
BertoCQ
fa8b9a69a3 Merge branch 'master' into polls-persist-officer-data 2017-09-11 00:11:36 +02:00
BertoCQ
1ced54f0e3 Merge pull request #1835 from consul/1677-poll_questions_documents
Poll questions document and video
2017-09-11 00:08:31 +02:00
BertoCQ
dd02c83fa3 Merge branch 'master' into poll-shifts-search-officers 2017-09-11 00:07:12 +02:00
rgarcia
0ad24c1080 highlights correct item in admin menu 2017-09-08 22:00:45 +02:00
rgarcia
47564a91a0 persist a shift's officer data 2017-09-08 20:08:45 +02:00
decabeza
3b4e80a34d improves layout and tables for polls shifts 2017-09-08 16:50:53 +02:00
rgarcia
4527236284 adds searching for officers when creating shifts 2017-09-07 22:38:42 +02:00
María Checa
355d68c7f8 Added video URL and document to poll question preview 2017-09-07 17:15:20 +02:00
María Checa
9f2522c106 Merge branch 'master' into 1677-poll_questions_documents 2017-09-06 18:28:31 +02:00
taitus
9b6b57a24c Remove all white spaces 2017-09-06 14:12:32 +02:00
María Checa
4af44a45a1 Documents upload for questions working 2017-09-06 12:00:46 +02:00
Raimond Garcia
6f9d48f0eb Merge branch 'master' into community 2017-09-05 15:40:03 +02:00
taitus
43c17c3fc7 Add communities and topics 2017-09-05 12:51:08 +02:00
rgarcia
9181610de9 removes obsolete code 2017-08-04 21:27:30 +02:00
rgarcia
bf192f3b58 highlights shift's menu instead of booths 2017-08-04 21:27:30 +02:00
rgarcia
456429f08b adds shifts 2017-08-04 21:27:30 +02:00
decabeza
98961748ad replaces more old back link partial to new back_link_to helper 2017-07-27 00:26:39 +02:00
decabeza
6c5513ab38 replaces back_link partial to back_link_to helper 2017-07-26 18:22:45 +02:00
decabeza
0b235d69d4 adds consistency for back links 2017-07-26 18:18:30 +02:00
Bertocq
361e0efe00 Remove Poll Recount model and all usages 2017-07-23 23:29:24 +02:00
Bertocq
d98425f45b Remove daily officer recounts from admin poll recounts list 2017-07-23 23:28:38 +02:00
Bertocq
741a342bb0 Restrict compatilibility edit on admin investment form
Why:

* A non-winner but compatible investment shouldn't be marked as incompatible

How:

* Show incompatilibility checkbox only if investment is winner or incompatible
2017-07-10 17:34:05 +02:00
Bertocq
343da2d58e Improve admin investment view with selection/compatibility/winner flags on top 2017-07-05 11:26:59 +02:00
Bertocq
e35817f240 Add selected checkbox on admin investment form 2017-07-04 23:48:18 +02:00
Raimond Garcia
e7e5b3c4a3 Merge branch 'master' into 1647-locale_site_customization 2017-07-04 12:11:07 +02:00
Bertocq
688ec05ea2 Replace winner column for incompatible on admin investment list filter by selected 2017-07-04 01:34:24 +02:00
Bertocq
646b3657ee Add investment status on admin budget investment detail show page 2017-07-04 01:34:24 +02:00
Bertocq
afc77f68fb Add incompatible checkbox on admin investment edit form 2017-07-04 01:34:24 +02:00
María Checa
ecaf7192c5 Merge branch '1647-locale_site_customization' of https://github.com/MariaCheca/consul into 1647-locale_site_customization 2017-07-03 12:59:09 +02:00
María Checa
3e2cbabc9c Locales helper improvement
Added a rescue block in `name_for_locale()` to ensure the application doesn't crash in case it receives an invalid locale.
2017-07-03 12:55:22 +02:00
María Checa
36d51b380b Merge branch 'master' into 1647-locale_site_customization 2017-07-02 23:19:40 +02:00
María Checa
6f24c68ab5 Improved pages index
Locale can be seen as text instead of the code.
2017-07-02 23:12:47 +02:00
María Checa
8894ec4f7c Pages form improvements
Added `locale` validation to model and improved its form select tag performance.
2017-07-02 21:28:13 +02:00
María Checa
720a2af046 Update pages controller and views
Added new attribute `locale` to pages index list and form.
2017-07-02 14:49:56 +02:00
Eduardo Martinez Echevarria
dfa9c988ad Add checkbox to set published in process admin management 2017-06-30 15:08:23 +02:00
Raimond Garcia
22d28d9c79 Merge branch 'master' into issue#1575-tag-administration 2017-06-29 19:09:54 +02:00
Bertocq
57f476c2fa Merge branch 'master' into feature/add_population_to_budget_heading 2017-06-27 18:43:24 +02:00
decabeza
af7807ce9f Updates custom note class to foundation help-text 2017-06-27 10:29:36 +02:00
Juanjo Bazán
6eca11f993 Merge pull request #1700 from consul/timeline
Budgets investments timeline
2017-06-26 18:02:03 +02:00
Raimond Garcia
f41d3637cf Merge pull request #1678 from consul/feature/1601#budget_winner_investments_button
Add button to Calculate Budget Winner investments
2017-06-26 17:41:08 +02:00
decabeza
4db83e7305 makes milestones textarea form bigger 2017-06-26 16:37:55 +02:00