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
929e81a878
Added proposals phase to key dates
2017-09-14 12:49:13 +02:00
BertoCQ
b597395768
Merge pull request #1860 from consul/help-headers
...
Help headers
2017-09-13 19:19:34 +02:00
BertoCQ
440c448ae4
Merge pull request #1862 from wairbut-m2c/iagirre-comments-empty-html
...
Iagirre comments empty html
2017-09-13 19:16:25 +02:00
iagirre
fb5fb866b5
Added space after <% and before %> in order to maintain consistency in the ERB code. Review of PR.
2017-09-13 17:44:11 +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
iagirre
1356ea217b
Erased extra empty HTML for comments without replies. Added .gitignore rules for Netbeans projects
...
Cambios para hacer commit:
modificado: .gitignore
modificado: app/assets/javascripts/comments.js.coffee
modificado: app/views/comments/_comment.html.erb
modificado: spec/features/comments/debates_spec.rb
2017-09-13 13:30:37 +02:00
decabeza
eccbe9f833
makes section header minimal
2017-09-13 13:27:37 +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
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
BertoCQ
4ba232a165
Merge pull request #1842 from consul/poll-subnavigation
...
Polls subnavigation
2017-09-10 20:46:34 +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
503a375b2f
includes question controller name on polls subnavigation
2017-09-08 18:41:46 +02:00
decabeza
3b4e80a34d
improves layout and tables for polls shifts
2017-09-08 16:50:53 +02:00
Bertocq
da3ef02e2f
Correctly indent admin login erb file
2017-09-08 12:45:20 +02:00
Bertocq
e8f95f4b5b
Format link_to consistently
2017-09-08 12:39:23 +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
Raimond Garcia
d01b1476fd
Merge pull request #1833 from rockandror/improve-community
...
Improve community
2017-09-07 11:11:55 +02:00
María Checa
3ff89b2476
CSS minor fix
2017-09-06 20:29:59 +02:00
María Checa
12e6b9e681
Added video link to question public view
2017-09-06 19:11:28 +02:00
María Checa
9f2522c106
Merge branch 'master' into 1677-poll_questions_documents
2017-09-06 18:28:31 +02:00
decabeza
2a389dbb55
removes unnecessary html tag
2017-09-06 18:08:29 +02:00
María Checa
11ab061b9b
Added documents to question view
...
Added same subnavigation as proposals for comments and documents in poll questions.
2017-09-06 17:27:05 +02:00
taitus
f0667937fb
Refactor and extract code to partials.
2017-09-06 14:48:41 +02:00
taitus
9b6b57a24c
Remove all white spaces
2017-09-06 14:12:32 +02:00
taitus
64774b0d2d
Refactor topics controller. Add Common abilities. Add destroy action.
2017-09-06 13:30:12 +02:00
María Checa
4af44a45a1
Documents upload for questions working
2017-09-06 12:00:46 +02:00
taitus
b4a6f664bb
Remove image by default on carousel. Remove duplicate code. Add background when user recomendations is actived
2017-09-05 19:11:32 +02:00
Raimond Garcia
2519f232ab
Merge branch 'master' into user-recomendations
2017-09-05 17:15:42 +02:00
BertoCQ
c6f675ecf2
Merge pull request #1811 from consul/legislation-processes
...
Legislation processes
2017-09-05 17:06:53 +02:00
Bertocq
553348eaad
Convert phase to symbol before comparision for active dates
2017-09-05 16:18:36 +02:00
Raimond Garcia
6f9d48f0eb
Merge branch 'master' into community
2017-09-05 15:40:03 +02:00
Raimond Garcia
c0238c9265
Merge pull request #1777 from consul/poll-shifts
...
Poll shifts
2017-09-05 15:14:46 +02:00
Raimond Garcia
eb4528eaa0
Merge branch 'master' into poll-shifts
2017-09-05 14:45:31 +02:00
decabeza
4b7200f49c
fixes quotes on active class for key dates
2017-09-05 14:38:30 +02:00
decabeza
e20ac83cc9
fixes wrong close tag
2017-09-05 14:29:11 +02:00
taitus
d8e9aad331
Fix community access text.
2017-09-05 12:55:12 +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
