aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB
Commit message (Collapse)AuthorAgeFilesLines
...
| * | [ticket/10896] Adds email validation to email settings in ACPDavid Tobin2013-02-043-2/+10
| | | | | | | | | | | | | | | | | | | | | Adds a new validation type to the ACP validate_config_vars function and implements it on the board_contact and board_email settings. PHPBB3-10896
* | | Merge remote-tracking branch 'github-bantu/ticket/11122' into develop-olympusNils Adermann2013-02-241-1/+2
|\ \ \ | | | | | | | | | | | | | | | | | | | | * github-bantu/ticket/11122: [ticket/11122] Move rxu to 'Former Contributors' section. [ticket/11122] Add EXreaction to docs/AUTHORS.
| * | | [ticket/11122] Move rxu to 'Former Contributors' section.Andreas Fischer2013-02-241-1/+1
| | | | | | | | | | | | | | | | PHPBB3-11122
| * | | [ticket/11122] Add EXreaction to docs/AUTHORS.Andreas Fischer2013-02-241-0/+1
| | |/ | |/| | | | | | | PHPBB3-11122
* | | [ticket/7262] Add note about set_config() not updating is_dynamic.Andreas Fischer2013-02-241-0/+3
| | | | | | | | | | | | PHPBB3-7262
* | | [ticket/7262] Add $is_dynamic example to set_config() and set_config_count().Andreas Fischer2013-02-241-4/+6
| | | | | | | | | | | | | | | | | | | | | The logic is the other way around here in comparison to develop's phpbb_config_db class, so add examples to make things more clear. PHPBB3-7262
* | | [ticket/7262] Backport set_config() and set_config_count() docs from develop.Andreas Fischer2013-02-241-2/+16
|/ / | | | | | | PHPBB3-7262
* | [ticket/11196] Changed 401 response message in session.php.erangamapa2013-02-121-1/+1
|/ | | | | | | In session.php 401 response message was "Not Authorized". I changed it to "Unauthorized". PHPBB3-11196
* Merge remote-tracking branch 'Crizz0/ticket/11220' into develop-olympusAndreas Fischer2013-02-031-3/+3
|\ | | | | | | | | * Crizz0/ticket/11220: [ticket/11220] Improvement to the info pop-up from "list="
| * [ticket/11220] Improvement to the info pop-up from "list="Crizz02013-02-031-3/+3
| | | | | | | | | | | | | | A improvement to the info popup which is displayed when the cursor is over the bbcode-button [list=] in the posting-editor PHPBB3-11220
* | Merge remote-tracking branch 'dhruvgoel92/ticket/11233' into develop-olympusAndreas Fischer2013-01-311-1/+1
|\ \ | | | | | | | | | | | | * dhruvgoel92/ticket/11233: [ticket/11233] prohibit selecting anonymous user as a PM recipient
| * | [ticket/11233] prohibit selecting anonymous user as a PM recipientDhruv2013-01-301-1/+1
| | | | | | | | | | | | | | | | | | | | | While composing pm, it should not be allowed to add anonymous user as a PM recipient PHPBB3-11233
* | | Merge remote-tracking branch 'remotes/Senky/ticket/10050' into develop-olympusNathaniel Guse2013-01-301-1/+1
|\ \ \ | |/ / |/| | | | | | | | | | | | | | | | | # By Senky # Via Senky * remotes/Senky/ticket/10050: [ticket/10050] removing prosilver edits [ticket/10050] adding .topicrow to template condition
| * | [ticket/10050] removing prosilver editsSenky2013-01-241-1/+1
| | | | | | | | | | | | PHPBB3-10050
| * | [ticket/10050] adding .topicrow to template conditionSenky2013-01-222-2/+2
| | | | | | | | | | | | PHPBB3-10050
* | | [ticket/11343] Remove spare parentheses.Andreas Fischer2013-01-251-1/+1
| | | | | | | | | | | | PHPBB3-11343
* | | [ticket/11343] Remove spare space.Andreas Fischer2013-01-251-1/+1
| | | | | | | | | | | | PHPBB3-11343
* | | [ticket/11343] Use === when checking stored user_actkey against user input.Andreas Fischer2013-01-251-1/+1
| |/ |/| | | | | | | | | | | Use strict comparison when checking whether stored user_actkey is equal to user input. PHPBB3-11343
* | Merge remote-tracking branch 'remotes/Sajaki/ticket/10854' into develop-olympusNathan Guse2013-01-151-0/+16
|\ \ | | | | | | | | | | | | | | | | | | # By Sajaki # Via Sajaki * remotes/Sajaki/ticket/10854: [ticket/10854] sql server drop default constraint when dropping column
| * | [ticket/10854] sql server drop default constraint when dropping columnSajaki2012-04-281-0/+16
| | | | | | | | | | | | | | | | | | drops default columns with T-SQL before attempting drop column to avoids sql exception. This is a huge annoyance in UMIL scripts running under sql server.
* | | [ticket/11301] Guidelines: Add spaces in front and after the / operator.Andreas Fischer2013-01-081-1/+1
| | | | | | | | | | | | PHPBB3-11301
* | | [ticket/11301] Explicitly cast str offset to int to prevent E_NOTICE on 5.4.Andreas Fischer2013-01-081-1/+1
| | | | | | | | | | | | PHPBB3-11301
* | | Merge remote-tracking branch 'gn36/ticket/11292' into develop-olympusAndreas Fischer2013-01-061-0/+1
|\ \ \ | | | | | | | | | | | | | | | | * gn36/ticket/11292: [ticket/11292] Fix: Newlines removed in display of PM reports
| * | | [ticket/11292] Fix: Newlines removed in display of PM reportsMartin Beckmann2012-12-241-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Report text is run through make_clickable and bbcode_nl2br for PMs just as it is for posts. PHPBB3-11292
* | | | [ticket/11293] Add a note that mysqli should be in front of mysql.Oleg Pudeyev2012-12-251-0/+2
|/ / / | | | | | | | | | | | | | | | | | | php 5.5 alpha 2 deprecated mysql extension, prefer mysqli if both are available. PHPBB3-11293
* | | Merge PR #1152 branch 'nickvergessen/ticket/11278' into develop-olympusOleg Pudeyev2012-12-221-17/+30
|\ \ \ | | | | | | | | | | | | | | | | | | | | * nickvergessen/ticket/11278: [ticket/11278] Comment out the code for dropping the Q&A tables [ticket/11278] Fix not running queries from db tools in database update
| * | | [ticket/11278] Comment out the code for dropping the Q&A tablesJoas Schilling2012-12-211-6/+20
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Due to a bug, vanilla phpbb could not create captcha tables in 3.0.8 on firebird. It was possible for board administrators to adjust the code to work. If code was manually adjusted by board administrators, index names would not be the same as what 3.0.9 and newer expect. This code fragment drops captcha tables, destroying all entered Q&A captcha configuration, such that when Q&A is configured next the respective tables will be created with corrent index names. If you wish to preserve your Q&A captcha configuration, you can manually rename indexes to the currently expected name: phpbb_captcha_questions_lang_iso => phpbb_captcha_question_lang phpbb_captcha_answers_question_id => phpbb_captcha_answers_qid Again, this needs to be done only if a board was manually modified to fix broken captcha code. PHPBB3-11278
| * | | [ticket/11278] Fix not running queries from db tools in database updateJoas Schilling2012-12-191-13/+12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The db_tools class is running in return mode, which means that the queries are not run, but just returned. Therefor the broken tables were not removed from the database. PHPBB3-11278
* | | | [ticket/10880] The m_approve permisson no longer implies f_noapprove.Andreas Fischer2012-12-192-5/+7
|/ / / | | | | | | | | | PHPBB3-10880
* | | [ticket/8610] Update commentNathan Guse2012-12-151-1/+1
| | | | | | | | | | | | PHPBB3-8610
* | | Merge branch 'develop-olympus' of github.com:phpbb/phpbb3 into ticket/8610Nathan Guse2012-12-133-16/+218
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | # By Oleg Pudeyev (29) and others # Via Andreas Fischer (3) and others * 'develop-olympus' of github.com:phpbb/phpbb3: (36 commits) [ticket/11262] Add .lock in cache directory to .gitignore [ticket/11265] Add assertions for board installation success. [ticket/11162] Reformat. [ticket/10491] Make recreate_database static. [ticket/11162] Rename tricky updates to database helper. [ticket/10491] Install board once per test run. [ticket/10972] Drop user deletion. [ticket/10972] Tweak user addition. [ticket/10972] Add destroy method to mock cache. [ticket/10972] Add mock null cache. [ticket/10972] Backport get_db from develop. [ticket/10972] Added explicit checks for creating duplicate users. [ticket/10972] Moved tests into appropriate places and added comments [ticket/10972] Added methods for creating and deleting basic users [ticket/11162] Use empty($queries). [ticket/11162] Review comments fixed. [ticket/11162] Reformat. [ticket/11162] Newlines to LF. [ticket/11162] Use correct functions. [ticket/11162] Account for notify_status. ... Conflicts: phpBB/includes/mcp/mcp_topic.php
| * \ \ Merge remote-tracking branch 'p/ticket/11162' into develop-olympusAndreas Fischer2012-12-143-13/+217
| |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * p/ticket/11162: (22 commits) [ticket/11162] Reformat. [ticket/11162] Rename tricky updates to database helper. [ticket/11162] Use empty($queries). [ticket/11162] Review comments fixed. [ticket/11162] Reformat. [ticket/11162] Newlines to LF. [ticket/11162] Use correct functions. [ticket/11162] Account for notify_status. [ticket/11162] This test really only works for bookmarks. [ticket/11162] The test is not at all trivial. [ticket/11162] Add includes. [ticket/11162] Move to a separate file to avoid blowing out functions.php. [ticket/11162] No whitespace changes in olympus. [ticket/11162] Fix inaccurately copy pasted comment. [ticket/11162] Use phpbb_update_rows_avoiding_duplicates in mcp. [ticket/11162] Clarify that only the two tables actually work. [ticket/11162] Uncomment transactions. [ticket/11162] An implementation that actually works. [ticket/11162] Make count function upper case. [ticket/11162] Rename count variable name to remaining_rows. ...
| | * | | [ticket/11162] Rename tricky updates to database helper.Oleg Pudeyev2012-12-123-2/+2
| | | | | | | | | | | | | | | | | | | | PHPBB3-11162
| | * | | [ticket/11162] Use empty($queries).Oleg Pudeyev2012-12-051-6/+2
| | | | | | | | | | | | | | | | | | | | PHPBB3-11162
| | * | | [ticket/11162] Review comments fixed.Oleg Pudeyev2012-12-051-6/+6
| | | | | | | | | | | | | | | | | | | | PHPBB3-11162
| | * | | [ticket/11162] Reformat.Oleg Pudeyev2012-12-051-3/+5
| | | | | | | | | | | | | | | | | | | | PHPBB3-11162
| | * | | [ticket/11162] Newlines to LF.Oleg Pudeyev2012-12-051-208/+208
| | | | | | | | | | | | | | | | | | | | PHPBB3-11162
| | * | | [ticket/11162] Use correct functions.Oleg Pudeyev2012-12-052-4/+4
| | | | | | | | | | | | | | | | | | | | PHPBB3-11162
| | * | | [ticket/11162] Account for notify_status.Oleg Pudeyev2012-12-051-3/+108
| | | | | | | | | | | | | | | | | | | | PHPBB3-11162
| | * | | [ticket/11162] Add includes.Oleg Pudeyev2012-12-042-0/+8
| | | | | | | | | | | | | | | | | | | | PHPBB3-11162
| | * | | [ticket/11162] Move to a separate file to avoid blowing out functions.php.Oleg Pudeyev2012-12-042-87/+103
| | | | | | | | | | | | | | | | | | | | PHPBB3-11162
| | * | | [ticket/11162] No whitespace changes in olympus.Oleg Pudeyev2012-12-011-1/+1
| | | | | | | | | | | | | | | | | | | | PHPBB3-11162
| | * | | [ticket/11162] Fix inaccurately copy pasted comment.Oleg Pudeyev2012-12-011-1/+1
| | | | | | | | | | | | | | | | | | | | PHPBB3-11162
| | * | | [ticket/11162] Use phpbb_update_rows_avoiding_duplicates in mcp.Oleg Pudeyev2012-12-012-12/+2
| | | | | | | | | | | | | | | | | | | | PHPBB3-11162
| | * | | [ticket/11162] Clarify that only the two tables actually work.Oleg Pudeyev2012-12-011-0/+2
| | | | | | | | | | | | | | | | | | | | PHPBB3-11162
| | * | | [ticket/11162] Uncomment transactions.Oleg Pudeyev2012-12-011-2/+2
| | | | | | | | | | | | | | | | | | | | PHPBB3-11162
| | * | | [ticket/11162] An implementation that actually works.Oleg Pudeyev2012-12-011-5/+68
| | | | | | | | | | | | | | | | | | | | PHPBB3-11162
| | * | | [ticket/11162] Extract existing behavior into a function and add a test.Oleg Pudeyev2012-11-021-1/+23
| | | | | | | | | | | | | | | | | | | | PHPBB3-11162
* | | | | [ticket/8610] Use phpbb_update_rows_avoiding_duplicatesNathan Guse2012-12-132-22/+6
| | | | | | | | | | | | | | | | | | | | PHPBB3-8610
* | | | | [ticket/8610] Revert some funky merging I did from rebaseNathan Guse2012-12-133-12/+3
| | | | | | | | | | | | | | | | | | | | PHPBB3-8610