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

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
    • -13
    • +15
    ./articles/articles_event_handler.php
  1. … 2 more files in changeset.

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
  1. … 2 more files in changeset.

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

Bug INP-1511 - Presets for category items export

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

  1. … 1 more file in changeset.

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

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

  1. … 1 more file in changeset.

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

  1. … 1 more file in changeset.

Bug INP-1079 - Routing Ideas

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

    • -0
    • +40
    ./articles/ArticleRouter.php
    • -0
    • +30
    ./articles/ArticleReviewRouter.php
  1. … 1 more file in changeset.

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

  1. … 5 more files in changeset.

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

  1. … 2 more files in changeset.

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".

  1. … 7 more files in changeset.

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

Bug INP-1203: OOP unit config creation

    • -35
    • +54
    ./articles/articles_event_handler.php
  1. … 1 more file in changeset.

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

  1. … 10 more files in changeset.

Bug #0001399: Remove "ItemSQLs" from unit configs

INP-1156

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

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

    • -0
    • +33
    ./articles/articles_tag_processor.php
    • -0
    • +575
    ./articles/articles_event_handler.php
  1. … 50 more files in changeset.