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

Merge of "modules/in-bulletin/branches/5.2.x@16540" to "modules/in-bulletin/branches/5.3.x@16521".

Conflicts:

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

[backported] Bug INP-1690 - Remove "Intechnic\" from namespace

Conflicts:

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

Merge of "modules/in-bulletin/branches/5.2.x@16515" to "modules/in-bulletin/branches/5.3.x@16512".

    • -13
    • +13
    ./5.3.x/units/topics/topics_event_handler.php

Bug INP-1577 - CS fix all variable type comment

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

    • -13
    • +13
    ./5.2.x/units/topics/topics_event_handler.php

Merge of "modules/in-bulletin/branches/5.2.x@16488" to "modules/in-bulletin/branches/5.3.x@16505".

Merge of "modules/in-bulletin/releases/5.2.2-B1@16495" to "modules/in-bulletin/branches/5.3.x@16505".

Merge of "modules/in-bulletin/branches/5.2.x@16445" to "modules/in-bulletin/branches/5.3.x@16397".

Conflicts:

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

Bug INP-1552 - Import language pack without overwrite on separate module install

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

Bug: INP-921 - Prepare 5.2.x releases

1. preparing In-Bulletin 5.2.2-B1 release

Merge of "modules/in-bulletin/branches/5.2.x@16384" to "modules/in-bulletin/branches/5.3.x@16368".

Conflicts:

  • units/emoticons/emoticons_config.php
  • units/poll_comments/poll_comments_config.php
  • units/polls/polls_config.php
  • units/posts/post_eh.php
  • units/posts/posts_config.php
  • units/private_messages/private_message_eh.php
  • units/private_messages/private_messages_config.php
  • units/topics/topics_config.php
  • units/topics/topics_event_handler.php
    • -1
    • +38
    ./5.3.x/units/topics/topics_event_handler.php
    • -1
    • +12
    ./5.3.x/units/topics/topics_config.php

Bug INP-1579 - Remove "ItemSQLs" from unit configs

    • -511
    • +523
    ./5.2.x/units/topics/topics_config.php
    • -160
    • +140
    ./5.2.x/units/polls/polls_config.php
    • -8
    • +8
    ./5.2.x/units/helpers/helpers_config.php
    • -87
    • +81
    ./5.2.x/units/posts/posts_config.php

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

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

Fixes MINB-25 - Declare forum user preferences in the "user-profile" unit

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

    • -0
    • +11
    ./5.2.x/units/topics/topics_config.php
    • -0
    • +41
    ./5.2.x/units/topics/topics_event_handler.php

Fixes MINB-26 - Don't persist data for anonymous users

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

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

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

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

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

    • -0
    • +0
    ./5.3.x/install/cache/class_structure.php
    • -0
    • +0
    ./5.3.x/units/topics/TopicReviewRouter.php

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

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

Bug INP-1421 - Integrate Symfony Console Component

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

    • -1
    • +1
    ./5.3.x/install/cache/class_structure.php

Bug INP-1079 - Routing Ideas

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

    • -0
    • +30
    ./5.3.x/units/topics/TopicReviewRouter.php
    • -0
    • +16
    ./5.3.x/install/cache/class_structure.php
    • -0
    • +40
    ./5.3.x/units/topics/TopicRouter.php
    • -4
    • +1
    ./5.3.x/units/topics/topics_config.php

Bug INP-1429 - Class hierarchy analyzer

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

    • -1
    • +101
    ./5.3.x/install/cache/class_structure.php

Bug INP-1422 - Store class map on disk

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

    • -0
    • +1
    ./5.3.x/install/cache/.gitignore
    • -0
    • +25
    ./5.3.x/install/cache/class_structure.php

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