Skip to content
This repository has been archived by the owner on Aug 8, 2022. It is now read-only.

Commit

Permalink
Merge branch 'backport' into dev/487-document-webdevops
Browse files Browse the repository at this point in the history 
# Conflicts:
#	Documentation/AdministratorManual/Index.rst
  • Loading branch information
@thomaszbz
thomaszbz committed Jun 18, 2017
2 parents 36e9be1 + 02c9322 commit cbf37a6
Show file tree
Hide file tree
Showing 8 changed files with 51 additions and 51 deletions.
2 changes: 1 addition & 1 deletion CHANGELOG.md
View file
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
# MetaSEO - Changelog

Latest version of the [changelog](https://github.com/mblaschke/TYPO3-metaseo/blob/develop/Documentation/ChangeLog/Index.rst)
Latest version of the [changelog](https://github.com/webdevops/TYPO3-metaseo/blob/develop/Documentation/ChangeLog/Index.rst)
2 changes: 1 addition & 1 deletion Classes/Controller/Ajax/AbstractPageSeoController.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -410,7 +410,7 @@ protected function getPageRepository()
/**
* Returns array of classes which contain Ajax controllers with <ajaxPrefix> => <className)
*
* @see {@link https://github.com/mblaschke/TYPO3-metaseo/issues/380}
* @see {@link https://github.com/webdevops/TYPO3-metaseo/issues/380}
*
* @return array
*/
Expand Down
6 changes: 3 additions & 3 deletions Classes/Page/Part/MetatagPart.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -586,7 +586,7 @@ protected function advMetaTags(array &$metaTags, array $pageRecord, $sysLanguage
$metaTags['adv.' . $tagName] = array(
'tag' => 'meta',
'attributes' => array(
'rel' => $tagName, //see https://github.com/mblaschke/TYPO3-metaseo/issues/464
'rel' => $tagName, //see https://github.com/webdevops/TYPO3-metaseo/issues/464
'href' => $tagValue,
),
);
Expand All @@ -600,7 +600,7 @@ protected function advMetaTags(array &$metaTags, array $pageRecord, $sysLanguage
$metaTags['adv.' . $tagName] = array(
'tag' => 'meta',
'attributes' => array(
'rel' => $tagName, //see https://github.com/mblaschke/TYPO3-metaseo/issues/464
'rel' => $tagName, //see https://github.com/webdevops/TYPO3-metaseo/issues/464
'href' => $tagValue,
),
);
Expand Down Expand Up @@ -1248,7 +1248,7 @@ protected function generateLinkMetaTags()

// Only generate up, prev and next if NOT rootpage
// to prevent linking to other domains
// see https://github.com/mblaschke/TYPO3-metaseo/issues/5
// see https://github.com/webdevops/TYPO3-metaseo/issues/5
if (!$currentIsRootpage) {
$startPage = $GLOBALS['TSFE']->cObj->cObjGetSingle('HMENU', $this->tsSetupSeo['sectionLinks.']['start.']);
$startPageUrl = null;
Expand Down
2 changes: 1 addition & 1 deletion Documentation/AdministratorManual/Index.rst
View file
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ Installation via composer
- Make sure that you have TYPO3 CMS installed in composer mode
- `cd` to the path with your `composer.json`
- To install via TER (recommended default), run `composer require typo3-ter/metaseo -o`
- To install via Packagist (for enthusiasts), run `composer require mblaschke/metaseo -o`
- To install via Packagist (for enthusiasts), run `composer require webdevops/metaseo -o`
- If asked for a version constraint, answer with `*`
- Include “static extension template” (Template → Info/Modify → Edit the whole template record → “Include static
(from extensions):” and select “MetaSEO”)
Expand Down
62 changes: 31 additions & 31 deletions Documentation/ChangeLog/Index.rst
View file
Original file line number Diff line number Diff line change
Expand Up @@ -47,22 +47,22 @@ Changelog
| | - Compare and update the database schema in the install tool. |
| | - Page title prefix/suffix inheritance has changed. Please check your titles. |
| | |
| | `Milestone 2.1.0 <https://github.com/mblaschke/TYPO3-metaseo/milestone/5?closed=1>`_ |
| | `Changes in 2.1.0 <https://github.com/mblaschke/TYPO3-metaseo/compare/2.0.4...2.1.0>`_ |
| | `Milestone 2.1.0 <https://github.com/webdevops/TYPO3-metaseo/milestone/5?closed=1>`_ |
| | `Changes in 2.1.0 <https://github.com/webdevops/TYPO3-metaseo/compare/2.0.4...2.1.0>`_ |
+-------------+----------------------------------------------------------------------------------------------------+
| **2.0.4** | **New feature and Bugfix release** (2017-04-15) |
| | |
| | - Sitemap: Tags `lastmod` and `priority` now can be disabled via configuration |
| | |
| | `Milestone 2.0.4 <https://github.com/mblaschke/TYPO3-metaseo/milestone/17?closed=1>`_ |
| | `Changes in 2.0.4 <https://github.com/mblaschke/TYPO3-metaseo/compare/2.0.3...2.0.4>`_ |
| | `Milestone 2.0.4 <https://github.com/webdevops/TYPO3-metaseo/milestone/17?closed=1>`_ |
| | `Changes in 2.0.4 <https://github.com/webdevops/TYPO3-metaseo/compare/2.0.3...2.0.4>`_ |
+-------------+----------------------------------------------------------------------------------------------------+
| **2.0.3** | **New feature and Bugfix release** (2016-12-31) |
| | |
| | - Number of entries shown in sitemap now can be changed via extension manager |
| | |
| | `Milestone 2.0.3 <https://github.com/mblaschke/TYPO3-metaseo/milestone/16?closed=1>`_ |
| | `Changes in 2.0.3 <https://github.com/mblaschke/TYPO3-metaseo/compare/2.0.2...2.0.3>`_ |
| | `Milestone 2.0.3 <https://github.com/webdevops/TYPO3-metaseo/milestone/16?closed=1>`_ |
| | `Changes in 2.0.3 <https://github.com/webdevops/TYPO3-metaseo/compare/2.0.2...2.0.3>`_ |
+-------------+----------------------------------------------------------------------------------------------------+
| **2.0.2** | **Bugfix release** (2016-12-30) |
| | |
Expand All @@ -71,13 +71,13 @@ Changelog
| | - Non-admin backend users can now to edit page properties, if permission is given by TYPO3 |
| | - Link generation (start/prev/next) now uses first element of group for start |
| | |
| | `Milestone 2.0.2 <https://github.com/mblaschke/TYPO3-metaseo/milestone/8?closed=1>`_ |
| | `Changes in 2.0.2 <https://github.com/mblaschke/TYPO3-metaseo/compare/2.0.1...2.0.2>`_ |
| | `Milestone 2.0.2 <https://github.com/webdevops/TYPO3-metaseo/milestone/8?closed=1>`_ |
| | `Changes in 2.0.2 <https://github.com/webdevops/TYPO3-metaseo/compare/2.0.1...2.0.2>`_ |
+-------------+----------------------------------------------------------------------------------------------------+
| **2.0.1** | **Bugfix release** (2016-11-06) |
| | |
| | `Milestone 2.0.1 <https://github.com/mblaschke/TYPO3-metaseo/milestone/7?closed=1>`_ |
| | `Changes in 2.0.1 <https://github.com/mblaschke/TYPO3-metaseo/compare/2.0.0...2.0.1>`_ |
| | `Milestone 2.0.1 <https://github.com/webdevops/TYPO3-metaseo/milestone/7?closed=1>`_ |
| | `Changes in 2.0.1 <https://github.com/webdevops/TYPO3-metaseo/compare/2.0.0...2.0.1>`_ |
+-------------+----------------------------------------------------------------------------------------------------+
| **2.0.0** | **Major release** (2016-03-07) |
| | |
Expand Down Expand Up @@ -108,48 +108,48 @@ Changelog
| | changed to `plugin.metaseo.metaTags.canonicalUrl` |
| | - Changed names of hooks, use camelCase now |
| | |
| | `Milestone 2.0.0 <https://github.com/mblaschke/TYPO3-metaseo/milestone/2?closed=1>`_ |
| | `Changes in 2.0.0 <https://github.com/mblaschke/TYPO3-metaseo/compare/1.0.8...2.0.0>`_ |
| | `Milestone 2.0.0 <https://github.com/webdevops/TYPO3-metaseo/milestone/2?closed=1>`_ |
| | `Changes in 2.0.0 <https://github.com/webdevops/TYPO3-metaseo/compare/1.0.8...2.0.0>`_ |
+-------------+----------------------------------------------------------------------------------------------------+
| **1.0.8** | **Bugfix release** (2014-04-25) |
| | |
| | `Milestone 1.0.8 <https://github.com/mblaschke/TYPO3-metaseo/milestone/4?closed=1>`_ |
| | `Changes in 1.0.8 <https://github.com/mblaschke/TYPO3-metaseo/compare/1.0.7...1.0.8>`_ |
| | `Milestone 1.0.8 <https://github.com/webdevops/TYPO3-metaseo/milestone/4?closed=1>`_ |
| | `Changes in 1.0.8 <https://github.com/webdevops/TYPO3-metaseo/compare/1.0.7...1.0.8>`_ |
+-------------+----------------------------------------------------------------------------------------------------+
| **1.0.7** | **Bugfix release** (2015-04-18) |
| | |
| | `Milestone 1.0.7 <https://github.com/mblaschke/TYPO3-metaseo/milestone/3?closed=1>`_ |
| | `Changes in 1.0.7 <https://github.com/mblaschke/TYPO3-metaseo/compare/1.0.6...1.0.7>`_ |
| | `Milestone 1.0.7 <https://github.com/webdevops/TYPO3-metaseo/milestone/3?closed=1>`_ |
| | `Changes in 1.0.7 <https://github.com/webdevops/TYPO3-metaseo/compare/1.0.6...1.0.7>`_ |
+-------------+----------------------------------------------------------------------------------------------------+
| **1.0.6** | **Bugfix release** (2015-02-26) |
| | |
| | `Milestone 1.0.6 <https://github.com/mblaschke/TYPO3-metaseo/milestone/14?closed=1>`_ |
| | `Changes in 1.0.6 <https://github.com/mblaschke/TYPO3-metaseo/compare/1.0.5...1.0.6>`_ |
| | `Milestone 1.0.6 <https://github.com/webdevops/TYPO3-metaseo/milestone/14?closed=1>`_ |
| | `Changes in 1.0.6 <https://github.com/webdevops/TYPO3-metaseo/compare/1.0.5...1.0.6>`_ |
+-------------+----------------------------------------------------------------------------------------------------+
| **1.0.5** | **Bugfix release** (2014-10-24) |
| | |
| | `Milestone 1.0.5 <https://github.com/mblaschke/TYPO3-metaseo/milestone/1?closed=1>`_ |
| | `Changes in 1.0.5 <https://github.com/mblaschke/TYPO3-metaseo/compare/1.0.4...1.0.5>`_ |
| | `Milestone 1.0.5 <https://github.com/webdevops/TYPO3-metaseo/milestone/1?closed=1>`_ |
| | `Changes in 1.0.5 <https://github.com/webdevops/TYPO3-metaseo/compare/1.0.4...1.0.5>`_ |
+-------------+----------------------------------------------------------------------------------------------------+
| **1.0.4** | **Bugfix release** (2014-09-15) |
| | |
| | `Milestone 1.0.4 <https://github.com/mblaschke/TYPO3-metaseo/milestone/13?closed=1>`_ |
| | `Changes in 1.0.4 <https://github.com/mblaschke/TYPO3-metaseo/compare/1.0.3...1.0.4>`_ |
| | `Milestone 1.0.4 <https://github.com/webdevops/TYPO3-metaseo/milestone/13?closed=1>`_ |
| | `Changes in 1.0.4 <https://github.com/webdevops/TYPO3-metaseo/compare/1.0.3...1.0.4>`_ |
+-------------+----------------------------------------------------------------------------------------------------+
| **1.0.3** | **Bugfix release** (2014-09-10) |
| | |
| | `Milestone 1.0.3 <https://github.com/mblaschke/TYPO3-metaseo/milestone/12?closed=1>`_ |
| | `Changes in 1.0.3 <https://github.com/mblaschke/TYPO3-metaseo/compare/1.0.2...1.0.3>`_ |
| | `Milestone 1.0.3 <https://github.com/webdevops/TYPO3-metaseo/milestone/12?closed=1>`_ |
| | `Changes in 1.0.3 <https://github.com/webdevops/TYPO3-metaseo/compare/1.0.2...1.0.3>`_ |
+-------------+----------------------------------------------------------------------------------------------------+
| **1.0.2** | **Bugfix release** (2014-09-04) |
| | |
| | `Milestone 1.0.2 <https://github.com/mblaschke/TYPO3-metaseo/milestone/11?closed=1>`_ |
| | `Changes in 1.0.2 <https://github.com/mblaschke/TYPO3-metaseo/compare/1.0.1...1.0.2>`_ |
| | `Milestone 1.0.2 <https://github.com/webdevops/TYPO3-metaseo/milestone/11?closed=1>`_ |
| | `Changes in 1.0.2 <https://github.com/webdevops/TYPO3-metaseo/compare/1.0.1...1.0.2>`_ |
+-------------+----------------------------------------------------------------------------------------------------+
| **1.0.1** | **Bugfix release** (2014-09-03) |
| | |
| | `Milestone 1.0.1 <https://github.com/mblaschke/TYPO3-metaseo/milestone/10?closed=1>`_ |
| | `Changes in 1.0.1 <https://github.com/mblaschke/TYPO3-metaseo/compare/1.0.0...1.0.1>`_ |
| | `Milestone 1.0.1 <https://github.com/webdevops/TYPO3-metaseo/milestone/10?closed=1>`_ |
| | `Changes in 1.0.1 <https://github.com/webdevops/TYPO3-metaseo/compare/1.0.0...1.0.1>`_ |
+-------------+----------------------------------------------------------------------------------------------------+
| **1.0.0** | **Major release** (2014-08-31) |
| | |
Expand All @@ -159,10 +159,10 @@ Changelog
| | - Fixed and improved documentation (now reStructuredText) |
| | - Fixed sitemap url generation in TYPO3 scheduler |
| | |
| | `Milestone 1.0.0 <https://github.com/mblaschke/TYPO3-metaseo/milestone/9?closed=1>`_ |
| | `Milestone 1.0.0 <https://github.com/webdevops/TYPO3-metaseo/milestone/9?closed=1>`_ |
+-------------+----------------------------------------------------------------------------------------------------+


Latest information also is available in the list of
`milestones <https://github.com/mblaschke/TYPO3-metaseo/milestones>`_ and tagged
`releases <https://github.com/mblaschke/TYPO3-metaseo/releases>`_.
`milestones <https://github.com/webdevops/TYPO3-metaseo/milestones>`_ and tagged
`releases <https://github.com/webdevops/TYPO3-metaseo/releases>`_.
2 changes: 1 addition & 1 deletion Documentation/Introduction/Index.rst
View file
Original file line number Diff line number Diff line change
Expand Up @@ -137,7 +137,7 @@ Found a bug?
------------

Just send a mail to [email protected]
or file an issue at `github <https://github.com/mblaschke/TYPO3-metaseo>`_
or file an issue at `github <https://github.com/webdevops/TYPO3-metaseo>`_
or ask MetaSEO's `slack channel <https://typo3.slack.com/messages/ext-metaseo/>`_

Thanks to...
Expand Down
2 changes: 1 addition & 1 deletion Documentation/Settings.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ conf.py:
version: 3.0
release: 3.0.0
html_theme_options:
github_repository: mblaschke/TYPO3-metaseo
github_repository: webdevops/TYPO3-metaseo
github_branch: develop
latex_documents:
- - Index
Expand Down
Loading

0 comments on commit cbf37a6

Please sign in to comment.