aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
...
| * | | | | | | | | [ticket/12388] Add tests for lang() use on log actions without dataJoas Schilling2014-04-111-3/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-12388
| * | | | | | | | | [ticket/12388] Fix translation of log entries without additional log dataJoas Schilling2014-04-111-0/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-12388
* | | | | | | | | | Merge remote-tracking branch 'marc/ticket/12004' into develop-ascraeusJoas Schilling2014-04-142-0/+17
|\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * marc/ticket/12004: [ticket/12004] Support empty routes to app.php/ in path_helper
| * | | | | | | | | | [ticket/12004] Support empty routes to app.php/ in path_helperMarc Alexander2014-04-112-0/+17
| | |_|_|_|_|_|_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The symfony routing component allows us to use the path "/" for routes. Therefore, we should be able to use example.com/app.php/ for controllers. However, this currently does not properly work. The method get_web_root_path incorrectly returns phpbb_root_path. Therefore, paths to images or files are broken. PHPBB3-12004
* | | | | | | | | | Merge remote-tracking branch 'marc/ticket/12372' into develop-ascraeusJoas Schilling2014-04-1419-148/+73
|\ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|/ / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * marc/ticket/12372: [ticket/12372] Use $() instead of jQuery() in core.js for toggleDisplay [ticket/12372] Use admin.js $(document).ready for hiding questionnaire details [ticket/12372] Rename JS function dE() to phpbb.toggleDisplay() [ticket/12372] Move dE() function core.js [ticket/12372] Unify definition of function dE() across all files [ticket/12372] Use jQuery in javascript dE() function
| * | | | | | | | | [ticket/12372] Use $() instead of jQuery() in core.js for toggleDisplayMarc Alexander2014-04-111-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-12372
| * | | | | | | | | [ticket/12372] Use admin.js $(document).ready for hiding questionnaire detailsMarc Alexander2014-04-112-7/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-12372
| * | | | | | | | | [ticket/12372] Rename JS function dE() to phpbb.toggleDisplay()Marc Alexander2014-04-0713-49/+49
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-12372
| * | | | | | | | | [ticket/12372] Move dE() function core.jsMarc Alexander2014-04-077-112/+23
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-12372
| * | | | | | | | | [ticket/12372] Unify definition of function dE() across all filesMarc Alexander2014-04-074-38/+51
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-12372
| * | | | | | | | | [ticket/12372] Use jQuery in javascript dE() functionMarc Alexander2014-04-071-7/+11
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-12372
* | | | | | | | | | Merge remote-tracking branch 'marc/ticket/12398' into develop-ascraeusJoas Schilling2014-04-131-1/+1
|\ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|/ / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | * marc/ticket/12398: [ticket/12398] Select correct post to restore during softdelete tests
| * | | | | | | | | [ticket/12398] Select correct post to restore during softdelete testsMarc Alexander2014-04-131-1/+1
|/ / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-12398
* | | | | | | | | Merge remote-tracking branch 'marc/ticket/12398' into develop-ascraeusJoas Schilling2014-04-123-3/+3
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * marc/ticket/12398: [ticket/12398] Use return of submit_post in softdelete and download tests [ticket/12398] Use submit_post return in prune_shadow_topic_test
| * | | | | | | | | [ticket/12398] Use return of submit_post in softdelete and download testsMarc Alexander2014-04-122-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-12398
| * | | | | | | | | [ticket/12398] Use submit_post return in prune_shadow_topic_testMarc Alexander2014-04-121-1/+1
|/ / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This should get rid of possible failures during functional tests. PHPBB3-12398
* | | | | | | | | Merge remote-tracking branch 'nickvergessen/ticket/12395' into develop-ascraeusCesar G2014-04-121-7/+7
|\ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|/ / |/| | | | | | | | | | | | | | | | | | | | | | | | | | * nickvergessen/ticket/12395: [ticket/12395] Check for posts in the middle of the page
| * | | | | | | | [ticket/12395] Check for posts in the middle of the pageJoas Schilling2014-04-121-7/+7
|/ / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-12395
* | | | | | | | 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