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

Merge of "modules/custom/branches/1.2.x@16539" to "modules/custom/branches/1.3.x@16520".

Conflicts:

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

Merge of "modules/custom/branches/1.2.x@16514" to "modules/custom/branches/1.3.x@16504".

Conflicts:

  • units/widgets/widget_eh.php
    • -1
    • +1
    ./units/sections/products/e_product_eh.php
    • -1
    • +1
    ./units/sections/articles/e_article_eh.php

Merge of "modules/custom/branches/1.2.x@16485" to "modules/custom/branches/1.3.x@16396".

Merge of "modules/custom/releases/1.2.2-B1@16491" to "modules/custom/branches/1.3.x@16396".

Merge of "modules/custom/branches/1.2.x@16383" to "modules/custom/branches/1.3.x@16253".

Conflicts:

  • install/upgrades.sql
  • units/sections/sections_config.php
  • units/widgets/widget_eh.php
  • units/widgets/widgets_config.php
    • -1
    • +2
    ./admin_templates/widgets/widget_edit.tpl
    • -3
    • +20
    ./admin_templates/widgets/widget_list.tpl

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

Merge of "modules/custom/branches/1.2.x@16143" to "modules/custom/branches/1.3.x@16182".

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
    • +119
    ./units/widgets/WidgetRouter.php

Bug INP-1429 - Class hierarchy analyzer

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

    • -1
    • +115
    ./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
    • +27
    ./install/cache/class_structure.php

Merge of "modules/custom/releases/1.2.1@16085" to "modules/custom/branches/1.3.x@16102".

Merge of "modules/custom/releases/1.2.1-RC1@15887" to "modules/custom/branches/1.3.x@15989".

Bug INP-1290 - Deal with "svn:ignore" attributes

Bug INP-1274 - Move deployment script log to database

Merge of "modules/custom/releases/1.2.1-B2@15771" to "modules/custom/branches/1.3.x@15692".

Merge of "modules/custom/releases/1.2.1-B2@15887" to "modules/custom/branches/1.3.x@15692".

    • binary
    ./admin_templates/img/icons/icon46_custom.png

Bug INP-1203: OOP unit config creation

    • -4
    • +6
    ./units/sections/products/e_product_eh.php
    • -4
    • +6
    ./units/sections/articles/e_article_eh.php
    • -4
    • +6
    ./units/sections/reviews/e_review_eh.php

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

Commit on behalf of Erik

    • -1
    • +1
    ./admin_templates/widgets/widget_edit.tpl

Merge of "modules/custom/releases/1.2.1-B1@15633" to "modules/custom/branches/1.3.x@15653".

    • -1
    • +24
    ./units/sections/sections_config.php

Bug #0001399: Remove "ItemSQLs" from unit configs

INP-1156

    • -21
    • +15
    ./units/widgets/widgets_config.php
    • -87
    • +82
    ./units/sections/sections_config.php

Releasing version 'branches/1.3.x' (copy from 'branches/1.2.x') of 'modules/custom' module.

    • binary
    ./admin_templates/img/icons/icon24_custom.png
    • -0
    • +140
    ./admin_templates/widgets/widget_list.tpl
    • -0
    • +91
    ./admin_templates/widgets/widget_edit.tpl
  1. … 44 more files in changeset.