Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merging style components #625

Merged
merged 33 commits into from Mar 31, 2012
Merged

Merging style components #625

merged 33 commits into from Mar 31, 2012

Commits on Mar 14, 2012

  1. [feature/merging-style-components] Moving template classes to style

    Moving includes/template/ to includes/style/, adding template_ prefix to classes that deal only with templates
    
    PHPBB3-10632
    cyberalien committed Mar 14, 2012
    Copy the full SHA
    7d414d0 View commit details
    Browse the repository at this point in the history
  2. [feature/merging-style-components] Renaming template classes

    Changing template classes prefixes from phpbb_template to phpbb_style (for classes that will work with styles) or phpbb_style_template (for classes that are specific to templates)
    
    PHPBB3-10632
    cyberalien committed Mar 14, 2012
    Copy the full SHA
    b7d84a5 View commit details
    Browse the repository at this point in the history
  3. [feature/merging-style-components] Updating database and acp modules

    Removing theme and template tables, adding new columns to styles table, deleting acp modules, deleting code that updates theme in updater
    
    PHPBB3-10632
    cyberalien committed Mar 14, 2012
    Copy the full SHA
    ae3b0f7 View commit details
    Browse the repository at this point in the history
  4. [feature/merging-style-components] Implementing unlimited parent temp…

    …lates
    
    Implementing possibility of unlimited levels of parent templates. Paths are stored in style_parent_tree, entries are separated by /
    
    PHPBB3-10632
    cyberalien committed Mar 14, 2012
    Copy the full SHA
    234e5d6 View commit details
    Browse the repository at this point in the history
  5. [feature/merging-style-components] Updating PHP files

    Removing theme and template entries in all files, except for acp styles section
    
    PHPBB3-10632
    cyberalien committed Mar 14, 2012
    Copy the full SHA
    ae7d290 View commit details
    Browse the repository at this point in the history
  6. [feature/merging-style-components] Updating coding guidelines

    Updating template inheritance section in coding guidelines
    
    PHPBB3-10632
    cyberalien committed Mar 14, 2012
    Copy the full SHA
    68336ab View commit details
    Browse the repository at this point in the history
  7. [feature/merging-style-components] Removing theme.cfg and template.cfg

    Removing theme.cfg and template.cfg
    
    PHPBB3-10632
    cyberalien committed Mar 14, 2012
    Copy the full SHA
    1cc9f60 View commit details
    Browse the repository at this point in the history
  8. [feature/merging-style-components] Adding template information to sty…

    …le.cfg
    
    Adding template data to style.cfg and removing obsolete comments
    
    PHPBB3-10632
    cyberalien committed Mar 14, 2012
    Copy the full SHA
    95a6963 View commit details
    Browse the repository at this point in the history
  9. [feature/merging-style-components] Admin.css additions for acp_styles

    Adding background colors for row iterations and font color for disabled rows to admin control panel css.
    
    PHPBB3-10632
    cyberalien committed Mar 14, 2012
    Copy the full SHA
    f32cc3a View commit details
    Browse the repository at this point in the history
  10. [feature/merging-style-components] Adjusting unit tests

    Adjusting unit tests for new styles table structure
    
    PHPBB3-10632
    cyberalien committed Mar 14, 2012
    Copy the full SHA
    ce21565 View commit details
    Browse the repository at this point in the history
  11. [feature/merging-style-components] Adding new language variables

    Adding new language variables for acp_styles and removing some unused variables
    
    PHPBB3-10632
    cyberalien committed Mar 14, 2012
    Copy the full SHA
    0c6955e View commit details
    Browse the repository at this point in the history
  12. [feature/merging-style-components] New acp_styles

    New acp_styles, completely rewritten
    
    PHPBB3-10632
    cyberalien committed Mar 14, 2012
    Copy the full SHA
    e35a20f View commit details
    Browse the repository at this point in the history
  13. [feature/merging-style-components] New acp_styles template

    New acp_styles.html, completely rewritten
    
    PHPBB3-10632
    cyberalien committed Mar 14, 2012
    Copy the full SHA
    39944a0 View commit details
    Browse the repository at this point in the history

Commits on Mar 15, 2012

  1. [feature/merging-style-components] Creating style class

    Creating phpbb_style class, changing template initialization to style initialization
    
    PHPBB3-10632
    cyberalien committed Mar 15, 2012
    Copy the full SHA
    3997ffa View commit details
    Browse the repository at this point in the history
  2. [feature/merging-style-components] Changing $style to $style_id

    Changing $style to $style_id in user::setup to avoid conflict with new global style variable
    
    PHPBB3-10632
    cyberalien committed Mar 15, 2012
    Copy the full SHA
    c83f386 View commit details
    Browse the repository at this point in the history
  3. [feature/merging-style-components] Renaming style locator

    Renaming style locator to style resource locator
    
    PHPBB3-10632
    cyberalien committed Mar 15, 2012
    Copy the full SHA
    8b7c2c3 View commit details
    Browse the repository at this point in the history
  4. [feature/merging-style-components] Changing path provider

    Changing set_templates() to set_style() and removing second parameter, changing get_main_template_path() to get_main_style_path(), removing template_root_for_style(), updating docblocks
    
    PHPBB3-10632
    cyberalien committed Mar 15, 2012
    Copy the full SHA
    c692e0d View commit details
    Browse the repository at this point in the history
  5. [feature/merging-style-components] Changing resource locator

    Changing "template" to "style" in all functions that deal with styles, changing error messages, updating docblocks
    
    PHPBB3-10632
    cyberalien committed Mar 15, 2012
    Copy the full SHA
    0b2abe5 View commit details
    Browse the repository at this point in the history
  6. [feature/merging-style-components] Changing template class

    Removing functions that are now handled by phpbb_style class, allowing to write $context, updating docblocks
    
    PHPBB3-10632
    cyberalien committed Mar 15, 2012
    Copy the full SHA
    5b149e9 View commit details
    Browse the repository at this point in the history
  7. [feature/merging-style-components] Changing style class

    Moving functions that deal with styles from template to style class, updating docblocks
    
    PHPBB3-10632
    cyberalien committed Mar 15, 2012
    Copy the full SHA
    1ce4d4c View commit details
    Browse the repository at this point in the history
  8. [feature/merging-style-components] Updating style initialization

    Changing template initialization to style initialization.
    
    PHPBB3-10632
    cyberalien committed Mar 15, 2012
    Copy the full SHA
    fd96f97 View commit details
    Browse the repository at this point in the history
  9. [feature/merging-style-components] Updating test cases

    Updating code in test cases for new template classes.
    
    PHPBB3-10632
    cyberalien committed Mar 15, 2012
    Copy the full SHA
    d25b607 View commit details
    Browse the repository at this point in the history

Commits on Mar 29, 2012

  1. Merge remote-tracking branch 'upstream/develop' into feature/merging-…

    …style-components
    
    * upstream/develop: (65 commits)
      [ticket/10730] Added label tag around "select" text in post splitting UI
      [ticket/10732] Add config_dev.php and config_test.php to .gitignore
      [ticket/10586] Added space in if statement
      [ticket/10586] Tidy up comments
      [task/php5.3] Updated range of tested PHP versions
      [task/php5.3] Looks like I missed a few places that needed PHP 5.2 changed to PHP 5.3.2
      [task/php5.3] Changed minimum PHP requirement for Ascraeus to 5.3.2
      [ticket/10723] Stop Travis running all tests on sqlite
      [ticket/10703] Added a condition to check if ext directory exists
      [task/travis] Refactor php version check for dbunit install
      [task/travis] Exclude functional and slow tests
      [ticket/10719] Revert "Skip functional tests on PHP 5.2"
      [task/travis-develop2] Update version from 5.3 to 5.3.2
      [task/travis] Dropping support for 5.2 in develop branch
      [task/travis] Some more small travis fixes
      [task/travis] Rename travis phpunit config files
      [task/travis] Fixing some travis issues
      [ticket/10684] Adjust function and parameter name, minor changes.
      [task/travis] Add automated testing to readme
      [task/travis] Removing development information
      ...
    
    Conflicts:
    	phpBB/install/database_update.php
    cyberalien committed Mar 29, 2012
    Copy the full SHA
    ba431de View commit details
    Browse the repository at this point in the history

Commits on Mar 30, 2012

  1. [feature/merging-style-components] Changing acp_styles text

    Changing acp styles welcome message a little bit.
    
    PHPBB3-10632
    cyberalien committed Mar 30, 2012
    Copy the full SHA
    506951e View commit details
    Browse the repository at this point in the history

Commits on Mar 31, 2012

  1. Merge branch 'develop' into feature/merging-style-components

    * develop: (175 commits)
      [feature/ajax] Remove strange non-breaking spaces from approve button
      [feature/ajax] Add entirely unrelated but nice newlines
      [feature/ajax] Unify phpbb_json_response instantiation
      [feature/ajax] Fix acp_styles activate_deactivate ajax callback name
      [feature/ajax] Send correct activate/deactivate JSON response in acp_profile
      [ticket/10270] Alter background colors for posts
      [feature/ajax] Remove not working module enable/disable ajax code
      [feature/ajax] Replace static call to phpbb_request with OO
      [feature/ajax] Remove quick-reply AJAX handling until we have something good
      [ticket/10270] Changing close button for ajax popups
      [ticket/10270] Disabling links in disappearing content
      [ticket/10291] Fixed an AJAX bug on quick reply form submit.
      [ticket/10273] Fixed accepting / denying posts AJAX.
      [ticket/10272] Removed code that was prevent event propogation in AJAX.
      [ticket/10291] Fixed a bug in the quick reply AJAX.
      [feature/ajax] Handle acp_modules error cases with JSON response
      [feature/ajax] Fix filter check, quick mod tools data-attribute
      [feature/ajax] Use the error handler
      [feature/ajax] Generic error handling with a phpbb.alert box
      [feature/ajax] Change filter semantics, some minor adjustments
      ...
    
    Conflicts:
    	phpBB/adm/style/acp_styles.html
    	phpBB/includes/acp/acp_styles.php
    cyberalien committed Mar 31, 2012
    Copy the full SHA
    398a6c8 View commit details
    Browse the repository at this point in the history
  2. [feature/merging-style-components] Updating styles in coding guidelines

    Updating styles section in coding guidelines
    
    PHPBB3-10632
    cyberalien committed Mar 31, 2012
    Copy the full SHA
    e13e4d9 View commit details
    Browse the repository at this point in the history
  3. [feature/merging-style-components] Fix notices in acp_styles

    PHPBB3-10632
    igorw authored and cyberalien committed Mar 31, 2012
    Copy the full SHA
    bc46cfd View commit details
    Browse the repository at this point in the history
  4. [feature/merging-style-components] Fixing few errors in acp_styles

    Fixing notices and usability issues
    
    PHPBB3-10632
    cyberalien committed Mar 31, 2012
    Copy the full SHA
    9611997 View commit details
    Browse the repository at this point in the history
  5. [feature/merging-style-components] Initializing locator and provider …

    …separately
    
    Moving locator and path provider initialization out of style class
    
    PHPBB3-10632
    cyberalien committed Mar 31, 2012
    Copy the full SHA
    360312f View commit details
    Browse the repository at this point in the history
  6. [feature/merging-style-components] Renaming "delete" to "uninstall" f…

    …or styles
    
    Changing from "delete" to "uninstall" in acp_styles to avoid confusing users
    
    PHPBB3-10632
    cyberalien committed Mar 31, 2012
    Copy the full SHA
    0540509 View commit details
    Browse the repository at this point in the history
  7. [feature/merging-style-components] Moving template initialization out…

    … of style
    
    Moving template initialization out of style constructor
    
    PHPBB3-10632
    cyberalien committed Mar 31, 2012
    Copy the full SHA
    17989c1 View commit details
    Browse the repository at this point in the history
  8. [feature/merging-style-components] Fix for unit tests

    Fixing typo in template unit tests
    
    PHPBB3-10632
    cyberalien committed Mar 31, 2012
    Copy the full SHA
    377db78 View commit details
    Browse the repository at this point in the history
  9. [feature/merging-style-components] Fix back link on install page

    When on install page and all styles are installed, fix back link to go to main
    styles page.
    
    PHPBB3-10632
    igorw authored and cyberalien committed Mar 31, 2012
    Copy the full SHA
    5d07b16 View commit details
    Browse the repository at this point in the history