aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB/develop
Commit message (Collapse)AuthorAgeFilesLines
...
| | | * | Merge remote-tracking branch 'igorw/ticket/10413' into develop-olympusAndreas Fischer2011-10-161-6/+2
| | | |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * igorw/ticket/10413: [ticket/10413] Fix CS [ticket/10413] Make create_schema_files usable
| | | | * | [ticket/10413] Fix CSIgor Wiedler2011-10-161-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-10413
| | | | * | [ticket/10413] Make create_schema_files usableIgor Wiedler2011-10-141-6/+2
| | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-10413
| | * | | | Merge branch 'develop-olympus' into developJoas Schilling2011-10-141-11/+22
| | |\ \ \ \ | | | |/ / /
| | | * | | [ticket/10189] Get rid of $id$ from schema filesIgor Wiedler2011-10-141-16/+1
| | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-10189
| | | * | | [ticket/10189] Add "automatically generated" comment into schema-filesIgor Wiedler2011-10-141-0/+26
| | | |/ / | | | | | | | | | | | | | | | PHPBB3-10189
| | * | | [feature/remove-imagesets] Fix create_schema_files, get rid of imagesetsIgor Wiedler2011-10-141-31/+0
| | | |/ | | |/| | | | | | | | | PHPBB3-10336
| * | | [feature/extension-manager] Use an incremental process for enable and purgeNils Adermann2011-09-291-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The enable or purge operation of an extension could take a long time if an expensive operation needs to be executed on a large set of data. To allow this to succeed from a web interface with max_execution_time set in the webserver's php configuration, subsequent requests must continue the operation started earlier. So individual enable and purge implementations must be able to spread their work across multiple steps. PHPBB3-10323
| * | | [feature/extension-manager] Remove the ext_active index for lack of specificityNils Adermann2011-09-291-1/+0
| | | | | | | | | | | | | | | | PHPBB3-10323
| * | | [feature/extension-manager] Extension Manager & FinderNils Adermann2011-09-291-0/+11
| |/ / | | | | | | | | | | | | | | | | | | Extensions RFC: http://area51.phpbb.com/phpBB/viewtopic.php?f=84&t=41499 Ticket: http://tracker.phpbb.com/browse/PHPBB3-10323 PHPBB3-10323
* | | [ticket/10380] BIDI support for imagesetVjacheslav Trushkin2012-01-161-30/+130
|/ / | | | | | | | | | | BIDI support for imageset conversion script, added RTL imageset entries to prosilver and subsilver2, fixed small bug in imageset.css, changed spacing in code to match phpbb coding guidelines PHPBB3-10380
* | [feature/remove-db-styles] Update database schemas.Chris Smith2011-09-201-18/+0
| | | | | | | | | | | | | | | | | | | | | | | | Removes: * styles_template_data table * template_storedb on styles_template table * On styles_theme table: - theme_storedb - theme_mtime - theme_data PHPBB3-9741
* | [feature/remove-imagesets] Script for converting imageset to cssVjacheslav Trushkin2011-09-041-0/+274
| | | | | | | | | | | | Removing imagesets. Script for converting imageset to css PHPBB3-10336
* | [feature/remove-imagesets] Changing database structureVjacheslav Trushkin2011-09-031-31/+0
| | | | | | | | | | | | Removing imagesets. Changing database structure PHPBB3-10336
* | Merge remote-tracking branch 'github-p/feature/template-engine' into developNils Adermann2011-08-131-0/+24
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * github-p/feature/template-engine: (87 commits) [feature/template-engine] Delete _get_locator function. [feature/template-engine] Clean up template locator usage in bbcode. [feature/template-engine] Need to call set_template on template. [feature/template-engine] Update installer for template engine changes. [feature/template-engine] Dependency inject locator into template. [feature/template-engine] Delete useless code from set_template. [feature/template-engine] Delete no longer used $template_filename property. [feature/template-engine] Delete useless $template globalization. [feature/template-engine] Use template engine class in bbcode class. [feature/template-engine] Corrected an error message in template locator. [feature/template-engine] Remaining documentation. [feature/template-engine] More documentation for template class. [feature/template-engine] Create load_and_render to reduce code duplication. [feature/template-engine] Get rid of orig_tpl_* in template engine. [feature/template-engine] Delete $style_name param from locator's set_custom_template. [feature/template-engine] Add constructor to template locator. [feature/template-engine] Factor template locator out of template class. [feature/template-engine] Delete $files_template property. [feature/template-engine] Rename is_absolute to phpbb_is_absolute. [feature/template-engine] Test template DEFINE statements across files ... Conflicts: .gitignore phpBB/includes/template.php
| * | [feature/template-engine] Rename template_compile methods for clarity.Oleg Pudeyev2011-05-041-1/+1
| | | | | | | | | | | | PHPBB3-9726
| * | [feature/template-engine] Created a script to compile templates.Oleg Pudeyev2011-04-241-0/+24
| | | | | | | | | | | | | | | | | | | | | Script takes path to template as the only argument and outputs the compiled template to standard output. PHPBB3-9726
* | | [ticket/10258] Change the DOCTYPE to HTML5Igor Wiedler2011-07-091-3/+3
| | | | | | | | | | | | PHPBB3-10258
* | | Merge branch 'develop-olympus' into developNils Adermann2011-07-061-3/+3
|\ \ \ | | |/ | |/| | | | | | | | | | * develop-olympus: [ticket/9859] Changing all phpBB footers to match the new credit line [ticket/9859] New footer copyright line with registered symbol
| * | [ticket/9859] Changing all phpBB footers to match the new credit lineYuriy Rusko2011-07-061-3/+3
| | | | | | | | | | | | PHPBB3-9859
* | | Merge branch 'develop-olympus' into developAndreas Fischer2011-07-051-2/+0
|\ \ \ | |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * develop-olympus: [prep-release-3.0.9] Update Changelog for 3.0.9 release. [prep-release-3.0.9] Bumping version number for the final 3.0.9 release. [ticket/10247] Removing attempt_id column from the 3.0.8 to 3.0.9-RC1 updater. [ticket/10247] Add a db_tools test for the removal of a primary key column. [ticket/10247] Add empty data section to database update for RC4 [ticket/10247] Remove unecessary attempt_id primary key column Conflicts: phpBB/install/database_update.php
| * | [ticket/10247] Remove unecessary attempt_id primary key columnNils Adermann2011-07-031-2/+0
| | | | | | | | | | | | | | | | | | | | | | | | The database update drops any key of the same name (potential primary key) and afterwards the column. This does not work on some of the supported DBMS and needs further changes. PHPBB3-10247
* | | Merge branch 'develop-olympus' into developAndreas Fischer2011-06-131-4/+4
|\ \ \ | |/ / | | | | | | | | | * develop-olympus: [ticket/10213] Update install schema with shorter index names.
| * | [ticket/10213] Update install schema with shorter index names.Nils Adermann2011-06-131-4/+4
| | | | | | | | | | | | PHPBB3-10213
* | | Merge branch 'develop-olympus' into developAndreas Fischer2011-06-121-0/+14
|\ \ \ | |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * develop-olympus: [ticket/9892] Correct copyright year [ticket/9892] Remove incorrect use of camel case [ticket/9892] Removing closing php tag from create_schema_files [ticket/9892] Transaction support for database update sql execution function [ticket/9892] count is a keyword in firebird, so renaming this alias [ticket/9892] Q&A CAPTCHA did not work on firebird, so no need to change config [ticket/9892] Shorten login_attempt key names to avoid firebird length problems [ticket/9892] Drop Q&A CAPTCHA tables if left in inconsistent state [ticket/9892] Adding a number of tests for db_tools [ticket/9892] Table prefix lengths influence index lengths in db_tools [ticket/9892] Shorten the index names on the q&a captcha [ticket/9892] column & index name limits, firebird auto increment in db_tools Conflicts: phpBB/develop/create_schema_files.php
| * | [ticket/9892] Removing closing php tag from create_schema_filesNils Adermann2011-06-121-1/+0
| | | | | | | | | | | | PHPBB3-9892
| * | [ticket/9892] column & index name limits, firebird auto increment in db_toolsNils Adermann2011-06-121-1/+15
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - Column names are limited to 30 characters - Index names are limited to 31 characters. On some dbms the index name contains both table name and actual index name so the limit applies to the sum of the lenghts of table name and index name. - Auto incremented column names are limited to 26 characters to provide an additional 4 characters for sequence names The code for firebird auto increment support using generators/sequences with triggers was copied from create_schema_files.php PHPBB3-9892
* | | Merge branch 'develop-olympus' into developAndreas Fischer2011-06-111-0/+20
|\ \ \ | |/ / | | | | | | | | | | | | | | | | | | | | | * develop-olympus: [ticket/9992] Clarify explanations of ip and account limits on login [ticket/9992] Add a comma to language for IP_LOGIN_LIMIT_MAX_EXPLAIN [ticket/9992] Use sql_fetchfield for single row and single column result [ticket/9992] Adding a limit on login attempts per IP. [ticket/9992] Make sql_create_table and sql_table_exists available in updater
| * | [ticket/9992] Adding a limit on login attempts per IP.Nils Adermann2011-06-101-0/+20
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | A new table was created to save all failed login attempts with corresponding information on username, ip and useragent. By default the limit is 50 login attempts within 6 hours per IP. The limit is relatively high to avoid big problems on sites behind a reverse proxy that don't receive the forwarded-for value as REMOTE_ADDR but see all users as coming from the same IP address. But if these users run into problems a special forwarded-for option is available to limit logins by forwarded-for value instead of ip. PHPBB3-9992
* | | Merge branch 'develop-olympus' into developAndreas Fischer2011-05-231-1/+1
|\ \ \ | |/ / | | | | | | | | | * develop-olympus: [ticket/10192] Add missing semicolon
| * | [ticket/10192] Add missing semicolonErik Frèrejean2011-05-231-1/+1
| | | | | | | | | | | | | | | | | | | | | if the index has to be recreated it will run into the private message table query. PHPBB3-10192
* | | [ticket/8542] Display custom profile fields in private messagesJoas Schilling2011-05-201-0/+1
| |/ |/| | | | | | | | | Introduce an option to display the cpf in the PM view. PHPBB3-8542
* | Merge branch 'ticket/9549' into developOleg Pudeyev2011-03-011-1/+2
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * ticket/9549: [ticket/9549] Display users in their primary group instead of their first group [ticket/9549] Change default value of "sort legend by group name" to false. [ticket/9549] Fix displaying empty groups [ticket/9549] Fix language strings. [ticket/9549] Only add group to legend/teampage when the checkbox is checked. [ticket/9549] New method move() to move a group more than 1 up/down. [ticket/9549] Fix some minor issues with descriptions and coding-guidelines. [ticket/9549] Throw an error when the given field-name is invalid. [ticket/9549] Make the class non static and extend delete_group function. [ticket/9549] Add template changes for subsilver2. [ticket/9549] Enhance teampage and legend functionality [ticket/9549] Add the module and files for the ACP. [ticket/9549] Update database with the new config values and columns [ticket/9549] Enhance teampage functionality with a new class, group_positions. Conflicts: phpBB/install/database_update.php
| * | [ticket/9549] Update database with the new config values and columnsJoas Schilling2011-02-161-1/+2
| | | | | | | | | | | | PHPBB3-9549
* | | Merge branch 'develop-olympus' into developIgor Wiedler2011-02-241-0/+1
|\ \ \ | | |/ | |/| | | | | | | * develop-olympus: [ticket/10058] Initialize $phpbb_root_path in mysql_upgrader.php.
| * | [ticket/10058] Initialize $phpbb_root_path in mysql_upgrader.php.Oleg Pudeyev2011-02-241-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | Since knowledge base instructions tell users to place this script in the root of the forum, use './' as phpbb root path. Actual initialization code copied from check_flash_bbcodes.php. PHPBB3-10058
* | | Merge branch 'develop-olympus' into developOleg Pudeyev2011-02-232-2/+2
|\ \ \ | |/ / | | / | |/ |/| | | | | | | | | | | * develop-olympus: [ticket/7778] Update all the schema files [ticket/7778] Add the column change to `mysql_upgrader.php` [ticket/7778] BBCode single limit Conflicts: phpBB/install/database_update.php
| * [ticket/7778] Add the column change to `mysql_upgrader.php`Erik Frèrejean2011-02-231-1/+1
| | | | | | | | PHPBB3-7778
| * [ticket/7778] BBCode single limitErik Frèrejean2011-02-231-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | There are currently two hard limits for the number of BBCodes allowed. One is enforced by the type of the `bbcode_id` column, the other by an hard limit in `acp/acp_bbcode.php`. However this limit can never be reached due to the size of the database column. Suggested fix involves adding a new constant to define the max. number of BBCodes (as with smilies) and chaning the database column from a tinyint to a smallint to actually allow 1511 BBCodes PHPBB3-7778
* | Merge branch 'develop-olympus' into developNils Adermann2011-01-161-1/+1
|\ \ | |/ | | | | | | | | | | | | | | * develop-olympus: [ticket/9859] Remove the years from the copyright statements in docs files. [ticket/9859] Remove the year from the copyright meta tag in docs/*.html [ticket/9859] Remove the meta copyright tag as well. [ticket/9859] Remove the credit line comment from all html files. [ticket/9859] Remove years in credit line from some more files.
| * [ticket/9859] Remove years in credit line from some more files.Andreas Fischer2011-01-161-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | Standard HTML output now includes: Powered by <a href="http://www.phpbb.com/">phpBB</a> &copy; phpBB Group Print output now includes: Powered by phpBB &copy; phpBB Group<br />http://www.phpbb.com/ This also fixes an inconsistency where "phpBB Group" was linked instead of "phpBB". PHPBB3-9859
* | Merge branch 'ticket/igorw/9556' into developNils Adermann2010-12-1328-49/+68
|\ \ | | | | | | | | | | | | | | | | | | | | | * ticket/igorw/9556: [ticket/9556] Drop php closing tags, add trailing newline Conflicts: phpBB/includes/constants.php
| * | [ticket/9556] Drop php closing tags, add trailing newlineIgor Wiedler2010-11-1128-49/+68
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Closing tags converted using Oleg's script. remove-php-end-tags.py -a . Trailing newlines added using the following where $ext is file extension. find . -type f -name "*.$ext" -print | xargs printf "e %s\nw\n" | ed -s; Extensions: php, css, html, js, xml. PHPBB3-9556
* | | Merge branch 'develop-olympus' into developNils Adermann2010-11-201-0/+163
|\ \ \ | |/ / |/| / | |/ | | | | | | | | * develop-olympus: [prep-release-3.0.8] Incrementing version number to 3.0.8 and update changelog [ticket/9903] Script for detecting potentially malicious flash bbcodes [ticket/9904] Update WebPI Parameters.xml to work with WebMatrix. [ticket/9903] Fix XSS in BBcode-parser's Flash-BBcode.
| * [ticket/9903] Script for detecting potentially malicious flash bbcodesIgor Wiedler2010-11-191-0/+163
| | | | | | | | PHPBB3-9903
* | Merge branch 'develop-olympus' into developNils Adermann2010-08-211-0/+9
|\ \ | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * develop-olympus: (57 commits) Revert "[ticket/7716] Data too long for column 'message_subject'" [ticket/7716] Data too long for column 'message_subject' [ticket/9780] Adding unit tests for gen_rand_string(). [ticket/9780] Add length check back to gen_rand_string(). [ticket/7972] Copying topics in the MCP now indexes the new topic. [ticket/9782] Board disable radio set on when server load high [ticket/9635] Useless parameter $data['post_time'] in function submit_post. [ticket/9104] Safari does not display box headers correctly in the ACP. [ticket/9777] Print error message in pre-commit hook when php is not installed. [ticket/7716] Data too long for column 'message_subject' [task/git-tools] Ignore git commit message comments [task/git-tools] Adjust the hook to enforce that a ticket is always mentioned [task/git-tools] Vastly expanded commit-msg hook. [task/git-tools] Beginnings of a syntax checking hook. [task/git-tools] Append ticket identifier to commit message prior to editing. [ticket/7332] Redirect users back to post details when performing actions. [ticket/7332] Collapse post details content down to a maximum of 300px heigh [ticket/9771] Remove query string parameters that have no name. [ticket/9760] Remove unrestricted wildcards from search terms. [ticket/9599] Reimplement phpbb_checkdnsrr() function. ... Conflicts: tests/template/template.php
| * [task/set-permissions] shell script to set file permissionsIgor Wiedler2010-06-281-0/+9
| | | | | | | | PHPBB3-9689
* | Merge branch 'develop-olympus' into developNils Adermann2010-05-161-2/+3
|\ \ | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * develop-olympus: (21 commits) [feature/notify_status] Define'd constants for notify_status [ticket/7782] Send 404 HTTP code when a nonexistent user/forum/topic is requested. [ticket/9530] The prosilver problem in #9531 exists in subsilver2 editor.js [ticket/9530] Subsilver2 is missing BBCode-less quotes fallback-option when bbcodes are disabled. [ticket/9531] BBCode-less quotes fallback-option is missing "Author wrote:" line when quoting from topic-review. [ticket/9547] Use separate constants for display/enable active topics. [ticket/9535] Also fix the margin in the install_update.html [ticket/9535] Fix some more rtl margin issues. [ticket/9535] Correctly set margin of textarea in ACP > Users signature for RTL languages. [ticket/9524] IPv6 regex does not match all valid IPv6 addresses starting with :: [ticket/9510] Unable to copy permissions from and to forums you cannot see [ticket/9510] Unable to copy permissions from and to forums you cannot see [ticket/9545] Initial forum should display active topics by default. [ticket/9546] Also delete bookmarks, when a topic is deleted. [ticket/9529] Topic review is not showing all selected posts. [ticket/9528] Also fall back to bbcode-less quotes for PMs, when bbcodes are disabled. [ticket/9146] Fix double occurring tabindex="6" in prosilver's QR [ticket/9119] Respect language selection on automated update. [ticket/8894] Fix JavaScript-Error and hide Quote-Button on topic review if BBCodes are not allowed. [ticket/9567] Newly registered users group description rewording. ...
| * Merge branch 'ticket/aptx/9525' into develop-olympusNils Adermann2010-05-161-2/+3
| |\ | | | | | | | | | | | | * ticket/aptx/9525: [ticket/9524] IPv6 regex does not match all valid IPv6 addresses starting with ::
| | * [ticket/9524] IPv6 regex does not match all valid IPv6 addresses starting ↵Marek A. Ruszczyński2010-05-161-2/+3
| | | | | | | | | | | | | | | | | | | | | | | | with :: :: can replace 1 or more groups (not 2 or more) PHPBB3-9524