aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB/develop
Commit message (Collapse)AuthorAgeFilesLines
* [feature/migrations] Store depends on in the database (serialized)Nathan Guse2013-01-101-0/+1
| | | | | | | | | | | | | | This is required so that when migrations are reverted we can check through all installed migrations and make sure that all dependencies are handled properly and so that we are only required to load the migrations files that could be dependent on the ones installed. I believe in normal proper use the old way might have worked, but in case something happens and an unrelated migration file is installed, but cannot be loaded, this makes sure we do not stop everything unless we absolutely must (one of those files is dependent on something we want to revert). PHPBB3-9737
* [feature/migrations] Migrations now somewhat worksNathan Guse2013-01-091-2/+2
| | | | PHPBB3-9737
* [feature/migrations] Move migrator to service containerNathan Guse2013-01-091-1/+13
| | | | | | | | | | | | Version numbers 3.1 updates Restore database_update.php file to what it was in develop Get first forum to place global announcements in PHPBB3-9737
* [feature/migrations] Moved database_update info to individual migration classesNils Adermann2013-01-091-14/+0
|
* [feature/migrations] Basic migrations with schema and data changesNils Adermann2013-01-091-0/+14
| | | | | | | | The migrator takes care of applying migrations as necessary. RFC: http://area51.phpbb.com/phpBB/viewtopic.php?f=84&t=41337 PHPBB3-9737
* Merge branch 'develop-olympus' into developAndreas Fischer2012-11-294-4/+4
|\ | | | | | | | | * develop-olympus: [ticket/11227] @return void -> @return null in develop-olympus.
| * [ticket/11227] @return void -> @return null in develop-olympus.Oleg Pudeyev2012-11-294-4/+4
| | | | | | | | PHPBB3-11227
* | Merge PR #786 branch 'brunoais/ticket/10845' into developOleg Pudeyev2012-11-061-10/+12
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * brunoais/ticket/10845: [ticket/10845] Removed one empty line that wasn't supposed to be there [ticket/10845] Two of the three colouns were missing in the DB update file [ticket/10845] Remove censor from text [ticket/10845] Now it shows the preview post parsed [ticket/10845] Changed the report system. Now it saves posts with the bbcode Conflicts: phpBB/includes/functions_content.php
| * | [ticket/10845] Changed the report system. Now it saves posts with the bbcodeBruno Ais2012-05-011-10/+12
| | | | | | | | | | | | | | | | | | | | | Now the bitfield and uid of the bbcode is saved in the reports table. This will allow parsing the BBCode while loading the post to show PHPBB3-10845
* | | [ticket/11052] update search backend constructor everywhereDhruv2012-08-151-1/+1
| | | | | | | | | | | | PHPBB3-11052
* | | Merge branch 'develop-olympus' into developAndreas Fischer2012-07-231-0/+1
|\ \ \ | | |/ | |/| | | | | | | | | | | | | | | | | | | * develop-olympus: [ticket/10965] Database update was referring to 3.0.5 instead of 3.0.11-RC1 [ticket/10965] Introduce a new profile field option to display no value Conflicts: phpBB/includes/acp/acp_profile.php
| * | Merge branch 'prep-release-3.0.11' into develop-olympusAndreas Fischer2012-07-231-0/+1
| |\ \ | | | | | | | | | | | | | | | | | | | | * prep-release-3.0.11: [ticket/10965] Database update was referring to 3.0.5 instead of 3.0.11-RC1 [ticket/10965] Introduce a new profile field option to display no value
| | * | [ticket/10965] Introduce a new profile field option to display no valueNils Adermann2012-07-231-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | By default the 3.0.10 behaviour is kept, profile fields will not show up if they have either not yet been selected or in case of an optional dropdown field if the novalue option was selected. PHPBB3-10965
* | | | Merge branch 'develop' of git://github.com/phpbb/phpbb3 into ↵Joas Schilling2012-07-181-1/+1
|\ \ \ \ | | | | | | | | | | | | | | | feature/new-tz-handling
| * \ \ \ Merge branch 'develop-olympus' into developAndreas Fischer2012-06-281-1/+1
| |\ \ \ \ | | |/ / / | | | | | | | | | | | | | | | * develop-olympus: [ticket/10850] Changed the fopen mode to wb
| | * | | [ticket/10850] Changed the fopen mode to wbBruno Ais2012-06-281-1/+1
| | |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | Changed the fopen mode from "wt" to "wb" as requested in the PR. The objective behind this is to prevent writting stuff like "\r\r\n" in windows PHPBB3-10850
* | | | [feature/new-tz-handling] Remove appearances of board_dst and user_dstJoas Schilling2012-06-182-3/+2
| | | | | | | | | | | | | | | | PHPBB3-9558
* | | | Merge branch 'feature/new-tz-handling' of https://github.com/p/phpbb3 into ↵Joas Schilling2012-06-041-2/+1
|\ \ \ \ | |/ / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | feature/new-tz-handling Conflicts: phpBB/includes/functions_profile_fields.php phpBB/includes/session.php phpBB/install/database_update.php
| * | | [feature/new-tz-handling] Modify database schemas.Chris Smith2012-03-141-2/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | - Dropped the user_dst column which is no longer required. - Modified the user_timezone column to take a string, max length 100. PHPBB3-9558
* | | | Merge PR #799 branch 'develop-olympus' into developOleg Pudeyev2012-05-109-94/+53
|\ \ \ \ | | |/ / | |/| | | | | | | | | | * develop-olympus: [ticket/10881] Replace old (and unify) file headers in develop files.
| * | | [ticket/10881] Replace old (and unify) file headers in develop files.Andreas Fischer2012-05-109-94/+53
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This especially also fixes the problem of the copyright symbol being represented using 0xA9, which is neither ASCII nor the appropriate UTF8 byte sequence for the copyright symbol. PHPBB3-10881
* | | | [ticket/10847] fixing all misspelled "dependant" to "dependent"Senky2012-04-302-2/+2
| |_|/ |/| | | | | | | | PHPBB3-10847
* | | [ticket/10785] Fixed illegal use of $_REQUEST in develop/fill.php.Callum Macrae2012-04-111-2/+2
| | | | | | | | | | | | PHPBB3-10785
* | | [ticket/10650] Revert merge of 'rahulr92/ticket/10650' into developOleg Pudeyev2012-04-041-1/+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] Displaying last topic on forum listRahul2012-04-051-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | 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 'upstream/develop' into ↵Vjacheslav Trushkin2012-03-293-2/+9
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-271-0/+1
| |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 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] Changed the name of the columnBruno Ais2012-03-191-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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] Saves the post reported when a report is creatBruno Ais2012-03-191-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| * | | | Merge remote-tracking branch 'dhruvgoel92/ticket/10703' into developAndreas Fischer2012-03-251-1/+7
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | * dhruvgoel92/ticket/10703: [ticket/10703] Added a condition to check if ext directory exists
| | * | | | [ticket/10703] Added a condition to check if ext directory existsDhruv Goel2012-03-231-1/+7
| | |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The existence of ext directory is checked, if not present a proper error message that file doesn't exist is printed out. No Fatal Error messages. PHPBB3-10703
| * | | | Merge branch 'develop-olympus' into developAndreas Fischer2012-03-191-1/+1
| |\ \ \ \ | | |/ / / | |/| / / | | |/ / | | | | * develop-olympus: [ticket/10691] Fixed the speed of creating search index
| | * | [ticket/10691] Fixed the speed of creating search indexDhruv Goel2012-03-191-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | $time is now initialized after each batch iteration. Speed for each batch iteration of creating search index is fixed. PHPBB3-10691
* | | | [feature/merging-style-components] Updating database and acp modulesVjacheslav Trushkin2012-03-142-84/+8
|/ / / | | | | | | | | | | | | | | | Removing theme and template tables, adding new columns to styles table, deleting acp modules, deleting code that updates theme in updater PHPBB3-10632
* | | Merge remote-tracking branch 'cyberalien/ticket/10378' into developIgor Wiedler2012-02-171-1/+1
|\ \ \ | | | | | | | | | | | | | | | | | | | | * cyberalien/ticket/10378: [ticket/10378] Missing entries from imageset to css conversion [ticket/10378] Imageset to css convertor typo
| * | | [ticket/10378] Imageset to css convertor typoVjacheslav Trushkin2012-01-201-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | Imageset to css convertor typo PHPBB3-10378
* | | | Merge branch 'develop' into ticket/10380Igor Wiedler2012-02-172-1/+124
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * develop: [ticket/10652] Fixing typo in template class [ticket/10645] Missing CSS for checkboxes [ticket/10614] Change not installed heading to available. [ticket/10614] Unbreak all_available on extension manager. [ticket/10614] Check if cache exists before destroying it [ticket/10614] Remove ext manager exceptions for now [ticket/10614] Refactor list command to use manager API [ticket/10614] Add purge command [ticket/10614] Tweak list output, show state, purge cache, handle missing exts [ticket/10614] Make script accessible from anywhere [ticket/10614] Better usage output [ticket/10614] Add a script to enable, disable and view status of extensions. [ticket/10500] Use correct class name in @uses. [ticket/10500] Fix phpbb_template_compile instantiation.
| * \ \ \ Merge pull request #526 from p/ticket/10500Igor Wiedler2012-02-141-1/+1
| |\ \ \ \ | | | | | | | | | | | | Ticket/10500 Miscellaneous issues in the new template engine
| | * | | | [ticket/10500] Fix phpbb_template_compile instantiation.Oleg Pudeyev2011-12-031-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The required $allow_php argument was missing. PHPBB3-10500
| * | | | | Merge pull request #546 from p/ticket/10614Igor Wiedler2012-02-111-0/+123
| |\ \ \ \ \ | | | | | | | | | | | | | | [ticket/10614] Add a script to enable, disable and view status of extens...
| | * | | | | [ticket/10614] Change not installed heading to available.Oleg Pudeyev2012-02-111-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | "Not installed" implies that extensions listed there can be installed, but the operation is called enable. Reduce the confusion by using "available" for the heading, this matches extension manager code. PHPBB3-10614
| | * | | | | [ticket/10614] Refactor list command to use manager APIIgor Wiedler2012-02-091-52/+22
| | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-10614
| | * | | | | [ticket/10614] Add purge commandIgor Wiedler2012-02-091-0/+17
| | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-10614
| | * | | | | [ticket/10614] Tweak list output, show state, purge cache, handle missing extsIgor Wiedler2012-02-091-10/+19
| | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-10614
| | * | | | | [ticket/10614] Make script accessible from anywhereIgor Wiedler2012-02-091-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-10614
| | * | | | | [ticket/10614] Better usage outputIgor Wiedler2012-02-061-29/+21
| | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-10614
| | * | | | | [ticket/10614] Add a script to enable, disable and view status of extensions.Oleg Pudeyev2012-02-031-0/+135
| | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-10614
* | | | | | | Merge branch 'develop' into ticket/10380Igor Wiedler2012-02-1715-76/+181
|\ \ \ \ \ \ \ | |/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * develop: (325 commits) [ticket/10641] Update MCP template with new plurality forms [ticket/10637] Leftovers from implementation of extensions in convertor [ticket/10637] Leftovers from implementation of extensions in develop tools [ticket/10637] Leftovers from implementation of extensions in mcp_post [ticket/10637] Leftovers from implementation of extensions in mcp_main [ticket/10637] Leftovers from implementation of extensions [ticket/10606] Also correctly use $s_search_hidden_fields in view(forum|topic). [ticket/10606] Fix incorrect hidden fields array name in page_header(). [ticket/10633] Stop leaking filename of attachments when thumbnail is requested [ticket/10636] Resolve variable name ($sql_ary) conflict in cache_moderators(). [ticket/10634] Specify module type when viewing profile [ticket/10634] Changing p_master::is_full_class [ticket/10569] Invalid string comparison in prosilver [ticket/10495] Update request/type_cast_helper for PHP 5.4 magic_quotes_gpc drop [ticket/10512] Call startup.php from tests/bootstrap.php [ticket/10535] Delete no longer needed email confirm language entries. [ticket/9914] Add backup warning to updater. [ticket/10616] Add template inheritance to exported template [ticket/10616] Ignore template inheritance that points to self [ticket/10616] Add template inheritance to default styles ...
| * | | | | | [ticket/10637] Leftovers from implementation of extensions in develop toolsVjacheslav Trushkin2012-02-092-4/+1
| |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Replacing code in development tools that was missed in ticket 10323 PHPBB3-10637
| * | | | | [ticket/9916] Updating header license and removing Version $Id$Unknown2012-01-022-4/+2
| | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-9916
generated by cgit v1.2.1 (git 2.21.0) at 2025-12-31 22:07:21 +0000