New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

RTL - Merge conflict #8467

Merged
merged 44 commits into from Nov 6, 2017

Conversation

Projects
None yet
8 participants
@kompilorb
Contributor

kompilorb commented Nov 6, 2017

Questions Answers
Branch? develop
Description? Makes RTL available
Type? new feature
Category? CO
BC breaks?
Deprecations?
Fixed ticket?
How to test? Already tested - #8437

This change is Reviewable

ramtin2025 and others added some commits Aug 10, 2017

Maxime Biloé
Merge pull request #8241 from iPresta/iprestaRtl1
Fix json file and some translation for Persian language
Maxime Biloé
Merge pull request #8242 from iPresta/iprestaRtl2
RTL fix: Add a library to composer.json file
Merge branch 'develop' into rtl
* develop: (113 commits)
  // update version in autoload.php
  BO: Add class to fix input style bug
  // Changelog 1.7.2.1
  CO: replace str_replace by strtr
  CO: optimise sync stock sql
  BO: Compiled assets
  BO: Fix module modal layout
  TE: Add codacy badge in README
  FO: Use PS_GUEST_CHECKOUT_ENABLED ... only in checkout
  BO: wording fix for all plurial
  BO: compile assets
  BO: wording review
  BO: update radio style and fix indent
  BO: change status translations
  BO: files reviews, indent & domain & yoda
  FO: Include new filter in request stock
  FO: add radio button on stock vue
  BO: display product status
  BO: Prepare status infos
  BO: add active filter in stock management
  ...
Merge pull request #8260 from maximebiloe/rtl-remove-css-from-twig
 Remove CSS included directly in twig files
Maxime Biloé
Merge pull request #8243 from iPresta/iprestaRTL3
Add new method to generate RTL stylesheets
Maxime Biloé
Merge pull request #8245 from iPresta/iprestaRTL4
Generate RTL stylsheets when installation language is RTL
Maxime Biloé
Merge pull request #8248 from iPresta/iprestaRTL5
Change CSS files path to RTL stylesheets if needed
Molka DJEMAL
Merge branch 'develop' into rtl
* develop: (28 commits)
  BO: Remove useless JS bootstrap plugin
  CO: fixed issue with empty locale => follow the comment of @maximebiloe
  BO: Compiled assets
  BO: Fix header with new UI Kit
  BO: Fix Quick Access
  BO: Fix margin & padding bootstrap helper
  BO: Fix outline button
  CO: clean return code
  BO: Fix header right
  BO: Replace hidden class by none
  BO: Replace pull class by float
  BO: Compiled assets
  BO: Add missing variables
  BO: Reintroduce cards for module page
  BO: Reintroduce UI Kit variables
  BO: Change path to UI Kit variables into vue files
  BO: Remove CSS includes from twig files
  BO: Fix webpack & JS with new UI Kit
  BO: Replace deprecated size() by length
  BO: Fix breadcrumb
  ...
Merge branch 'develop' into rtl
* develop: (43 commits)
  IN: Adding Japanese to the installer
  CO: build assets
  CO: Fix merge problem
  CO: add export folder to the file .gitignore
  // Changelog 1.7.2.2
  FO: Fixes wrong images on order confirmation page with simple products
  BO: Compiled assets
  BO: Update alert layout
  IN: Insert the default values during installation
  FO: Compiled assets
  FO: Style for delivery information
  FO: Update availability message with the new default ones
  FO: Add delivery information to presented product
  BO: Handle upgrade for delvery fields
  BO: Add fields for delivery
  BO: Fix JS due to GSA removal
  BO: Fix catalog layout
  BO: Rework pagination layout
  BO: Replace btn-invisible by btn-link
  BO: Fix layout with new bootstrap
  ...
Merge pull request #8317 from iPresta/iprestaRTL7
CSS fixtures for Right-to-Left languages
Merge pull request #8249 from iPresta/iprestaRTL6
Display "Generate RTL stylesheets" section
@codacy-bot

This comment has been minimized.

Show comment
Hide comment
@codacy-bot

codacy-bot Nov 6, 2017

Codacy Here is an overview of what got changed by this pull request:

Issues
======
- Added 1
           

Complexity increasing per file
==============================
- classes/Language.php  13
- controllers/admin/AdminThemesController.php  3
- js/admin/tinymce.inc.js  2
- classes/assets/StylesheetManager.php  1
- js/rtl.js  2
         

See the complete overview on Codacy

codacy-bot commented Nov 6, 2017

Codacy Here is an overview of what got changed by this pull request:

Issues
======
- Added 1
           

Complexity increasing per file
==============================
- classes/Language.php  13
- controllers/admin/AdminThemesController.php  3
- js/admin/tinymce.inc.js  2
- classes/assets/StylesheetManager.php  1
- js/rtl.js  2
         

See the complete overview on Codacy

@toutantic toutantic merged commit 2261eb3 into PrestaShop:develop Nov 6, 2017

1 of 2 checks passed

codacy/pr Not so good... This pull request quality could be better.
Details
continuous-integration/travis-ci/pr The Travis CI build passed
Details

@kompilorb kompilorb referenced this pull request Nov 6, 2017

Merged

RTL #8437

@eternoendless eternoendless added this to the 1.7.3.0 milestone Apr 13, 2018

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment