aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB/install
Commit message (Collapse)AuthorAgeFilesLines
* [ticket/10756] Removing path provider from template classVjacheslav Trushkin2012-04-191-1/+1
| | | | | | Removing path provider from template class because it is not used by template class PHPBB3-10756
* Merge remote-tracking branch 'github-callumacrae/ticket/10783' into developNils Adermann2012-04-131-0/+11
|\ | | | | | | | | | | | | * github-callumacrae/ticket/10783: [ticket/10783] Added assets_version to ACP and simple_*.html. [ticket/10783] Added assets_version to subsilver2. [ticket/10783] Added ?assets_version to assets.
| * [ticket/10783] Added ?assets_version to assets.Callum Macrae2012-04-111-0/+11
| | | | | | | | PHPBB3-10783
* | Merge remote-tracking branch 'github-cyberalien/ticket/10754' into developNils Adermann2012-04-092-4/+4
|\ \ | |/ |/| | | | | * github-cyberalien/ticket/10754: [ticket/10754] Changing $style to $phpbb_style
| * [ticket/10754] Changing $style to $phpbb_styleVjacheslav Trushkin2012-04-032-4/+4
| | | | | | | | | | | | Renaming global variable $style to $phpbb_style PHPBB3-10754
* | Merge branch 'develop-olympus' into developAndreas Fischer2012-04-081-0/+28
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * develop-olympus: [ticket/10561] Removed extra tabs, changes made to $db->sql_query() [ticket/10561] Changed $temp_style_id to $style_id [ticket/10561] Added function desc for phpbb_style_is_active() [ticket/10561] Casted $config['default_style'] to int [ticket/10561] Reverted to phpbb_style_is_active() [ticket/10561] Added to database_update:database_update_info() [ticket/10561] Added section in database_update.php [ticket/10561] Moved and renamed the funtion validate_style(). [ticket/10561] Fixed syntax error and renamed return variables. [ticket/10561] Changes made to $db->sql_fetchrow(). [ticket/10561] Changes made to function phpbb_style_is_active(). [ticket/10561] All users can choose deactivated styles (fixed). Conflicts: phpBB/install/database_update.php
| * | [ticket/10561] Removed extra tabs, changes made to $db->sql_query()Hari Sankar R2012-04-091-5/+5
| | | | | | | | | | | | | | | | | | Substituted $db->sql_query() with _sql() PHPBB3-10561
| * | [ticket/10561] Changed $temp_style_id to $style_idHari Sankar R2012-04-091-2/+2
| | | | | | | | | | | | PHPBB3-10561
| * | [ticket/10561] Casted $config['default_style'] to intHari Sankar R2012-04-091-1/+1
| | | | | | | | | | | | PHPBB3-10561
| * | [ticket/10561] Reverted to phpbb_style_is_active()Hari Sankar R2012-04-071-2/+3
| | | | | | | | | | | | | | | | | | Changes made to function name, reverted to old. PHPBB3-10561
| * | [ticket/10561] Added to database_update:database_update_info()Hari Sankar R2012-04-071-18/+27
| | | | | | | | | | | | | | | | | | Updates made to database_update.php PHPBB3-10561
| * | [ticket/10561] Added section in database_update.phpHari Sankar R2012-04-061-0/+18
| | | | | | | | | | | | | | | | | | | | | Added section to check for existing users using a deactivated style, and revert it to default style. PHPBB3-10561
* | | [ticket/10547] User is not logged in as admin after installationGabriel Anca2012-04-041-0/+3
| | | | | | | | | | | | | | | | | | | | | After installing, when user clicks Login button (final installation step), he is not logged in because there's a missing var ($data) PHPBB3-10547
* | | [ticket/10650] Revert merge of 'rahulr92/ticket/10650' into developOleg Pudeyev2012-04-048-10/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The pull request (#654) was merged a little too quickly. In particular, display_last_subject per-forum option needs consensus. This reverts commit b1fb34a4d7e446768b9f66ba6dd359173cd2a5fb, reversing changes made to 7d6b289671c51694f17dd5f9849abf2534b55e59. PHPBB3-10650
* | | [ticket/10650] Added static sql filesRahul2012-04-057-0/+7
| | | | | | | | | | | | | | | | | | | | | Ran create_schema_files.php and added the generated static sql files to the commit. PHPBB3-10650
* | | [ticket/10650] Displaying last topic on forum listRahul2012-04-051-0/+3
| |/ |/| | | | | | | | | | | | | | | The most recent topic title of the forum can now be displayed on the board index. An option is provided in the ACP under the 'General Forum Setting' which allows the admin to enable or disable this feature. PHPBB3-10650
* | Merge remote-tracking branch 'github-igorw/feature/class-prefix' into developNils Adermann2012-03-312-7/+3
|\ \ | | | | | | | | | | | | | | | * github-igorw/feature/class-prefix: [feature/class-prefix] Rename auth => phpbb_auth [feature/class-prefix] Rename user and session to phpbb_*
| * | [feature/class-prefix] Rename auth => phpbb_authIgor Wiedler2012-03-312-3/+1
| | | | | | | | | | | | PHPBB3-10609
| * | [feature/class-prefix] Rename user and session to phpbb_*Igor Wiedler2012-03-312-4/+2
| | | | | | | | | | | | PHPBB-10609
* | | [feature/merging-style-components] Fixing typos in database updaterVjacheslav Trushkin2012-03-311-2/+2
| | | | | | | | | | | | | | | | | | Yes, I failed... again. Fixing 2 more typos in database_update.php PHPBB3-10632
* | | [feature/merging-style-components] Fixing typo in database updaterVjacheslav Trushkin2012-03-311-1/+1
|/ / | | | | | | | | | | Fixing typo in database_update.php PHPBB3-10632
* | [feature/merging-style-components] Moving template initialization out of styleVjacheslav Trushkin2012-03-311-2/+2
| | | | | | | | | | | | Moving template initialization out of style constructor PHPBB3-10632
* | [feature/merging-style-components] Initializing locator and provider separatelyVjacheslav Trushkin2012-03-311-1/+3
| | | | | | | | | | | | Moving locator and path provider initialization out of style class PHPBB3-10632
* | Merge branch 'develop' into feature/merging-style-componentsVjacheslav Trushkin2012-03-312-0/+2
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 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
| * \ Merge remote-tracking branch 'upstream/develop' into feature/event-dispatcherIgor Wiedler2012-03-3010-6/+16
| |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * upstream/develop: (35 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/10129] Remove apostrophes and plurals in ACP user management -> permissions language file as per ticket. [ticket/10703] Added a condition to check if ext directory exists [ticket/10708] Check converted passwords for multi-byte characters [ticket/10586] Tests finally work (thanks naderman) [ticket/10586] Correctly purge board cache and don't rename install directory [ticket/10586] trying to get tests to work [ticket/10586] more work on getting tests to pass [ticket/10586] Tests are coming along, just a little more to go [ticket/10586] Rename install directory back to install/ after tests [ticket/10586] browse tests now work, but mine dont. at least we are making progress [ticket/10586] initial work on copying fixtures. Note that this depends on 10706 [ticket/10586] Adding the extensions used by the tests [ticket/10586] Now tests run, but fail. But here is what I have. ...
| * | | [feature/event-dispatcher] Add empty dispatcher to installer and db updaterIgor Wiedler2012-03-282-0/+2
| | | | | | | | | | | | | | | | PHPBB3-9550
| * | | [feature/event-dispatcher] Delete hard dependency on composer.Oleg Pudeyev2012-03-182-4/+0
| | | | | | | | | | | | | | | | | | | | | | | | Applications should not depend on package managers. PHPBB3-9550
| * | | Merge branch 'develop' into feature/event-dispatcherIgor Wiedler2012-03-112-21/+12
| |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * develop: (95 commits) [ticket/9084] Explain the logic. [ticket/10653] Call get_row_count of base class in mysql get_estimated_row_count [ticket/9813] Only get posts table row count if we detected a fulltext index. [feature/append_var] Adding test case [ticket/7432] Delete redundant reference to "appropriate menu item". [ticket/10618] Change phpBB 3 to phpBB 3.1. [ticket/10685] Refactor template test defaults for php 5.4 compatibility. [feature/append_var] Adding append_var template class function [ticket/9813] Also use estimated row count of posts table for fulltext mysql. [ticket/10653] Fix parameter to substr() in unit tests. Should be 1, not -1. [ticket/10653] Unit tests for get_row_count() and get_estimated_row_count(). [ticket/10653] Add ability to count table rows to database abstraction layer. [ticket/9813] Use table status row count only if greater than 100000 or exact. [ticket/9813] Use SHOW TABLE STATUS to get search stats for native on MySQL. [ticket/8652] Comment for also updating forum watch table in user_notification. [ticket/8652] Sending 2 emails on 2 replies [ticket/10680] Add /phpBB/ext/* to .gitignore [ticket/10672] Fix total post count language string in statistics and feed [ticket/9220] Remove margin on table.table1 so it's centered in the blue box. [ticket/10453] Fixing spacing ... Conflicts: tests/bootstrap.php
| * | | | [feature/event-dispatcher] Use real EventDispatcher through composerIgor Wiedler2012-03-112-0/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * replace the copy-pasta EventDispatcher with the real one from Symfony2 * use composer for managing this dependency, use composer autoloading PHPBB3-9550
* | | | | Merge remote-tracking branch 'upstream/develop' into ↵Vjacheslav Trushkin2012-03-2910-6/+16
|\ \ \ \ \ | | |_|/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| * | | | Merge remote-tracking branch 'brunoais/feature/save-post-on-report' into developOleg Pudeyev2012-03-278-3/+13
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * brunoais/feature/save-post-on-report: [feature/save-post-on-report] Changed mark in subsilver2 to look like viewtopic [feature/save-post-on-report] bbcode_nl2br missing. [feature/save-post-on-report] Change the column type of reported text [feature/save-post-on-report] Changed the name of the column [feature/save-post-on-report] Bug fix table name [feature/save-post-on-report] Saves the post reported when a report is creat [feature/save-post-on-report] The complete changes for this feature
| | * | | | [feature/save-post-on-report] Change the column type of reported textBruno Ais2012-03-191-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | What ever it said. I changed the type of data in the column reported_post_text to match what was requested by p PHPBB3-10600
| | * | | | [feature/save-post-on-report] Changed the name of the columnBruno Ais2012-03-198-8/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The name of the column was changed from reported_post AND reported_text to reported_post_text. This change was made by request PHPBB3-10600
| | * | | | [feature/save-post-on-report] Bug fix table nameBruno Ais2012-03-191-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | There was a bug in the previous commit. I changed the name of the colon of the table and forgot to update the database_update.php now it's fixed. PHPBB3-10600
| | * | | | [feature/save-post-on-report] Saves the post reported when a report is creatBruno Ais2012-03-197-3/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | A problem when creating a report is that the report may be made and then the post changed. After the changes, if the report is seen the message it shows may not be correct to be reported. With these changes, when a report is created the system copies the post that was reported and shows it in the report details in the MCP PHPBB3-10600
| | * | | | [feature/save-post-on-report] The complete changes for this featureBruno Ais2012-03-191-0/+3
| | | |/ / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | This covers all the changes so that when a report is made, the post itself is copied and displayed in the MCP instead of the current post. Unfortunatly, I made all commits in the wrong way and they were lost. Now I have only the final files.
| * | | | [task/php5.3] Looks like I missed a few places that needed PHP 5.2 changed ↵David King2012-03-251-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | to PHP 5.3.2 PHPBB3-10693
| * | | | [task/php5.3] Changed minimum PHP requirement for Ascraeus to 5.3.2David King2012-03-251-1/+1
| |/ / / | | | | | | | | | | | | PHPBB3-10693
* | | | [feature/merging-style-components] Updating style initializationVjacheslav Trushkin2012-03-152-4/+4
| | | | | | | | | | | | | | | | | | | | | | | | Changing template initialization to style initialization. PHPBB3-10632
* | | | [feature/merging-style-components] Creating style classVjacheslav Trushkin2012-03-151-3/+2
| | | | | | | | | | | | | | | | | | | | | | | | Creating phpbb_style class, changing template initialization to style initialization PHPBB3-10632
* | | | [feature/merging-style-components] Updating database and acp modulesVjacheslav Trushkin2012-03-1410-371/+73
| | | | | | | | | | | | | | | | | | | | | | | | Removing theme and template tables, adding new columns to styles table, deleting acp modules, deleting code that updates theme in updater PHPBB3-10632
* | | | [feature/merging-style-components] Renaming template classesVjacheslav Trushkin2012-03-141-3/+3
|/ / / | | | | | | | | | | | | | | | 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
* | | [ticket/10637] Leftovers from implementation of extensions in convertorVjacheslav Trushkin2012-02-091-6/+4
| | | | | | | | | | | | | | | | | | Replacing code in convertor that was missed in ticket 10323 PHPBB3-10637
* | | Merge remote-tracking branch 'imkingdavid/ticket/10535' into developOleg Pudeyev2012-02-031-15/+8
|\ \ \ | |/ / |/| | | | | | | | | | | | | | | | | | | | | | | * imkingdavid/ticket/10535: [ticket/10535] Delete no longer needed email confirm language entries. [ticket/10535] Delete email confirm from installer [ticket/10535] Removed email confirm field from acp_users module [ticket/10535] Forgot a subsilver2 change. *doh* [ticket/10535] Removed email confirm from UCP, removed unused language entries [ticket/10535] Remove email confirm check on registration form
| * | [ticket/10535] Delete email confirm from installerp2011-12-281-15/+8
| | | | | | | | | | | | PHPBB3-10535
* | | Merge remote-tracking branch 'unknownbliss/ticket/9916' into developAndreas Fischer2012-01-0210-19/+10
|\ \ \ | | | | | | | | | | | | | | | | * unknownbliss/ticket/9916: [ticket/9916] Updating header license and removing Version $Id$
| * | | [ticket/9916] Updating header license and removing Version $Id$Unknown2011-12-3110-19/+10
| |/ / | | | | | | | | | PHPBB3-9916
* | | Merge branch 'develop-olympus' into developAndreas Fischer2012-01-011-0/+6
|\ \ \ | |/ / |/| / | |/ | | | | | | | | * develop-olympus: [prep-release-3.0.10] Bumping version number for 3.0.10 final. Conflicts: phpBB/install/database_update.php
| * Merge branch 'prep-release-3.0.10' into develop-olympusAndreas Fischer2012-01-011-0/+6
| |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | * prep-release-3.0.10: [prep-release-3.0.10] Bumping version number for 3.0.10 final. Conflicts: phpBB/includes/constants.php phpBB/install/database_update.php phpBB/install/schemas/schema_data.sql
| | * [prep-release-3.0.10] Bumping version number for 3.0.10 final.Andreas Fischer2012-01-012-2/+8
| | |