Commit Graph

1803 Commits

Author SHA1 Message Date
María Checa
ac5620c583 Merge branch 'master' into 1856-legislation_processes_proposals_phase 2017-09-21 21:24:56 +02:00
María Checa
ba041f90c8 Removed unnecessary parts in Legislation Proposals 2017-09-21 16:17:11 +02:00
Bertocq
9c6a974bec Fix wrong spectations after final result swap for total result 2017-09-19 18:54:37 +02:00
decabeza
adc71faf1c moves author actions to sidebar on proposal show 2017-09-19 17:30:40 +02:00
María Checa
c1672bdbf4 Legislation proposals adaptation in some models and initializers 2017-09-19 10:10:10 +02:00
Bertocq
a3bf69e78d Remove final result usage on admin poll officer assignments results 2017-09-19 01:13:04 +02:00
Bertocq
851d397395 Replace FinalResult with TotalResult at admin Poll Recounts page 2017-09-19 00:54:46 +02:00
Bertocq
f27fcc7f99 Replace FinalResult with TotalResult at admin BoothAssignment show 2017-09-19 00:45:13 +02:00
Bertocq
8bf0d6f749 Correct i18n tasks config to check for any file under custom language folder 2017-09-15 13:51:04 +02:00
Bertocq
e8d748a881 Add Poll Total recount to officing and admin 2017-09-14 15:33:58 +02:00
Bertocq
f7568a394f Remove officing final recounts controller, spec and view 2017-09-14 13:39:21 +02:00
Bertocq
bae6669165 Remove final recount button from officing 2017-09-14 13:37:47 +02:00
María Checa
0ed6b0da6b Added Legislation Proposals views 2017-09-14 12:52:03 +02:00
María Checa
0245605f19 Added Legislation Proposals controller 2017-09-14 12:51:36 +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
f521a9023b Added Proposal model to Legislation
This new Legislation::Proposal model inherits from the original Proposal, as it will behave in a very similar way.
2017-09-13 15:43:36 +02:00
decabeza
e131fe9992 moves header description to footer 2017-09-13 13:23:41 +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
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
45d2fdd201 adds available booths 2017-09-08 21:59:54 +02:00
decabeza
3b4e80a34d improves layout and tables for polls shifts 2017-09-08 16:50:53 +02:00
Bertocq
90a5053ca8 Correct consul github url on how to use translations 2017-09-08 14:55:08 +02:00
rgarcia
d3890d1432 updates translations 2017-09-07 22:38:54 +02:00
rgarcia
4527236284 adds searching for officers when creating shifts 2017-09-07 22:38:42 +02:00
Bertocq
2fafb067cc Include custom localization folders on i18n config by default 2017-09-07 19:12:42 +02:00
María Checa
355d68c7f8 Added video URL and document to poll question preview 2017-09-07 17:15:20 +02:00
taitus
64774b0d2d Refactor topics controller. Add Common abilities. Add destroy action. 2017-09-06 13:30:12 +02:00
BertoCQ
c6f675ecf2 Merge pull request #1811 from consul/legislation-processes
Legislation processes
2017-09-05 17:06:53 +02:00
Raimond Garcia
6f9d48f0eb Merge branch 'master' into community 2017-09-05 15:40:03 +02:00
Raimond Garcia
eb4528eaa0 Merge branch 'master' into poll-shifts 2017-09-05 14:45:31 +02:00
taitus
62003b3000 Add back link on community show. Add styles on login to create topic. 2017-09-05 12:55:12 +02:00
taitus
47f897840a Refactor translates and indent. 2017-09-05 12:55:12 +02:00
Alessandro Cuoghi
f67f4c85c7 If there is no theme, add text and link. 2017-09-05 12:55:12 +02:00
taitus
6b042de71a Add translates to settings 2017-09-05 12:55:12 +02:00
taitus
54cf210b07 Fix rebase with master. 2017-09-05 12:53:37 +02:00
Alessandro Cuoghi
5f5eaeca4f Correct name in community.yml 2017-09-05 12:52:45 +02:00
taitus
895c942a39 Add community to investments 2017-09-05 12:52:45 +02:00
taitus
4539c5fa00 Refactor and tests. 2017-09-05 12:52:14 +02:00
Alessandro Cuoghi
555c47e012 Clean code. 2017-09-05 12:51:08 +02:00
Alessandro Cuoghi
1c1ac4c1f7 Added translate (most commented) into wide-order-selector 2017-09-05 12:51:08 +02:00
Alessandro Cuoghi
35f6ce4b86 Translate button editar. Activated translations into wide_order_selector. 2017-09-05 12:51:08 +02:00
Alessandro Cuoghi
322ecf4fd5 Changed some translations. 2017-09-05 12:51:08 +02:00
Alessandro Cuoghi
83683eb53f Changed community.yml buttons. 2017-09-05 12:51:08 +02:00
Alessandro Cuoghi
b4cdca215d Added style show community. 2017-09-05 12:51:08 +02:00
Alessandro Cuoghi
ebf62ef08d Show: Created jumbo light and converted plain text to yml. 2017-09-05 12:51:08 +02:00
Alessandro Cuoghi
579a174704 Sidebar: Added button to access the community. Created community.yml. 2017-09-05 12:51:08 +02:00
taitus
43c17c3fc7 Add communities and topics 2017-09-05 12:51:08 +02:00
decabeza
1d17e0cb58 replace header text with back link 2017-09-05 11:50:41 +02:00
Raimond Garcia
ee3b3f2c85 Merge pull request #1809 from rockandror/documentable-ajax
[WIP] Documentable
2017-09-05 11:22:46 +02:00