aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB/adm
Commit message (Collapse)AuthorAgeFilesLines
...
* | [ticket/10070] Fixed line endings after ticket/9549.Oleg Pudeyev2011-03-011-158/+158
| | | | | | | | PHPBB3-10070
* | Merge branch 'ticket/9549' into developOleg Pudeyev2011-03-012-0/+162
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 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] Only add group to legend/teampage when the checkbox is checked.Joas Schilling2011-02-171-0/+4
| | | | | | | | | | | | | | | | | | The checkbox for the teampage was also missing from the template file. PHPBB3-9549
| * | [ticket/9549] Fix some minor issues with descriptions and coding-guidelines.Joas Schilling2011-02-161-1/+1
| | | | | | | | | | | | PHPBB3-9549
| * | [ticket/9549] Add the module and files for the ACP.Joas Schilling2011-02-161-0/+158
| | | | | | | | | | | | PHPBB3-9549
* | | Merge branch 'develop-olympus' into developOleg Pudeyev2011-02-211-0/+15
|\ \ \ | |/ / |/| / | |/ | | | | | | | | * 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-211-0/+15
| |\ | | | | | | | | | | | | | | | | | | | | | * 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] Put the code into methods to avoid code duplication.Joas Schilling2011-02-081-3/+4
| | | | | | | | | | | | PHPBB3-9675
| | * [ticket/9675] Add option to delete template/theme/imageset when deleting style.Joas Schilling2011-02-081-0/+14
| | | | | | | | | | | | PHPBB3-9675
| * | [ticket/10020] Fix 32-bit php braindamage around INT_MIN.Oleg Pudeyev2011-02-041-2/+5
| | | | | | | | | | | | | | | | | | | | | | | | On 32-bit php, -2147483648, despite fitting in the int type, is for some reason made into a floating-point value. Use an explicit cast to make it an integer. PHPBB3-10020
| * | [ticket/10020] Replaced (int) 0x80000000 with portable equivalent.Oleg Pudeyev2011-02-041-1/+2
| |/ | | | | | | PHPBB3-10020
* | [ticket/9823] Moving the functions. Unit tests for build_select.Joas Schilling2011-02-011-537/+1
| | | | | | | | PHPBB3-9823
* | Merge branch 'develop-olympus' into developNils Adermann2011-01-163-38/+5
|\ \ | |/ | | | | | | | | | | | | | | * 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 the credit line comment from all html files.Andreas Fischer2011-01-163-35/+2
| | | | | | | | PHPBB3-9859
| * [ticket/9859] Remove years in credit line from some more files.Andreas Fischer2011-01-163-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | 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 'feature/igorw/request-class' into developAndreas Fischer2010-12-161-2/+4
|\ \ | | | | | | | | | | | | | | | | | | | | | * feature/igorw/request-class: [feature/request-class] Convert some remaining cookies [feature/request-class] Adjust misleading comment [feature/request-class] Remove direct access to _REQUEST in acp_search [feature/request-class] Special case of direct access to _REQUEST
| * | [feature/request-class] Remove direct access to _REQUEST in acp_searchIgor Wiedler2010-10-171-2/+4
| | | | | | | | | | | | PHPBB3-9716
* | | Merge branch 'develop-olympus' into developNils Adermann2010-12-133-3/+3
|\ \ \ | | |/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * develop-olympus: [ticket/9851] "Search new posts" should require login. [task/phpdoc] Added a phpdoc task to the build process [task/phpdoc] Added a configuration file for phpDocumentor. [feature/acm-wincache] Adding caching module for WinCache's User Cache. [ticket/9939] Fix JavaScript error in admin recaptcha template [ticket/9575] Also change 'administrate' to 'administer' in templates [ticket/8736] guest can have 255 chars long username [ticket/9928] Do not link "login to your board" to the "send statistics" page. [ticket/9575] Change 'administrate' to 'administer' [ticket/9921] Adding sample configuration file for the lighttpd webserver. [ticket/9932] Add the Bing bot when converting [ticket/9930] Redirect failes with open_basedir enabled. [ticket/9910] Make sure S_BBCODE_ALLOWED exists when viewing PMs
| * | [ticket/9939] Fix JavaScript error in admin recaptcha templateIgor Wiedler2010-12-051-1/+1
| | | | | | | | | | | | PHPBB3-9939
| * | [ticket/9575] Also change 'administrate' to 'administer' in templatesIgor Wiedler2010-12-052-2/+2
| | | | | | | | | | | | PHPBB3-9575
* | | Merge branch 'ticket/igorw/9556' into developNils Adermann2010-12-1329-31/+27
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 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-1129-31/+27
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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 developAndreas Fischer2010-11-181-1/+2
|\ \ \ \ | |/ / / |/| / / | |/ / | | | | | | | | | | | | | | | * develop-olympus: [ticket/9899] Change recaptcha theme from default to 'clean' in the ACP. [ticket/9509] Fix a typo and wrong period placement [develop-olympus] Revert accidental revert of db update lang fix and version [develop-olympus] Remove accidentally added trailing newlines. [develop-olympus] Incrementing the version number to 3.0.9-dev.
| * | [ticket/9899] Change recaptcha theme from default to 'clean' in the ACP.RMcGirr832010-11-181-1/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | Change recaptcha theme from default to 'clean' in the ACP to better match the administration control panel. Follow up to d6aa25ede149a2d483b064f5ce96abcf49458ee3. PHPBB3-9899
* | | Merge branch 'develop-olympus' into developAndreas Fischer2010-11-061-0/+6
|\ \ \ | |/ / | | | | | | | | | | | | | | | * develop-olympus: [ticket/9827] No longer emulate Internet Explorer 7 when using IE9. [ticket/9850] Display upgrade instructions for feature release in acp [ticket/9835] subsilver2: Don't show "To prevent automated ..." when logging in
| * | [ticket/9850] Display upgrade instructions for feature release in acpIgor Wiedler2010-11-021-0/+6
| | | | | | | | | | | | PHPBB3-9850
* | | Merge branch 'develop-olympus' into developIgor Wiedler2010-10-171-1/+1
|\ \ \ | |/ / | | / | |/ |/| | | | | | | | | | | | | | | | | | | | | | | | | | | * develop-olympus: [ticket/7332] Fix post details expand link rendering on Webkit. [ticket/9162] Prevent notice on unset poll title [ticket/7417] Also focus search keywords and username in subsilver2. [ticket/7417] Focus username field when prosilver login page is loaded. [ticket/7417] Focus search keywords field when prosilver search page is loaded. [ticket/9841] Change "Save" to "Save draft", "Load" to "Load draft". [ticket/9664] Resolve conflict with accesskey="t", change addlitsitem to "y". [ticket/7538] Limit user_login_attempts to prevent SQL errors. [ticket/9848] Add avatars, attachments and store files to .gitignore. [ticket/9822] Correct some style related ACP explain statements. [ticket/9698] Add .htaccess to the includes subdirectory. [ticket/9830] Redirect to install directly when config.php does not exist. [ticket/9816] Remove config.php from repository [ticket/9810] Hide "Select All" of code bbcode on print page
| * [ticket/9664] Resolve conflict with accesskey="t", change addlitsitem to "y".Andreas Fischer2010-10-151-1/+1
| | | | | | | | PHPBB3-9664
* | [feature/request-class] Convert any direct access to $_* to use $requestIgor Wiedler2010-09-251-1/+2
|/ | | | PHPBB3-9716
* [ticket/8935] Prevent setting maximum avatar dimensions less than the minimums.Chris Smith2010-09-091-0/+14
| | | | | | | | This change actually applies to any configruation setting that is a pair of values one representing the maximum and one minimum. This change enforces that the maximum value cannot be less than the minimum value. PHPBB3-8935
* Merge branch 'ticket/nickvergessen/9519' into develop-olympusAndreas Fischer2010-08-281-1/+1
|\ | | | | | | | | | | | | | | * ticket/nickvergessen/9519: [ticket/9519] Replace remaining is_writable() calls with phpbb_is_writable(). [ticket/9519] Replace remaining is_writable() calls with phpbb_is_writable(). [ticket/9519] Replace remaining is_writable() calls with phpbb_is_writable(). [ticket/9519] Replace remaining is_writable() calls with phpbb_is_writable().
| * [ticket/9519] Replace remaining is_writable() calls with phpbb_is_writable().Joas Schilling2010-08-131-1/+1
| | | | | | | | PHPBB3-9519
* | [ticket/9104] Safari does not display box headers correctly in the ACP.Joas Schilling2010-08-191-5/+1
| | | | | | | | PHPBB3-9104
* | [ticket/9499] Unify definition of dE() and other javascript functionsJosh Woody2010-07-261-5/+10
|/ | | | | | | | dE() was defined differently in the ACP and in prosilver. Other javascript in editor.js files has also been unified (taking the prosilver implementation as cannonical) PHPBB3-9499
* [ticket/9695] Correct the improper display of user input in mcp_ban.phpJosh Woody2010-07-011-3/+3
| | | | | | Correct the improper display of "ban_reason" and "ban_give_reason" in mcp_ban.php PHPBB3-9695
* Merge branch 'ticket/bantu/9547' into develop-olympusNils Adermann2010-05-161-2/+2
|\ | | | | | | | | * ticket/bantu/9547: [ticket/9547] Use separate constants for display/enable active topics.
| * [ticket/9547] Use separate constants for display/enable active topics.Andreas Fischer2010-05-161-2/+2
| | | | | | | | | | | | | | | | Split S_DISPLAY_ACTIVE_TOPICS into S_DISPLAY_ACTIVE_TOPICS and S_ENABLE_ACTIVE_TOPICS so we have correct default values when changing the forum type. PHPBB3-9547
* | Merge branch 'ticket/nickvergessen/9535' into develop-olympusNils Adermann2010-05-163-24/+24
|\ \ | | | | | | | | | | | | | | | | | | * ticket/nickvergessen/9535: [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/9535] Also fix the margin in the install_update.htmlJoas Schilling2010-05-161-19/+19
| | | | | | | | | | | | PHPBB3-9535
| * | [ticket/9535] Fix some more rtl margin issues.Joas Schilling2010-05-161-2/+2
| | | | | | | | | | | | PHPBB3-9535
| * | [ticket/9535] Correctly set margin of textarea in ACP > Users signature for ↵Joas Schilling2010-05-161-3/+3
| |/ | | | | | | | | | | RTL languages. PHPBB3-9535
* | [ticket/9548] Delete user quicktool drop down should have an empty or ↵Joas Schilling2010-04-181-1/+1
|/ | | | | | invalid selection as the default PHPBB3-9548
* [bug/58745] Correctly close user-delete-form in ACP User Overview (Bug #58745)Joas Schilling2010-04-031-1/+1
|
* Bug #58085 - Add terminating semicolons to JavaScript code found by JSLint. ↵Andreas Fischer2010-02-251-2/+2
| | | | | | Patch by nn- git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@10539 89ea8834-ac86-4346-8a33-228a782c2dd0
* merge r10513 into 3.0 branch: propdelNils Adermann2010-02-231-0/+0
| | | | git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@10525 89ea8834-ac86-4346-8a33-228a782c2dd0
* warn users about TEXTHenry Sudhof2010-02-201-0/+22
| | | | git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@10511 89ea8834-ac86-4346-8a33-228a782c2dd0
* Hopefully nobody will notice me sneaking this one in:Chris Smith2010-01-311-3/+3
| | | | | | | Fix javascript bug in the smilies ACP. #55725 git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@10463 89ea8834-ac86-4346-8a33-228a782c2dd0
* Add a warning for users of old PHP versions about ending support.Josh Woody2010-01-261-0/+6
| | | | git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@10458 89ea8834-ac86-4346-8a33-228a782c2dd0
* ACP usabilityHenry Sudhof2010-01-261-1/+1
| | | | git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@10450 89ea8834-ac86-4346-8a33-228a782c2dd0
* Bug #52495 - [Fix] Replace hard coded "px" with translated language-string.Joas Schilling2010-01-252-2/+2
| | | | | | | Authorised by: bantu git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@10441 89ea8834-ac86-4346-8a33-228a782c2dd0