aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
...
* | | | | | Merge remote-tracking branch 'marc/ticket/12211' into develop-ascraeusJoas Schilling2014-04-122-1/+15
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | * marc/ticket/12211: [ticket/12211] Do not run attachment file names twice through htmlspecialchars
| * | | | | | [ticket/12211] Do not run attachment file names twice through htmlspecialcharsMarc Alexander2014-04-112-1/+15
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Upload filenames are already processed via htmlspecialchars in the type_cast_helper of the new request class. There is no need to run it through htmlspecialchars() again in the filespec class. PHPBB3-12211
* | | | | | | Merge remote-tracking branch 'VarunAgw/ticket/12351' into develop-ascraeusCesar G2014-04-114-10/+10
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | | | | | | | | | | | | | | | | * VarunAgw/ticket/12351: [ticket/12351] Add loading indicator to links that are missing it.
| * | | | | | [ticket/12351] Add loading indicator to links that are missing it.Varun Agrawal2014-04-124-10/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When you click on the link, the turning circle is missing, so you don't know whether it is actually doing something or not, until the response is served. PHPBB3-12351
* | | | | | | Merge remote-tracking branch 'rxu/ticket/12336' into develop-ascraeusJoas Schilling2014-04-111-1/+15
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * rxu/ticket/12336: [ticket/12336] Add functions_module.php core event
| * | | | | | | [ticket/12336] Add functions_module.php core eventrxu2014-04-071-1/+15
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add functions_module.php core event to allow adjusting parameters for custom ACP, MCP, UCP modules (location: function list_modules()). PHPBB3-12336
* | | | | | | | Merge remote-tracking branch 'marc/ticket/12386' into develop-ascraeusJoas Schilling2014-04-113-3/+14
|\ \ \ \ \ \ \ \ | |_|_|_|/ / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * marc/ticket/12386: [ticket/12386] Rename DEBUG_EXTRA to DEBUG_CONTAINER for more descriptive name [ticket/12386] Add DEBUG_EXTRA again and use it for container creation
| * | | | | | | [ticket/12386] Rename DEBUG_EXTRA to DEBUG_CONTAINER for more descriptive nameMarc Alexander2014-04-112-6/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-12386
| * | | | | | | [ticket/12386] Add DEBUG_EXTRA again and use it for container creationMarc Alexander2014-04-113-3/+14
|/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | We are currently creating a new compiled container on every page load when having DEBUG enabled. However, one might only have that enabled to be presented with errors or for getting the page load stats. This change will add the DEBUG_EXTRA constant again. It will be used for choosing whether the compiled container should be created on every page load - when defined as true - or just once after the cache is cleared. PHPBB3-12386
* | | | | | | Merge remote-tracking branch 'vsephpbb/ticket/12283' into develop-ascraeusJoas Schilling2014-04-111-1/+1
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * vsephpbb/ticket/12283: [ticket/12283] Remove obsolete online class from posting review page
| * | | | | | | [ticket/12283] Remove obsolete online class from posting review pageMatt Friedman2014-04-081-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-12283
* | | | | | | | Merge remote-tracking branch 'paybas/ticket/12377' into develop-ascraeusJoas Schilling2014-04-116-119/+120
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * paybas/ticket/12377: [ticket/12377] Forgot to change the INCLUDEs [ticket/12377] Renamed template files to navbar_xxx [ticket/12377] Moved notifications to new template [ticket/12377] Forgot empty line at the end [ticket/12377] Move navbar(s) to new template file
| * | | | | | | | [ticket/12377] Forgot to change the INCLUDEsPayBas2014-04-102-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-12377
| * | | | | | | | [ticket/12377] Renamed template files to navbar_xxxPayBas2014-04-103-4/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-12377
| * | | | | | | | [ticket/12377] Moved notifications to new templatePayBas2014-04-103-107/+108
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | And also reset all starting indentation to 0 PHPBB3-12377
| * | | | | | | | [ticket/12377] Forgot empty line at the endPayBas2014-04-102-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-12377
| * | | | | | | | [ticket/12377] Move navbar(s) to new template filePayBas2014-04-105-118/+118
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-12377
* | | | | | | | | Merge remote-tracking branch 'vsephpbb/ticket/12380' into develop-ascraeusJoas Schilling2014-04-111-1/+2
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * vsephpbb/ticket/12380: [ticket/12380] Explicity state the order of sorting for login keys [ticket/12380] Sort Remember Me keys by last login time in UCP
| * | | | | | | | | [ticket/12380] Explicity state the order of sorting for login keysMatt Friedman2014-04-101-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-12380
| * | | | | | | | | [ticket/12380] Sort Remember Me keys by last login time in UCPMatt Friedman2014-04-101-1/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-12380
* | | | | | | | | | Merge remote-tracking branch 'varunagw/ticket/12355' into develop-ascraeusJoas Schilling2014-04-112-21/+41
|\ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|/ / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | * varunagw/ticket/12355: [ticket/12355] Topic Tools not fully updated when subscribing/bookmarking
| * | | | | | | | | [ticket/12355] Topic Tools not fully updated when subscribing/bookmarkingVarun Agrawal2014-04-112-21/+41
| | |_|_|_|/ / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The Topic Tools menu appears at the top of a topic page and again at the bottom of a topic page. When you use the Topic Tools menu to Bookmark or Subscribe to a Topic, the menu item you chose is updated to reflect that, by switching to say Unsubscribe topic or Remove from Bookmarks. However, this change is not mirrored in the other Topic Tools menu at the other location on the page. Both Topic Tools menus should be updated during the AJAX event, so that they always show the same options to the user. It is solved by creating a data-update-all attribute which contains all the class/ID that will update when topic tool is clicked PHPBB3-12355
* | | | | | | | | 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-105-11/+295
|\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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] Add unit tests for topic notificationsJoas Schilling2014-04-073-1/+284
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-12370
| * | | | | | | | | | [ticket/12370] Fix functional notification test and remove unneeded requestsJoas Schilling2014-04-071-6/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-12370
| * | | | | | | | | | [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/12367' into ↵Nils Adermann2014-04-101-15/+22
|\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | develop-ascraeus * github-nickvergessen/ticket/12367: [ticket/12367] Change phpbb_wrapper_gmgetdate_test to use data providers
| * | | | | | | | | | [ticket/12367] Change phpbb_wrapper_gmgetdate_test to use data providersJoas Schilling2014-04-061-15/+22
| |/ / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-12367
* | | | | | | | | | Merge remote-tracking branch 'github-nickvergessen/ticket/12113' into ↵Nils Adermann2014-04-105-16/+34
|\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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] Fix view_log() testsJoas Schilling2014-04-012-1/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-12113
| * | | | | | | | | | [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-102-0/+34
|\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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] Add functional test for saving custom profile fieldsJoas Schilling2014-04-011-0/+33
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-12331
| * | | | | | | | | | | [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