aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB
Commit message (Collapse)AuthorAgeFilesLines
...
* | | | | | | | | | Merge branch 'develop-olympus' into develop-ascraeusCesar G2014-04-101-1/+1
|\ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | * develop-olympus: [ticket/10687] Improve error message if unable to get image dimensions
| * | | | | | | | | Merge remote-tracking branch 'marc1706/ticket/10687' into develop-olympusCesar G2014-04-101-1/+1
| |\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * marc1706/ticket/10687: [ticket/10687] Improve error message if unable to get image dimensions
| | * | | | | | | | | [ticket/10687] Improve error message if unable to get image dimensionsMarc Alexander2014-04-091-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The error message that is presented if getimagesize() was unable to determine an image's dimensions now additionally states that this might be caused by an incorrect URL. PHPBB3-10687
* | | | | | | | | | | Merge remote-tracking branch 'github-nickvergessen/ticket/12370' into ↵Nils Adermann2014-04-101-4/+8
|\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | develop-ascraeus * github-nickvergessen/ticket/12370: [ticket/12370] Add unit tests for topic notifications [ticket/12370] Fix functional notification test and remove unneeded requests [ticket/12370] Do not delete topic notifications when the topic is visible
| * | | | | | | | | | | [ticket/12370] Do not delete topic notifications when the topic is visibleJoas Schilling2014-04-071-4/+8
| | |_|_|_|_|_|_|/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | We should only delete the topic notifications, when the topic is not approved anymore. This happens, when the post was the last approved but is now unapproved because the user is on queue, or when it has been softdeleted while editing. PHPBB3-12370
* | | | | | | | | | | Merge remote-tracking branch 'github-nickvergessen/ticket/12113' into ↵Nils Adermann2014-04-103-15/+28
|\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | develop-ascraeus * github-nickvergessen/ticket/12113: [ticket/12113] Fix view_log() tests [ticket/12113] Correctly use plurals when deleting user warnings [ticket/12113] Allow log entries to use plurals
| * | | | | | | | | | | [ticket/12113] Correctly use plurals when deleting user warningsJoas Schilling2014-04-012-11/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-12113
| * | | | | | | | | | | [ticket/12113] Allow log entries to use pluralsJoas Schilling2014-04-011-4/+18
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-12113
* | | | | | | | | | | | Merge remote-tracking branch 'github-nickvergessen/ticket/12373' into ↵Nils Adermann2014-04-101-4/+13
|\ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | develop-ascraeus * github-nickvergessen/ticket/12373: [ticket/12373] Add to and from forum_id to LOG_MOVE log entries
| * | | | | | | | | | | | [ticket/12373] Add to and from forum_id to LOG_MOVE log entriesJoas Schilling2014-04-081-4/+13
| | |_|_|_|_|_|/ / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-12373
* | | | | | | | | | | | Merge remote-tracking branch 'github-nickvergessen/ticket/12348' into ↵Nils Adermann2014-04-101-8/+19
|\ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | develop-ascraeus * github-nickvergessen/ticket/12348: [ticket/12348] Allow to run create_schema_files when phpBB is not installed
| * | | | | | | | | | | | [ticket/12348] Allow to run create_schema_files when phpBB is not installedJoas Schilling2014-04-031-8/+19
| | |/ / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-12348
* | | | | | | | | | | | Merge remote-tracking branch 'github-nickvergessen/ticket/12331' into ↵Nils Adermann2014-04-101-0/+1
|\ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | develop-ascraeus * github-nickvergessen/ticket/12331: [ticket/12331] Add functional test for saving custom profile fields [ticket/12331] Fix SQL error when inserting a new entry to profile field data
| * | | | | | | | | | | | [ticket/12331] Fix SQL error when inserting a new entry to profile field dataJoas Schilling2014-03-301-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | There was a "Field 'pf_phpbb_interests' doesn't have a default value" error, because we didn't specify values for the disabled fields. We can not disable the sql_return_on_error() thou, because it otherwise we run into "Duplicate entry '2' for key 'PRIMARY'" errors when the user submits the form again but didn't change any values. PHPBB3-12331
* | | | | | | | | | | | | Merge remote-tracking branch 'github-nickvergessen/ticket/12286' into ↵Nils Adermann2014-04-101-69/+116
|\ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | develop-ascraeus * github-nickvergessen/ticket/12286: [ticket/12286] Reword section about plurals [ticket/12286] Fix spelling of elephant(s) in the sample [ticket/12286] Correctly capitalize PHP [ticket/12286] Fix nesting of ul inside li element [ticket/12286] Add note that goto should not be used [ticket/12286] Add section about plurals to the coding guidelines [ticket/12286] Classes must use the name space [ticket/12286] Remove section about utf8_normalize_nfc() [ticket/12286] Use $request->variable() instead of request_var() [ticket/12286] Function names should be prefixed with phpbb_ [ticket/12286] Add "Since" to template event docs [ticket/12286] style.php and imagesets dont exist anymore [ticket/12286] Styles have a phpbb_version and a style_version in 3.1 [ticket/12286] Use UTF8 (c) in style.cfg samples
| * | | | | | | | | | | | | [ticket/12286] Reword section about pluralsJoas Schilling2014-03-281-4/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-12286
| * | | | | | | | | | | | | [ticket/12286] Fix spelling of elephant(s) in the sampleJoas Schilling2014-03-281-5/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-12286
| * | | | | | | | | | | | | [ticket/12286] Correctly capitalize PHPJoas Schilling2014-03-281-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-12286
| * | | | | | | | | | | | | [ticket/12286] Fix nesting of ul inside li elementJoas Schilling2014-03-281-7/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-12286
| * | | | | | | | | | | | | [ticket/12286] Add note that goto should not be usedJoas Schilling2014-03-211-0/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-12286
| * | | | | | | | | | | | | [ticket/12286] Add section about plurals to the coding guidelinesJoas Schilling2014-03-181-0/+52
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-12286
| * | | | | | | | | | | | | [ticket/12286] Classes must use the name spaceJoas Schilling2014-03-181-23/+14
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-12286
| * | | | | | | | | | | | | [ticket/12286] Remove section about utf8_normalize_nfc()Joas Schilling2014-03-181-13/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The request class takes care of this PHPBB3-12286
| * | | | | | | | | | | | | [ticket/12286] Use $request->variable() instead of request_var()Joas Schilling2014-03-181-15/+15
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-12286
| * | | | | | | | | | | | | [ticket/12286] Function names should be prefixed with phpbb_Joas Schilling2014-03-181-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-12286
| * | | | | | | | | | | | | [ticket/12286] Add "Since" to template event docsJoas Schilling2014-03-181-1/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-12286
| * | | | | | | | | | | | | [ticket/12286] style.php and imagesets dont exist anymoreJoas Schilling2014-03-181-4/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-12286
| * | | | | | | | | | | | | [ticket/12286] Styles have a phpbb_version and a style_version in 3.1Joas Schilling2014-03-181-2/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-12286
| * | | | | | | | | | | | | [ticket/12286] Use UTF8 (c) in style.cfg samplesJoas Schilling2014-03-181-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-12286
* | | | | | | | | | | | | | Merge remote-tracking branch 'github-nickvergessen/ticket/12282' into ↵Nils Adermann2014-04-1061-402/+584
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | develop-ascraeus * github-nickvergessen/ticket/12282: [ticket/12282] Update new references [ticket/12282] Update container db mock [ticket/12282] Add new line at EOF of the interface [ticket/12282] Use interface for type hinting [ticket/12282] Use {@inheritDoc} for inherited methods [ticket/12282] Add Interface for DBAL drivers
| * | | | | | | | | | | | | | [ticket/12282] Update new referencesJoas Schilling2014-04-011-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-12282
| * | | | | | | | | | | | | | [ticket/12282] Add new line at EOF of the interfaceJoas Schilling2014-04-011-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-12282
| * | | | | | | | | | | | | | [ticket/12282] Use interface for type hintingJoas Schilling2014-04-0147-110/+110
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-12282
| * | | | | | | | | | | | | | [ticket/12282] Use {@inheritDoc} for inherited methodsJoas Schilling2014-04-0112-288/+115
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-12282
| * | | | | | | | | | | | | | [ticket/12282] Add Interface for DBAL driversJoas Schilling2014-04-012-2/+357
| | |_|/ / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-12282
* | | | | | | | | | | | | | Merge remote-tracking branch 'github-nickvergessen/ticket/11352' into ↵Nils Adermann2014-04-101-0/+16
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|/ / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | develop-ascraeus * github-nickvergessen/ticket/11352: [ticket/11352] Add functional tests for disapproving a post/topic [ticket/11352] Redirect the user back to view*.php after disapproving
| * | | | | | | | | | | | | [ticket/11352] Redirect the user back to view*.php after disapprovingJoas Schilling2014-04-071-0/+16
| | |_|_|_|/ / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The user should be redirected back to: - the topic, if he came from viewtopic and the topic still exists - the forum, if he came from viewtopic, but the topic does not exist anymore PHPBB3-11352
* | | | | | | | | | | | | Merge branch 'develop-olympus' into develop-ascraeusAndreas Fischer2014-04-101-1/+1
|\ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|/ / / / / / / | |/| | | | | | / / / / / | |_|_|_|_|_|_|/ / / / / |/| | | | | | | | | | | * develop-olympus: [ticket/12381] Fix broken error message when selecting invalid DB driver
| * | | | | | | | | | | [ticket/12381] Fix broken error message when selecting invalid DB driverOliver Schramm2014-04-101-1/+1
| | |_|_|_|_|/ / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-12381
* | | | | | | | | | | Merge remote-tracking branch 'vsephpbb/ticket/11098' into develop-ascraeusJoas Schilling2014-04-104-52/+49
|\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * vsephpbb/ticket/11098: [ticket/11098] Fix error reporting on the autologin key pages [ticket/11098] Update subsilver2 to also include mark/unmark all buttons [ticket/11098] HTML Validity fix to Notifications in UCP [ticket/11098] Add mark/unmark all options to remember me keys
| * | | | | | | | | | | [ticket/11098] Fix error reporting on the autologin key pagesMatt Friedman2014-04-093-15/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-11098
| * | | | | | | | | | | [ticket/11098] Update subsilver2 to also include mark/unmark all buttonsMatt Friedman2014-04-091-5/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-11098
| * | | | | | | | | | | [ticket/11098] HTML Validity fix to Notifications in UCPMatt Friedman2014-04-091-5/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-11098
| * | | | | | | | | | | [ticket/11098] Add mark/unmark all options to remember me keysMatt Friedman2014-04-091-34/+34
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-11098
* | | | | | | | | | | | Merge remote-tracking branch 'prototech/ticket/12375' into develop-ascraeusJoas Schilling2014-04-101-4/+1
|\ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * prototech/ticket/12375: [ticket/12375] Fix broken attachment deletion.
| * | | | | | | | | | | | [ticket/12375] Fix broken attachment deletion.Cesar G2014-04-081-4/+1
| | |_|_|_|_|_|/ / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The response is already parsed and when running it through parseJSON returned null prior to 1.9. Now there's an actual error thrown, so the function is returning and thus leaving the attachment row intact. PHPBB3-12375
* | | | | | | | | | | | Merge remote-tracking branch 'prototech/ticket/12356' into develop-ascraeusJoas Schilling2014-04-103-6/+10
|\ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * prototech/ticket/12356: [ticket/12356] Assign vars preventing Plupload from loading in PM editor.
| * | | | | | | | | | | | [ticket/12356] Assign vars preventing Plupload from loading in PM editor.Cesar G2014-04-093-6/+10
| |/ / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-12356
* | | | | | | | | | | | [ticket/12379] Remove duplicate labels in attachment uploader when responsive.Cesar G2014-04-091-4/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-12379
* | | | | | | | | | | | Merge remote-tracking branch 'nickvergessen/ticket/8700' into develop-ascraeusCesar G2014-04-092-288/+4
|\ \ \ \ \ \ \ \ \ \ \ \ | |_|/ / / / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * nickvergessen/ticket/8700: [ticket/8700] Use L_COLON instead of adding ":" manually [ticket/8700] Remove unused language strings