Commit Graph

1004 Commits

Author SHA1 Message Date
rgarcia
560ff7c51d does not use custom implementation to disable submit button 2017-10-13 12:40:42 +02:00
iagirre
2b10b59e2a Order in the admin page using jquery-ui sortable widget. 2017-10-10 16:38:29 +02:00
decabeza
b95dc572c5 improves answer description height to avoid texts cuts 2017-10-10 12:53:10 +02:00
Alberto García
bd62af9eb7 Merge pull request #2014 from consul/poll_ui_fixes
Polls UI fixes
2017-10-07 21:18:48 +02:00
María Checa
316ba37d91 Requested changes 2017-10-07 20:27:44 +02:00
decabeza
5b80d8893e shows always orbit next and previous arrows 2017-10-07 19:38:44 +02:00
decabeza
71d785ba78 improves polls index view on mobile version 2017-10-07 19:38:17 +02:00
decabeza
b06102fb79 adds image rendering on gallery images 2017-10-07 19:37:51 +02:00
María Checa
65f5c9efa9 Changed token message background color 2017-10-07 19:21:27 +02:00
Raimond Garcia
2e4ce39722 Merge pull request #1994 from consul/feature/1985#voting_token
Voter Answer unique Token
2017-10-07 16:54:01 +02:00
decabeza
e7716ca4b3 makes darker border answer divider 2017-10-07 11:56:34 +02:00
decabeza
a5d3d5d239 adds links to read more and less for answer description 2017-10-07 11:53:34 +02:00
María Checa
e127b52225 Minor fixes 2017-10-07 11:37:33 +02:00
decabeza
732fb70730 makes answers buttons width 100% on mobile size 2017-10-07 03:03:17 +02:00
decabeza
cd495c80fe changes border right to bottom when expand gallery 2017-10-07 02:08:01 +02:00
María Checa
cc2da735c7 Set token to 64 characters 2017-10-06 21:47:46 +02:00
María Checa
7e11a48f00 Fixed token message 2017-10-06 21:14:19 +02:00
María Checa
34cd8d8b98 Fixed token message 2017-10-06 20:59:25 +02:00
María Checa
bcfd1a844a Poll voter token 2017-10-06 20:44:47 +02:00
decabeza
de27530621 improves polls gallery partial 2017-10-05 11:46:21 +02:00
decabeza
2e8922459d adds line break on css 2017-10-05 11:08:12 +02:00
BertoCQ
9ab22870cc Merge pull request #1971 from consul/polls-show
Polls show
2017-10-04 14:20:50 +02:00
BertoCQ
05df996078 Merge pull request #1970 from consul/minor-fixes
Minor fixes
2017-10-04 12:55:08 +02:00
decabeza
a318b82159 fixes lint warnings 2017-10-04 11:47:31 +02:00
decabeza
e4205dc22a includes poll image on polls index 2017-10-04 11:40:20 +02:00
decabeza
c9e8152ead includes lorem content and images to answers 2017-10-04 10:12:54 +02:00
decabeza
cfbc5db9af adds zoom icons and texts 2017-10-04 10:12:54 +02:00
decabeza
639f24e316 adds foundation orbit components and customise them 2017-10-04 10:12:54 +02:00
decabeza
87676f5296 include lorem ipsum content on polls show 2017-10-04 10:12:54 +02:00
decabeza
1b3cdc181d improves polls show layout 2017-10-04 10:12:54 +02:00
decabeza
c32a70d2a9 improves css for items on list with images 2017-10-03 13:57:01 +02:00
decabeza
d39c2c6e9e cleans css format 2017-10-03 13:55:59 +02:00
decabeza
894bda92ba moves custom setting to consul settings css 2017-10-03 13:53:57 +02:00
BertoCQ
3835821871 Merge branch 'master' into iagirre-admin-polls-section 2017-10-02 22:25:09 +02:00
BertoCQ
356eb4ca8a Merge pull request #1959 from consul/polls-index
Polls index view
2017-10-02 21:42:59 +02:00
BertoCQ
1b4f6d5cae Merge pull request #1938 from consul/imageable-polish
Imageable polish
2017-10-02 21:42:15 +02:00
iagirre
166caa3b4c Deleted code in views and concerns that lets polls have more images and documentes attached, like it was at first.
Added missing text for english and new texts in english and spanish.

 Cambios para hacer commit:
	modificado:    app/assets/stylesheets/participation.scss
	modificado:    app/models/concerns/imageable.rb
	modificado:    app/models/poll.rb
	modificado:    app/views/admin/poll/polls/_form.html.erb
	modificado:    app/views/images/_admin_image.html.erb
	modificado:    config/locales/en/images.yml
	modificado:    config/locales/es/admin.yml
	modificado:    config/locales/es/images.yml
	modificado:    spec/features/admin/poll/polls_spec.rb
2017-10-02 12:59:26 +02:00
decabeza
f497227e3f improves layout for polls index view 2017-10-02 12:24:31 +02:00
Raimond Garcia
f68d86a2e5 Merge pull request #1824 from rockandror/user-recomendations
User recomendations
2017-09-29 19:02:03 +02:00
iagirre
c67620fdef Table for links added (links to add images/documents).
Custom partial for admins upload image created, so that it can be reused in upload images and documents.
2017-09-29 14:51:49 +02:00
decabeza
f44f3f5bc1 fixes css to shows error messages correctly 2017-09-28 17:52:28 +02:00
Alessandro Cuoghi
20fd176b6a Change again margin-top to button.hollow 2017-09-28 17:13:45 +02:00
Alessandro Cuoghi
4eee5f6eba Fixed orbit-bullets. Decreased margin-top to button.hollow.expanded. 2017-09-28 17:03:50 +02:00
decabeza
876a2b530b fixes lint warnings 2017-09-28 16:03:08 +02:00
decabeza
8aaa0cb718 adds data equalizer to fix height on items with images 2017-09-28 15:20:00 +02:00
Senén Rodero Rodríguez
92c774cdeb Merge with master 2017-09-28 13:36:20 +02:00
BertoCQ
121109f967 Merge branch 'master' into feature/1924#poll_shifts_creation 2017-09-28 13:03:34 +02:00
Raimond Garcia
e590e31053 Merge pull request #1864 from rockandror/maps-frontend
Maps frontend
2017-09-28 12:53:17 +02:00
María Checa
08cdf93ecc Switch date selects for shift tasks 2017-09-28 10:40:48 +02:00
decabeza
fff643db8c improves delete image button on proposal show 2017-09-28 09:16:08 +02:00