Skip to content
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

Change of the name and description in the top menu of Form Customization #14353

Closed
wants to merge 39 commits into from
Closed

Change of the name and description in the top menu of Form Customization #14353

wants to merge 39 commits into from

Conversation

Ibochkarev
Copy link
Collaborator

@Ibochkarev Ibochkarev commented Feb 9, 2019

What does it do?

Change of the name and description in the top menu of Form Customization

Why is it needed?

Fix lexicon keys for name and description Form Customization in the top menu

Related issue(s)/PR(s)

#14352

gregcrown and others added 7 commits January 22, 2019 17:16
…paces."

This reverts commit b4612fb.

# Conflicts:
#	core/model/phpthumb/phpthumb.class.php
* '2.x' of ssh://github.com/gregcrown/revolution: (39 commits)
  Fix regression in resourcelist that prevents parents from working correctly
  Improve wording in variables
  Refactored tag input renreder to fix rendering with empty options list
  Fixed issues with tab width and very long strings in the tabs
  Fixing a php error for an invalid id property
  Revert compiled css files
  Small fix
  Fix position slide-in/slide-out button of Resource tree
  Move uri and uri_overide to settings-right-box-left region
  Fix disaligned right column when left column not displayed
  Fix context menu on user page, on "Access Permissions"
  Fixed #12302
  Fix empty Constraint column in FC if constraint value is 0
  Fixed issue #5537
  Don't remove the trailing slash when redirecting to the manager after logging in
  Added explanatory text with MODX tag
  Added explanatory text with MODX tag
  Added explanatory text with MODX tag
  Button style
  Button style
  ...
… modPhpThumb class which is managed by MODx.
Copy link
Contributor

@JoshuaLuckers JoshuaLuckers left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I think the lexicon bespoke_manager and bespoke_manager_desc can be deleted as well.

@Ibochkarev
Copy link
Collaborator Author

@JoshuaLuckers Indeed, these lexicons are not used anywhere else.

@JoshuaLuckers JoshuaLuckers added area-fc Work related to form customization rules pr/review-needed Pull request requires review and testing. labels Feb 10, 2019
@JoshuaLuckers JoshuaLuckers added this to the v2.7.1 milestone Feb 10, 2019
JoshuaLuckers
JoshuaLuckers previously approved these changes Feb 10, 2019
@alroniks alroniks modified the milestones: v2.7.1, v2.7.2 Feb 14, 2019
Jako and others added 8 commits March 5, 2019 23:47
Merge remote-tracking branch 'upstream/pr/14461' into 2.x

* upstream/pr/14461:
  Restore PHP 5.3 compatibility (while dreaming of 7.1)
…ources with spaces in URL's

Merge remote-tracking branch 'upstream/pr/14301' into 2.x

* upstream/pr/14301:
  Removed URL detection from core phpThumb class and moved the logic to modPhpThumb class which is managed by MODx.
  Bugfix for thumbnails not rendering for s3 image URL's with spaces.
  Bugfix for thumbnails not rendering for s3 image URL's with spaces.
* upstream/pr/14460:
  Back to CRLF - if thats the cause of the long diff
  Fix using wrong option for upload_images
* upstream/pr/14357:
  Update modx.panel.context.js
  Fix #14342
Ivan Klimchuk and others added 4 commits March 6, 2019 23:21
* upstream/pr/14433:
  Fix using wrong option
  Check extracted files for allowed extensions by option
@Ibochkarev
Copy link
Collaborator Author

@MarkH please check.

Copy link
Collaborator

@Mark-H Mark-H left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The primary key for installing menu items is the text. I think that means that the current "Manager Customization" menu item would be left in-place, without its lexicon as that's also removed, alongside a new item for FC. That seems to call for an upgrade script that removes the old bespoke_manager menu item on upgrade.

I also think this should be targeting 3.x, not 2.x?

JoshuaLuckers and others added 5 commits April 27, 2019 16:33
Merge remote-tracking branch 'upstream/pr/14477' into 2.x

* upstream/pr/14477:
  Update phpThumb
* upstream/pr/14495:
  Fix lexicon key
  Corrected title in top menu and in section
* upstream/pr/14502:
  Returned a dot at the end for full sentences
  Removed points at the end of descriptions of menu items
* upstream/pr/14553:
  Replaced color with variable
  Added styles for scroll
@Ibochkarev Ibochkarev changed the base branch from 2.x to 3.x May 13, 2019 06:37
@Ibochkarev Ibochkarev changed the base branch from 3.x to 2.x May 13, 2019 06:38
@Ibochkarev Ibochkarev changed the base branch from 2.x to 3.x May 19, 2019 03:51
@Ibochkarev
Copy link
Collaborator Author

This PR I close and create a new 3.x base

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
area-fc Work related to form customization rules pr/review-needed Pull request requires review and testing.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

7 participants