aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB
Commit message (Collapse)AuthorAgeFilesLines
* Merge commit '47dc492839ea44cb9aa3d0ad23f09dd2fd0b4ed9' into feature/prune-usersOleg Pudeyev2011-05-081-2/+2
|\ | | | | | | | | * commit '47dc492839ea44cb9aa3d0ad23f09dd2fd0b4ed9': [ticket/9997] Fixed an inconsistency in the Moderator Control Panel
| * Merge branch 'ticket/callumacrae/9997' into develop-olympusOleg Pudeyev2011-02-241-2/+2
| |\ | | | | | | | | | | | | * ticket/callumacrae/9997: [ticket/9997] Fixed an inconsistency in the Moderator Control Panel
| | * [ticket/9997] Fixed an inconsistency in the Moderator Control PanelCallum Macrae2011-02-241-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The order of the Approve / Disapprove buttons was inconsistent in the Moderator Control Panel - while on the main page and the moderation queue itself the Approve button was to the right of the Disapprove button, in the post details the Approve button was to the left of the Disapprove button. This very simple edit simply switches the position of these two buttons in the post details page in the mcp. PHPBB3-9995
* | | Merge commit '441755bf170e49799e311c71b2123ff263970d62' into feature/prune-usersOleg Pudeyev2011-05-084-14/+18
|\ \ \ | |/ / | | | | | | | | | * commit '441755bf170e49799e311c71b2123ff263970d62': [ticket/9874] view_log() performs unneeded count query over all log entries.
| * | Merge branch 'ticket/nickvergessen/9874' into develop-olympusOleg Pudeyev2011-02-244-14/+18
| |\ \ | | | | | | | | | | | | | | | | * ticket/nickvergessen/9874: [ticket/9874] view_log() performs unneeded count query over all log entries.
| | * | [ticket/9874] view_log() performs unneeded count query over all log entries.Joas Schilling2011-02-254-14/+18
| | |/ | | | | | | | | | PHPBB3-9874
* | | [feature/prune-users] Adjust some language strings for new featuresJosh Woody2011-05-084-45/+161
| | | | | | | | | | | | | | | | | | | | | Adjust two language strings for ACP prune feature to include descriptions for new features. PHPBB3-9622
* | | [feature/prune-users] Apply e6ed55a9c1ceb07ab2e87d4a53f9e688fda319c5.Oleg Pudeyev2011-05-081-40/+1
| | | | | | | | | | | | | | | | | | This was done in PHPBB3-9872. PHPBB3-9622
* | | [feature/prune-users] Rework user_delete() functions_user.phpJosh Woody2011-05-083-126/+149
| | | | | | | | | | | | | | | | | | | | | | | | | | | user_delete now uses fewer queries to delete a set of users of size > 1 by accepting an array of users rather than a single user at a time. This required changing the third parameter, however the function retains its former behavior with the old-style parameters. PHPBB3-9622
* | | Merge branch 'develop-olympus' into developIgor Wiedler2011-02-241-0/+1
|\ \ \ | |/ / | | | | | | | | | * develop-olympus: [ticket/10058] Initialize $phpbb_root_path in mysql_upgrader.php.
| * | Merge branch 'ticket/p/10058' into develop-olympusIgor Wiedler2011-02-241-0/+1
| |\ \ | | |/ | |/| | | | | | | * ticket/p/10058: [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 developAndreas Fischer2011-02-243-1/+13
|\ \ \ | |/ / | | | | | | | | | | | | | | | | | | | | | * develop-olympus: [ticket/10056] Corrected a typo in Firebird name. [ticket/10041] Use send_status_line more in download/file.php Conflicts: phpBB/download/file.php
| * | Merge branch 'ticket/p/10041' into develop-olympusAndreas Fischer2011-02-241-0/+12
| |\ \ | | | | | | | | | | | | | | | | * ticket/p/10041: [ticket/10041] Use send_status_line more in download/file.php
| | * | [ticket/10041] Use send_status_line more in download/file.phpOleg Pudeyev2011-02-231-0/+12
| | | | | | | | | | | | | | | | PHPBB3-10041
| * | | Merge branch 'ticket/p/10056' into develop-olympusAndreas Fischer2011-02-241-1/+1
| |\ \ \ | | |_|/ | |/| | | | | | | | | | * ticket/p/10056: [ticket/10056] Corrected a typo in Firebird name.
| | * | [ticket/10056] Corrected a typo in Firebird name.Oleg Pudeyev2011-02-231-1/+1
| | |/ | | | | | | | | | PHPBB3-10056
* | | Merge branch 'develop-olympus' into developOleg Pudeyev2011-02-2310-10/+21
|\ \ \ | |/ / | | | | | | | | | | | | | | | | | | | | | | | | * 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] Update all the schema filesErik Frèrejean2011-02-235-5/+5
| | | | | | | | | | | | | | | | | | Correct all the schema files to contain the new field type PHPBB3-7778
| * | [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-234-4/+14
| |/ | | | | | | | | | | | | | | | | | | | | | | | | 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 developOleg Pudeyev2011-02-213-44/+237
|\ \ | |/ | | | | | | | | | | | | * develop-olympus: [ticket/9675] Correctly check whether the style/component is still in use. [ticket/9675] Put the code into methods to avoid code duplication. [ticket/9675] Adjust the language-string to reflect the changes. [ticket/9675] Add option to delete template/theme/imageset when deleting style.
| * Merge branch 'ticket/nickvergessen/9675' into develop-olympusOleg Pudeyev2011-02-213-44/+237
| |\ | | | | | | | | | | | | | | | | | | | | | * ticket/nickvergessen/9675: [ticket/9675] Correctly check whether the style/component is still in use. [ticket/9675] Put the code into methods to avoid code duplication. [ticket/9675] Adjust the language-string to reflect the changes. [ticket/9675] Add option to delete template/theme/imageset when deleting style.
| | * [ticket/9675] Correctly check whether the style/component is still in use.Joas Schilling2011-02-081-28/+64
| | | | | | | | | | | | | | | | | | And don't allow to delete it in that case. PHPBB3-9675
| | * [ticket/9675] Put the code into methods to avoid code duplication.Joas Schilling2011-02-083-124/+162
| | | | | | | | | | | | PHPBB3-9675
| | * [ticket/9675] Adjust the language-string to reflect the changes.Joas Schilling2011-02-081-1/+1
| | | | | | | | | | | | PHPBB3-9675
| | * [ticket/9675] Add option to delete template/theme/imageset when deleting style.Joas Schilling2011-02-083-2/+121
| | | | | | | | | | | | PHPBB3-9675
* | | Merge branch 'develop-olympus' into developOleg Pudeyev2011-02-201-2/+2
|\ \ \ | |/ / | | | | | | | | | * develop-olympus: [ticket/10047] Do not put session id in URL on posting.php when cookies are on.
| * | [ticket/10047] Do not put session id in URL on posting.php when cookies are on.Andreas Fischer2011-02-191-2/+2
| | | | | | | | | | | | PHPBB3-10047
* | | Merge branch 'develop-olympus' into developOleg Pudeyev2011-02-172-9/+35
|\ \ \ | |/ / | | | | | | | | | | | | | | | | | | | | | * develop-olympus: [ticket/9944] Add empty line before the while() so you can better read the code [ticket/9944] Extension groups naming don't use users' language in ACP Conflicts: phpBB/install/database_update.php
| * | Merge branch 'ticket/nickvergessen/9944' into develop-olympusOleg Pudeyev2011-02-172-9/+35
| |\ \ | | | | | | | | | | | | | | | | | | | | * ticket/nickvergessen/9944: [ticket/9944] Add empty line before the while() so you can better read the code [ticket/9944] Extension groups naming don't use users' language in ACP
| | * | [ticket/9944] Add empty line before the while() so you can better read the codeJoas Schilling2011-02-141-0/+1
| | | | | | | | | | | | | | | | PHPBB3-9944
| | * | [ticket/9944] Extension groups naming don't use users' language in ACPJoas Schilling2011-01-272-9/+34
| | |/ | | | | | | | | | | | | | | | Only happens on boards which were installed with 3.0.8 PHPBB3-9944
* | | [ticket/10045] Update version in some more files.Joas Schilling2011-02-1611-11/+11
| | | | | | | | | | | | | | | | | | I did not include the docs/INSTALL.html, because we need to do a bit more on that file before releasing 3.1 (Add section how to update from 3.0 to 3.1, ...) PHPBB3-10045
* | | [ticket/10045] Database updater version for 3.1-changes should be 3.1.0-devJoas Schilling2011-02-161-3/+5
| | | | | | | | | | | | PHPBB3-10045
* | | Merge branch 'develop-olympus' into developIgor Wiedler2011-02-131-1/+1
|\ \ \ | |/ / | | | | | | | | | * develop-olympus: [ticket/8904] Show default value for numeric custom profile fields when editing
| * | [ticket/8904] Show default value for numeric custom profile fields when editingNiklas Schmidtmer2011-02-131-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | When displaying the default value for a numeric custom profile field, only use request_var to obtain the value on creation. When editing, it will always override the actual value with an empty string, as this is request_var's default return value. PHPBB3-8904
* | | [feature/system-cron] Added documentation for cron manager constructor.Oleg Pudeyev2011-02-121-1/+15
| | | | | | | | | | | | PHPBB3-9596
* | | [feature/system-cron] Remove an unecessary assignment and an unecessary commentNils Adermann2011-02-121-3/+1
| | | | | | | | | | | | PHPBB3-9596
* | | [feature/system-cron] Clarify comments about flush() call in cron.Nils Adermann2011-02-121-1/+3
| | | | | | | | | | | | PHPBB3-9596
* | | [feature/system-cron] preg_match returns int so cast to bool, fix commentNils Adermann2011-02-122-2/+2
| | | | | | | | | | | | PHPBB3-9596
* | | [feature/system-cron] Rename lock() to acquire and unlock() to release.Nils Adermann2011-02-122-7/+7
| | | | | | | | | | | | PHPBB3-9596
* | | [feature/system-cron] Cache cron's task names.Nils Adermann2011-02-123-12/+35
| | | | | | | | | | | | | | | | | | | | | | | | Instead of using a path relative to phpbb_root_path the path to the task directory is directly passed to the cron manager. Dummy tasks are now in the tests directory directly. PHPBB3-9596
* | | [feature/system-cron] Use a RecursiveDirectoryIterator instead of readdir.Nils Adermann2011-02-123-20/+13
| | | | | | | | | | | | PHPBB3-9596
* | | [feature/system-cron] Add array type hints if appropriate and remove globals.Nils Adermann2011-02-122-12/+23
| | | | | | | | | | | | PHPBB3-9596
* | | [feature/system-cron] Make use of the new config class in locks.Nils Adermann2011-02-121-32/+12
| | | | | | | | | | | | PHPBB3-9596
* | | [feature/system-cron] Abstract the database locking mechanism out of cron.Nils Adermann2011-02-123-109/+163
| | | | | | | | | | | | | | | | | | | | | Added a number of tests for the locking mechanism which can now lock arbitrary config variables. PHPBB3-9596
* | | [feature/system-cron] Added @param/@return documentationOleg Pudeyev2011-02-1214-11/+98
| | | | | | | | | | | | | | | | | | Also adjusted some function descriptions for greater informativity. PHPBB3-9596
* | | [feature/system-cron] Add phpDoc documentation for everything else.Andreas Fischer2011-02-1212-1/+80
| | | | | | | | | | | | PHPBB3-9596
* | | [feature/system-cron] Cast result in cron_manager::is_valid_name() to bool.Andreas Fischer2011-02-121-2/+2
| | | | | | | | | | | | PHPBB3-9596