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

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

    • -13
    • +13
    ./topics/topics_event_handler.php
    • -11
    • +11
    ./private_messages/private_message_eh.php
    • -3
    • +3
    ./private_message_body/private_message_body_eh.php
    • -5
    • +5
    ./private_messages/private_message_tp.php
  1. … 2 more files in changeset.

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
    • -0
    • +4
    ./private_messages/private_message_eh.php
  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.

Bug INP-1079 - Routing Ideas

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

    • -0
    • +30
    ./topics/TopicReviewRouter.php
    • -0
    • +40
    ./topics/TopicRouter.php
  1. … 1 more file in changeset.

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

  1. … 1 more file in changeset.

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

    • -2
    • +2
    ./private_messages/private_message_eh.php
  1. … 5 more files in changeset.

Bug INP-1204 - Association between e-mail log e-mails and corresponding items from Catalog

    • -1
    • +1
    ./private_messages/private_message_eh.php

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

  1. … 2 more files in changeset.

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
    ./poll_comments/poll_comment_eh.php
  1. … 6 more files in changeset.

Bug INP-1203: OOP unit config creation

    • -6
    • +7
    ./private_messages/private_message_eh.php
    • -13
    • +16
    ./topics/topics_event_handler.php
  1. … 1 more file in changeset.

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

    • -1
    • +1
    ./poll_comments/poll_comments_config.php
    • -2
    • +2
    ./private_messages/private_messages_config.php

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

    • -7
    • +10
    ./poll_comments/poll_comments_config.php
    • -4
    • +4
    ./private_messages/private_messages_config.php
    • -1
    • +1
    ./private_messages/private_message_eh.php
  1. … 10 more files in changeset.

Bug #0001399: Remove "ItemSQLs" from unit configs

INP-1156

    • -76
    • +77
    ./emoticons/emoticons_config.php
    • -79
    • +79
    ./poll_comments/poll_comments_config.php
    • -65
    • +65
    ./censorship/censorship_config.php
    • -61
    • +59
    ./poll_answers/poll_answers_config.php
    • -79
    • +69
    ./private_messages/private_messages_config.php
    • -505
    • +517
    ./topics/topics_config.php
    • -37
    • +40
    ./private_message_body/private_message_body_config.php

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

    • -0
    • +122
    ./topics/topics_tag_processor.php
    • -0
    • +303
    ./topics/topics_event_handler.php
    • -0
    • +87
    ./poll_answers/poll_answers_config.php
    • -0
    • +108
    ./emoticons/emoticons_config.php
    • -0
    • +112
    ./private_messages/private_messages_config.php
    • -0
    • +164
    ./private_messages/private_message_tp.php
    • -0
    • +299
    ./private_messages/private_message_eh.php
  1. … 80 more files in changeset.