Checkout Tools
  • last updated a few seconds ago
Constraints
Constraints: committers
 
Constraints: files
Constraints: dates

Merge of "modules/in-news/branches/5.2.x@16543" to "modules/in-news/branches/5.3.x@16524".

Conflicts:

  • install/install_data.sql
  • install/upgrades.sql

Merge of "modules/in-news/branches/5.2.x@16518" to "modules/in-news/branches/5.3.x@16508".

Conflicts:

  • units/articles/articles_event_handler.php

Merge of "modules/in-news/branches/5.2.x@16487" to "modules/in-news/branches/5.3.x@16400".

Merge of "modules/in-news/releases/5.2.2-B1@16497" to "modules/in-news/branches/5.3.x@16400".

Conflicts:

  • install/upgrades.php
  • install/upgrades.sql

Merge of "modules/in-news/branches/5.2.x@16387" to "modules/in-news/branches/5.3.x@16394".

Conflicts:

  • units/articles/articles_config.php

Merge of "modules/in-news/releases/5.2.1-B1@15629" to "modules/in-news/branches/5.3.x@15658".

1. restored changes, that were lost during inaccurate merge conflict resolution

Fixes INP-1554 - Allow searching category items by meta fields

Differential Revision: http://qa.in-portal.org/D217

Bug INP-1511 - Presets for category items export

Differential Revision: http://qa.in-portal.org/D162

    • -0
    • +12
    ./units/articles/articles_config.php

Bug INP-1481 - Add missing "svn:keywords" properties to PHP files (5.3.x)

Differential Revision: http://qa.in-portal.org/D134

    • -0
    • +0
    ./units/articles/ArticleReviewRouter.php

Bug INP-1459 - Remove "Intechnic\" from namespace

Differential Revision: http://qa.in-portal.org/D108

Merge of "modules/in-news/branches/5.2.x@16147" to "modules/in-news/branches/5.3.x@16187".

Bug INP-1421 - Integrate Symfony Console Component

Differential Revision: http://qa.in-portal.org/D76

Bug INP-1079 - Routing Ideas

Differential Revision: http://qa.in-portal.org/D72

    • -0
    • +40
    ./units/articles/ArticleRouter.php
    • -0
    • +16
    ./install/cache/class_structure.php
    • -0
    • +30
    ./units/articles/ArticleReviewRouter.php

Bug INP-1429 - Class hierarchy analyzer

Differential Revision: http://qa.in-portal.org/D70

    • -1
    • +31
    ./install/cache/class_structure.php

Bug INP-1422 - Store class map on disk

Differential Revision: http://qa.in-portal.org/D68

    • -0
    • +15
    ./install/cache/class_structure.php
    • -0
    • +1
    ./install/cache/.gitignore

Merge of "modules/in-news/releases/5.2.1@16072" to "modules/in-news/branches/5.3.x@15993".

Bug INP-1290 - Deal with "svn:ignore" attributes

Bug INP-1316 - Add primary key to table, that don't have it

Commit on behalf of Erik

Bug INP-1298 - Use "http_build_query" to escape url parameters

Bug INP-1274 - Move deployment script log to database

Bug INP-1302 - Use build-in date manipulation functions instead of adodb library

Merge of "modules/in-news/releases/5.2.1-B2@15767" to "modules/in-news/branches/5.3.x@15809".

Merge of "modules/in-news/releases/5.2.1-RC1@15883" to "modules/in-news/branches/5.3.x@15809".

Bug INP-1280 - Ensure presence of 'parent_event' parameter in majority kTempTablesHandler usages

Bug INP-1203: OOP unit config creation

Bug INP-1174: Using CodeMirror on SQL Query page in Admin

Commit on behalf of Erik

Merge of "modules/in-news/releases/5.2.1-B1@15629" to "modules/in-news/branches/5.3.x@15658".

    • -0
    • +2
    ./admin_templates/articles/file_edit.tpl
    • -0
    • +2
    ./admin_templates/articles/review_edit.tpl
    • -3
    • +5
    ./admin_templates/articles/images_edit.tpl
    • binary
    ./admin_templates/img/toolbar/toolbar-sprite.png

Bug #0001399: Remove "ItemSQLs" from unit configs

INP-1156

    • -497
    • +504
    ./units/articles/articles_config.php

Releasing version 'branches/5.3.x' (copy from 'branches/5.2.x') of 'modules/in-news' module.

    • -0
    • +14
    ./admin_templates/export_progress.tpl
    • -0
    • +14
    ./admin_templates/import_progress.tpl
    • -0
    • +28
    ./admin_templates/category_properties.tpl
    • -0
    • +66
    ./admin_templates/articles/file_edit.tpl
    • -0
    • +114
    ./admin_templates/articles/articles_reviews.tpl
    • -0
    • +85
    ./admin_templates/articles/images_edit.tpl
  1. … 41 more files in changeset.