Commit Graph

10889 Commits

Author SHA1 Message Date
Consul Bot
6b25116865 New translations management.yml (German) 2018-10-20 20:30:34 +02:00
Consul Bot
8360011cac New translations legislation.yml (German) 2018-10-20 20:30:32 +02:00
Consul Bot
4cdcf426f3 New translations settings.yml (German) 2018-10-20 20:20:33 +02:00
Consul Bot
eb05d77823 New translations settings.yml (German) 2018-10-20 20:10:33 +02:00
Consul Bot
7308ea97a2 New translations responders.yml (Italian) 2018-10-19 17:50:45 +02:00
Consul Bot
e0b06380ce New translations seeds.yml (Italian) 2018-10-19 17:40:45 +02:00
Consul Bot
a1ff7d8a49 New translations responders.yml (Italian) 2018-10-19 17:40:43 +02:00
Consul Bot
f363872637 New translations seeds.yml (Italian) 2018-10-19 17:30:41 +02:00
Alberto
7009a21891 Merge pull request #2983 from consul/ui-design
UI design
2018-10-19 13:01:43 +02:00
Consul Bot
4021e0bb2a New translations management.yml (Chinese Simplified) 2018-10-18 23:50:32 +02:00
decabeza
dc5c26856b Removes unnecessary style to orbit slide 2018-10-18 19:40:25 +02:00
decabeza
8964888711 Removes condition to allow images and data equalizer on proposals
The proposal image only can be present if feature :allow_images is enabled, so there is no need to include both conditions. The data-equalizer also is unnecessary because the :thumb image already has an fix height.
2018-10-18 18:40:58 +02:00
decabeza
0c34e66478 Removes styles to fix logo size on devise views 2018-10-18 18:17:22 +02:00
decabeza
7e828d7e94 Removes unnecessary styles for admin budgets groups 2018-10-18 18:16:11 +02:00
decabeza
8535380402 Fixes color of datepicker calendar 2018-10-18 18:15:12 +02:00
decabeza
7a92df8de5 Updates is-active class for view mode 2018-10-18 18:14:39 +02:00
Javi Martín
9352585e14 Ease customization in processes controller
By extracting a method just for the allowed parameters, forks can
customize this method by reopening the class.
2018-10-18 16:52:40 +02:00
Consul Bot
0a2b0971b8 New translations admin.yml (Valencian) 2018-10-18 13:37:56 +02:00
Consul Bot
75af732373 New translations admin.yml (Swedish) 2018-10-18 13:37:39 +02:00
Consul Bot
c14dddd6e4 New translations admin.yml (German) 2018-10-18 13:37:17 +02:00
Consul Bot
44675f00cb New translations admin.yml (Galician) 2018-10-18 13:36:59 +02:00
Consul Bot
c04fdd0769 New translations admin.yml (French) 2018-10-18 13:35:59 +02:00
Consul Bot
a6cafeabab New translations admin.yml (Polish) 2018-10-18 13:35:17 +02:00
Consul Bot
186e768c98 New translations admin.yml (Italian) 2018-10-18 13:34:24 +02:00
Consul Bot
148711e4dd New translations admin.yml (Albanian) 2018-10-18 13:33:16 +02:00
Consul Bot
886e0a9a94 New translations admin.yml (Dutch) 2018-10-18 13:32:20 +02:00
Consul Bot
dcf74875b1 New translations admin.yml (Chinese Simplified) 2018-10-18 13:31:44 +02:00
Consul Bot
b00b2f87fa New translations admin.yml (Chinese Traditional) 2018-10-18 13:31:22 +02:00
Consul Bot
201123a8dd New translations admin.yml (Portuguese, Brazilian) 2018-10-18 13:25:18 +02:00
Consul Bot
abfe588d8c New translations admin.yml (Spanish, Chile) 2018-10-18 13:24:26 +02:00
Alberto
3878946c9e Merge pull request #2823 from consul/remove-guides
Removes guide feature
2018-10-18 13:19:33 +02:00
Consul Bot
8c847f6db2 New translations management.yml (Chinese Simplified) 2018-10-18 07:20:48 +02:00
Consul Bot
83131f46a8 New translations management.yml (Chinese Simplified) 2018-10-18 07:00:44 +02:00
Consul Bot
5293e95d06 New translations management.yml (Chinese Simplified) 2018-10-18 03:10:30 +02:00
Consul Bot
f1ebe46990 New translations management.yml (Chinese Simplified) 2018-10-18 03:00:35 +02:00
Consul Bot
0c649e4914 New translations management.yml (Chinese Simplified) 2018-10-18 02:50:30 +02:00
Consul Bot
e8d352b64b New translations management.yml (Chinese Simplified) 2018-10-18 02:40:33 +02:00
Consul Bot
2cd9f1ea13 New translations management.yml (Chinese Simplified) 2018-10-18 02:30:31 +02:00
Consul Bot
74bcc4c083 New translations mailers.yml (Chinese Simplified) 2018-10-18 02:20:32 +02:00
Consul Bot
0bb3e40d1c New translations mailers.yml (Chinese Simplified) 2018-10-18 02:10:46 +02:00
Consul Bot
d7fa85176d New translations guides.yml (Chinese Simplified) 2018-10-18 02:00:46 +02:00
Consul Bot
f085831701 New translations legislation.yml (Chinese Simplified) 2018-10-18 02:00:44 +02:00
Consul Bot
3a336c989c New translations mailers.yml (Chinese Simplified) 2018-10-18 02:00:43 +02:00
Raimond Garcia
e2e9d8ed60 Merge pull request #2973 from consul/i18n_defensive_spec
[Backport] Fix pluralization spec when using different default locale
2018-10-17 20:26:26 +02:00
Javier Martín
e117218d68 Merge pull request #2977 from consul/backport-reenable_ckeditor_images
Bring back CKEditor images button
2018-10-17 20:21:18 +02:00
Javi Martín
6f96265a0b Bring back CKEditor images button
It was accidentally deleted in commit 914bfa6.

