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

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

    • -6
    • +6
    ./units/poll_comments/poll_comment_eh.php
    • -3
    • +3
    ./units/topics/topics_tag_processor.php
    • -13
    • +13
    ./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

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
    ./units/topics/topics_event_handler.php

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

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

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

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

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

Bug INP-1079 - Routing Ideas

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

    • -0
    • +30
    ./units/topics/TopicReviewRouter.php
    • -0
    • +16
    ./install/cache/class_structure.php
    • -0
    • +40
    ./units/topics/TopicRouter.php

Bug INP-1429 - Class hierarchy analyzer

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

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

Bug INP-1422 - Store class map on disk

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

    • -0
    • +1
    ./install/cache/.gitignore
    • -0
    • +25
    ./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".

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

    • -1
    • +1
    ./units/topics/topics_event_handler.php

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

    • -3
    • +18
    ./units/poll_comments/poll_comment_eh.php

Bug INP-1203: OOP unit config creation

    • -13
    • +16
    ./units/topics/topics_event_handler.php
    • -2
    • +4
    ./units/poll_comments/poll_comment_eh.php

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

Commit on behalf of Erik

    • -1
    • +1
    ./admin_templates/topics/topics_edit.tpl

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

    • -0
    • +2
    ./admin_templates/topics/review_edit.tpl
    • -2
    • +4
    ./admin_templates/topics/images_edit.tpl
    • binary
    ./admin_templates/img/toolbar/toolbar-sprite.png
    • -1
    • +1
    ./units/emoticons/emoticons_config.php
    • -1
    • +1
    ./admin_templates/topics/topics_edit.tpl
  1. … 7 more files in changeset.

Bug #0001399: Remove "ItemSQLs" from unit configs

INP-1156

    • -76
    • +77
    ./units/emoticons/emoticons_config.php
    • -160
    • +140
    ./units/polls/polls_config.php
    • -65
    • +65
    ./units/censorship/censorship_config.php
    • -505
    • +517
    ./units/topics/topics_config.php

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

    • -0
    • +114
    ./admin_templates/topics/topics_reviews.tpl
    • -0
    • +107
    ./admin_templates/topics/topics_images.tpl
    • -0
    • +105
    ./admin_templates/topics/topics_relations.tpl
    • -0
    • +84
    ./admin_templates/topics/topics_categories.tpl
    • -0
    • +85
    ./admin_templates/topics/images_edit.tpl
    • -0
    • +72
    ./admin_templates/topics/topics_custom.tpl
    • -0
    • +75
    ./admin_templates/topics/review_edit.tpl
    • -0
    • +104
    ./admin_templates/topics/topics_edit.tpl
  1. … 80 more files in changeset.