aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'ticket/forumhulp/12896' into develop-ascraeusJoas Schilling2014-07-271-1/+9
|\ | | | | | | | | * ticket/forumhulp/12896: [ticket/12896] Add php event for admin notices
| * [ticket/12896] Add php event for admin noticesForumhulp.com2014-07-271-1/+9
| | | | | | | | PHPBB3-12896
* | Merge pull request #2768 from Nicofuma/ticket/12883Andreas Fischer2014-07-261-6/+2
|\ \ | | | | | | | | | | | | | | | | | | | | | [ticket/12883] Do not use basename() to get the search class in tidy_search * Nicofuma/ticket/12883: [ticket/12883] Remove pointless comments [ticket/12883] Do not use basename() to get the search class in tidy_search
| * | [ticket/12883] Remove pointless commentsTristan Darricau2014-07-231-5/+1
| | | | | | | | | | | | PHPBB3-12883
| * | [ticket/12883] Do not use basename() to get the search class in tidy_searchTristan Darricau2014-07-211-2/+2
| | | | | | | | | | | | PHPBB3-12883
* | | Merge pull request #2777 from Nicofuma/ticket/12881Andreas Fischer2014-07-261-2/+2
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | [ticket/12881] Debug error - Undefined index: mark_time * Nicofuma/ticket/12881: [ticket/12881] Checks earlier if server-side topic marking is enabled
| * | | [ticket/12881] Checks earlier if server-side topic marking is enabledTristan Darricau2014-07-251-2/+2
| | | | | | | | | | | | | | | | PHPBB3-12881
* | | | Merge pull request #2779 from nickvergessen/ticket/12892Tristan Darricau2014-07-251-20/+58
|\ \ \ \ | |/ / / |/| | | | | | | | | | | | | | | | | | | [ticket/12892] Do not set S_NUM_ROWS when adding a row to a template loop * nickvergessen/ticket/12892: [ticket/12892] Do not set S_NUM_ROWS when adding a row to a template loop
| * | | [ticket/12892] Do not set S_NUM_ROWS when adding a row to a template loopJoas Schilling2014-07-251-20/+58
|/ / / | | | | | | | | | | | | | | | | | | | | | We do not set S_NUM_ROWS while adding a row, to reduce the complexity If we would set it on adding, each subsequent adding would cause n modifications, resulting in a O(n!) complexity, rather then O(n) PHPBB3-12892
* | | Merge pull request #2773 from bantu/ticket/12887Dhruv Goel2014-07-241-7/+7
|\ \ \ | | | | | | | | [ticket/12887] Fix Typo: offest -> offset
| * | | [ticket/12887] Fix Typo: offest -> offsetAndreas Fischer2014-07-231-7/+7
| | |/ | |/| | | | | | | PHPBB3-12887
* | | Merge remote-tracking branch 'paybas/ticket/12857' into develop-ascraeusMarc Alexander2014-07-245-2/+43
|\ \ \ | |/ / |/| |
| * | [ticket/12857] Add header/footer distinction for subsilver2 eventsPayBas2014-07-233-7/+8
| | | | | | | | | | | | PHPBB3-12857
| * | [ticket/12857] Clarify events.md on difference between PS and SS2 breadcrumbsPayBas2014-07-231-2/+5
| | | | | | | | | | | | PHPBB3-12857
| * | [ticket/12857] Add missing template events breadcrumb_prependPayBas2014-07-164-1/+18
| | | | | | | | | | | | | | | | | | To insert links after site-home PHPBB3-12857
| * | [ticket/12857] Add template events breadcrumbs_before/afterPayBas2014-07-163-0/+20
| | | | | | | | | | | | PHPBB3-12857
* | | Merge pull request #2733 from n-aleha/ticket/12851Andreas Fischer2014-07-231-1/+1
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | [ticket/12851] Fix the Font colour button title * n-aleha/ticket/12851: [ticket/12851] Fix the Font colour button title
| * | | [ticket/12851] Fix the Font colour button titlen-aleha2014-07-211-1/+1
| | | | | | | | | | | | | | | | PHPBB3-12851
* | | | Merge pull request #2766 from marc1706/ticket/12560Dhruv Goel2014-07-221-2/+29
|\ \ \ \ | | | | | | | | | | [ticket/12560] Add methods to set upload and temp paths in plupload
| * | | | [ticket/12560] Add methods to set upload and temp paths in pluploadMarc Alexander2014-07-201-2/+29
| | |_|/ | |/| | | | | | | | | | | | | | | | | | The paths will be reset to the default paths after an upload is complete. PHPBB3-12560
* | | | Merge pull request #2757 from rxu/ticket/12871Joas Schilling2014-07-211-0/+1
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [ticket/12871] Add PHPBB_DISPLAY_LOAD_TIME const to config.php on installation * rxu/ticket/12871: [ticket/12871] Add PHPBB_DISPLAY_LOAD_TIME const to config.php on installation
| * | | | [ticket/12871] Add PHPBB_DISPLAY_LOAD_TIME const to config.php on installationrxu2014-07-191-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | To make it consistent with another config.php constants, PHPBB_DISPLAY_LOAD_TIME is to be put in config.php during installation as well. PHPBB3-12871
* | | | | Merge pull request #2745 from nickvergessen/ticket/12861Tristan Darricau2014-07-211-0/+40
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [ticket/12861] Add event to modify the post, poster and attachment data * nickvergessen/ticket/12861: [ticket/12861] Add event to modify the post, poster and attachment data
| * | | | | [ticket/12861] Add event to modify the post, poster and attachment dataJoas Schilling2014-07-161-0/+40
| | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-12861
* | | | | | Merge pull request #2752 from bantu/ticket/12656Dhruv Goel2014-07-2212-41/+49
|\ \ \ \ \ \ | | | | | | | | | | | | | | [ticket/12656] Pass user object into all console commands for translation
| * | | | | | [ticket/12656] Pass user object into all console commands.Andreas Fischer2014-07-1712-41/+49
| | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-12656
* | | | | | | Merge pull request #2651 from nickvergessen/ticket/12448Dhruv Goel2014-07-222-6/+34
|\ \ \ \ \ \ \ | |_|_|_|/ / / |/| | | | | | [ticket/12448] Allow null as default value for columns
| * | | | | | [ticket/12448] Fix null columns for MS SQLJoas Schilling2014-06-251-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-12448
| * | | | | | [ticket/12448] Fix null columns for postgresJoas Schilling2014-06-251-0/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-12448
| * | | | | | [ticket/12448] Allow null as default value for columnsJoas Schilling2014-06-252-6/+28
| | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-12448
* | | | | | | Merge remote-tracking branch 'tmbackoff/ticket/12872' into develop-ascraeusMarc Alexander2014-07-201-0/+3
|\ \ \ \ \ \ \ | |_|_|_|/ / / |/| | | | | |
| * | | | | | [ticket/12872] Add poster_id to viewtopic_modify_post_rowTabitha Backoff2014-07-191-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change "rc3" to "RC3". PHPBB3-12872
| * | | | | | [ticket/12872] Add poster_id to viewtopic_modify_post_rowTabitha Backoff2014-07-191-0/+3
|/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | To allow extension authors to use the poster_id var. PHPBB3-12872
* | | | | | Merge pull request #2755 from Elsensee/ticket/12748Andreas Fischer2014-07-181-1/+1
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [ticket/12748] Fix typo in terms of use * Elsensee/ticket/12748: [ticket/12748] Fix typo in terms of use
| * | | | | | [ticket/12748] Fix typo in terms of useOliver Schramm2014-07-181-1/+1
| | |/ / / / | |/| | | | | | | | | | | | | | | | PHPBB3-12748
* | | | | | Merge pull request #2751 from bantu/ticket/12663Andreas Fischer2014-07-183-7/+45
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [ticket/12663] Extract CLI language string into their own file * bantu/ticket/12663: [ticket/12663] Have cli.php language file at top level; unrelated to ACP. [ticket/12663] Extract CLI language string into their own file
| * | | | | | [ticket/12663] Have cli.php language file at top level; unrelated to ACP.Andreas Fischer2014-07-172-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-12663
| * | | | | | [ticket/12663] Extract CLI language string into their own fileCarlo2014-07-173-7/+45
| |/ / / / / | | | | | | | | | | | | | | | | | | PHPBB3-12663
* | | | | | Merge pull request #2735 from carlo94it/ticket/12814Andreas Fischer2014-07-181-1/+1
|\ \ \ \ \ \ | |/ / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | [ticket/12814] Fix field type for LDAP email attribute * carlo94it/ticket/12814: [ticket/12814] Replace email type with text type
| * | | | | [ticket/12814] Replace email type with text typeCarlo2014-07-151-1/+1
| | |_|/ / | |/| | | | | | | | | | | | | PHPBB3-12814
* | | | | Merge pull request #2576 from carlo94it/ticket/12685Tristan Darricau2014-07-174-13/+48
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [ticket/12685] New CLI container for load extensions * carlo94it/ticket/12685: [ticket/12685] Setup class loader for extensions only if not in safe mode [ticket/12685] Replace getParameterOption with hasParameterOption [ticket/12685] Do not dump container [ticket/12685] Override getDefaultInputDefinition() [ticket/12685] Removed unused USE statement [ticket/12685] Inject console.command_collection instead of the container [ticket/12685] Add a new line [ticket/12685] Container is dumped by default [ticket/12685] Removed spaces [ticket/12685] Add --safe-mode [ticket/12685] We need extensions enabled [ticket/12685] Add space after foreach [ticket/12685] Add console collection and fixing CLI
| * | | | | [ticket/12685] Setup class loader for extensions only if not in safe modeCarlo2014-07-171-3/+6
| | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-12685
| * | | | | [ticket/12685] Replace getParameterOption with hasParameterOptionCarlo2014-07-151-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-12685
| * | | | | [ticket/12685] Do not dump containerCarlo2014-07-151-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-12685
| * | | | | [ticket/12685] Override getDefaultInputDefinition()Carlo2014-07-152-9/+19
| | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-12685
| * | | | | [ticket/12685] Removed unused USE statementCarlo2014-07-151-1/+0
| | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-12685
| * | | | | [ticket/12685] Inject console.command_collection instead of the containerCarlo2014-07-152-4/+4
| | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-12685
| * | | | | [ticket/12685] Add a new lineCarlo2014-07-151-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-12685
| * | | | | [ticket/12685] Container is dumped by defaultCarlo2014-07-151-1/+0
| | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-12685
| * | | | | [ticket/12685] Removed spacesCarlo2014-07-151-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-12685