Note the following spec passes on my machine if we add a `sleep 0.1`
call in the `:wait_readable` part of ruby's `Net::Protocol#rbuf_fill`.
Otherwise, it hangs forever after clicking the `.fileupload-file` div,
which closes its window. It might be solved when upgrading rails,
capybara, selenium or chromedriver.

scenario "Allows images in CKEditor", :js do
  visit edit_admin_site_customization_page_path(custom_page)

  within(".ckeditor") do
    within_frame(0) { expect(page).not_to have_css("img") }

    expect(page).to have_css(".cke_toolbar .cke_button__image_icon")
    find(".cke_toolbar .cke_button__image_icon").click
  end

  within_window(window_opened_by { click_link "Browse Server" }) do
    attach_file :file,
                Rails.root.join('spec/fixtures/files/clippy.jpg'),
                visible: false
    find(".fileupload-file").click
  end

  click_link "OK"

  within(".ckeditor") do
    within_frame(0) { expect(page).to have_css("img") }
  end
end
2018-10-17 19:39:37 +02:00
Javier Martín
4f831b9e1d Merge pull request #2976 from consul/backport-1603-fix_flaky_legislation_questions_spec
Fix flaky spec: Admin legislation questions Update Valid legislation question
2018-10-17 19:18:54 +02:00
Javi Martín
893f29a27a Fix flaky legislation question spec
The test was failing sometimes because of the sequence:

within('#side_menu') do
  click_link "Collaborative Legislation"
end

click_link "All"
expect(page).to have_content 'An example legislation process'
click_link 'An example legislation process'

Right after clicking the "Collaborative Legislation" link, the link 'An
example legislation process' is already available. So sometimes Capybara
might click the links "All" and 'An example legislation process' at more
or less the same time, causing the second link not to be correctly
clicked.

Making sure the "All" link doesn't exist anymore we guarantee Capybara
will wait for the previous AJAX request to finish before clicking the
next link.

Note the test to "Create Valid legislation question" is almost identical
but it doesn't fail because it doesn't use Capybara's JavaScript driver.
2018-10-17 15:54:59 +02:00
decabeza
dbf41421ed Removes guide feature 2018-10-17 14:58:29 +02:00
Raimond Garcia
74925a7022 Merge pull request #2964 from consul/i18n_all_language_names
Add all available languages
2018-10-17 13:34:26 +02:00