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

Merge of "modules/in-bulletin/branches/5.2.x@16097" to "modules/in-bulletin/branches/5.3.x@16105".

Merge of "modules/in-bulletin/releases/5.2.1@16074" to "modules/in-bulletin/branches/5.3.x@15990".

    • -2
    • +2
    ./5.3.x/admin_templates/user_item_tab.tpl
    • -2
    • +2
    ./5.3.x/admin_templates/catalog_tab.tpl

Fixes MINB-22 - Notice, when making a vote on Poll

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

Bug: INP-921 - Prepare 5.2.x releases

1. preparing In-Bulletin 5.2.1 release

Bug INP-1378 - Force escape "m_Get" tag output

    • -2
    • +2
    ./5.2.x/admin_templates/catalog_tab.tpl
    • -2
    • +2
    ./5.2.x/admin_templates/user_item_tab.tpl

Bug INP-1350 - Add the "kUtil::unescape" method

Bug INP-1343 - Move "getRequestProtectedFields" method to "kDBItem" class

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-1204 - Association between e-mail log e-mails and corresponding items from Catalog

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

Merge of "modules/in-bulletin/releases/5.2.1-B2@15768" to "modules/in-bulletin/branches/5.3.x@15694".

Merge of "modules/in-bulletin/releases/5.2.1-RC1@15884" to "modules/in-bulletin/branches/5.3.x@15694".

    • -1
    • +1
    ./5.3.x/units/topics/topics_config.php

Bug INP-1287 - Translate missing phrases

Bug INP-921 - [ONGOING] Prepare 5.2.x releases

Adding 5.2.1-RC1 version.

Fixes MINB-21 - Poll comment validation error not displayed

Bug INP-1255 - Simplified catalog permission system

    • -1
    • +1
    ./5.2.x/units/topics/topics_config.php

Bug INP-1248 - Initial support for namespaced classes in kFactory

Bug INP-1203: OOP unit config creation

    • -21
    • +23
    ./5.3.x/units/helpers/post_helper.php
    • -13
    • +16
    ./5.3.x/units/topics/topics_event_handler.php

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

Commit on behalf of Erik

Merge of "modules/in-bulletin/releases/5.2.1-B1@15630" to "modules/in-bulletin/branches/5.3.x@15655".

1. changes to unit configs were merged incorrectly

Merge of "modules/in-bulletin/releases/5.2.1-B1@15630" to "modules/in-bulletin/branches/5.3.x@15655".

    • -1
    • +3
    ./5.3.x/admin_templates/topics/relations_edit.tpl
    • -9
    • +5
    ./5.3.x/units/topics/topics_config.php
    • -15
    • +15
    ./5.3.x/install/install_data.sql
  1. … 7 more files in changeset.

Bug #0001399: Remove "ItemSQLs" from unit configs

INP-1156

    • -8
    • +8
    ./5.3.x/units/helpers/helpers_config.php
    • -160
    • +140
    ./5.3.x/units/polls/polls_config.php
    • -87
    • +81
    ./5.3.x/units/posts/posts_config.php
    • -505
    • +517
    ./5.3.x/units/topics/topics_config.php

Fixes #0001441: Separate Module Installation with Class Constants in Unit Config

INP-1193

Bug #0001434: Disable html editor for "inp_edit_textarea" block by default

INP-1186

Bug #0001424: Inconsistent naming in "E-mail Templates" section

INP-1177

    • -15
    • +15
    ./5.2.x/install/install_data.sql

Bug #0001423: Function "htmlspecialchars" breaks down UTF-8 encoding

INP-1176

Bug #0001317: Allow to specify what IP address source to use

INP-1080

Bug #0001363: User selector not working

INP-1123

    • -9
    • +5
    ./5.2.x/units/topics/topics_config.php