aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge pull request #4213 from RMcGirr83/TICKET_13972Marc Alexander2016-03-101-1/+1
|\ | | | | | | [ticket/13972] Remove hard coded flood check from posting
| * [ticket/13972] Remove hard coded flood check from postingRichard McGirr2016-03-101-1/+1
|/ | | | PHPBB3-13972
* Merge branch '3.1.x' into 3.2.xMarc Alexander2016-03-101-4/+19
|\
| * Merge pull request #4184 from lavigor/ticket/14486Marc Alexander2016-03-101-4/+19
| |\ | | | | | | | | | [ticket/14486] Add an event and fix an event in login_box()
| | * [ticket/14486] Use empty() and move error check.lavigor2016-02-271-1/+1
| | | | | | | | | | | | PHPBB3-14486
| | * [ticket/14486] Add an event and fix an event in login_box()lavigor2016-02-181-4/+19
| | | | | | | | | | | | PHPBB3-14486
* | | Merge branch '3.1.x' into 3.2.xTristan Darricau2016-03-090-0/+0
|\ \ \ | |/ / | | | | | | | | | | | | * 3.1.x: [ticket/14496] Destroy update_list_time cache variable on intro [ticket/14496] Cache last update of update list instead of using filemtime
| * | Merge pull request #4192 from marc1706/ticket/14496Tristan Darricau2016-03-091-1/+3
| |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | [ticket/14496] Cache last update of update list instead of using filemtime * marc1706/ticket/14496: [ticket/14496] Destroy update_list_time cache variable on intro [ticket/14496] Cache last update of update list instead of using filemtime
| | * | [ticket/14496] Destroy update_list_time cache variable on introMarc Alexander2016-02-261-0/+1
| | | | | | | | | | | | | | | | PHPBB3-14496
| | * | [ticket/14496] Cache last update of update list instead of using filemtimeMarc Alexander2016-02-261-1/+2
| | | | | | | | | | | | | | | | PHPBB3-14496
* | | | Merge pull request #4208 from CHItA/ticket/13264Marc Alexander2016-03-091-4/+4
|\ \ \ \ | | | | | | | | | | | | | | | [ticket/13264] Don't force approved state if post visibility is known (3.2)
| * | | | [ticket/13264] Don't force approved state if post visibility is known (3.2)Máté Bartus2016-03-091-4/+4
|/ / / / | | | | | | | | | | | | | | | | | | | | The previous PR broke 3.2 because of different variable names PHPBB3-13264
* | | | Merge branch '3.1.x' into 3.2.xMáté Bartus2016-03-091-1/+7
|\ \ \ \ | |/ / / | | | | | | | | | | | | | | | | * 3.1.x: [ticket/13264] Link to post if user can view it [ticket/13264] Do not force approved state if post visibility is known
| * | | Merge pull request #4205 from marc1706/ticket/13264Máté Bartus2016-03-091-1/+7
| |\ \ \ | | | | | | | | | | [ticket/13264] Do not force approved state if post visibility is known
| | * | | [ticket/13264] Link to post if user can view itMarc Alexander2016-03-081-1/+3
| | | | | | | | | | | | | | | | | | | | PHPBB3-13264
| | * | | [ticket/13264] Do not force approved state if post visibility is knownMarc Alexander2016-03-071-0/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Post visibility is used if it is set to a valid value. PHPBB3-13264
* | | | | Merge branch '3.1.x' into 3.2.xMáté Bartus2016-03-083-14/+26
|\ \ \ \ \ | |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 3.1.x: [ticket/14132] Use transaction for adding notifications to type table [ticket/14519] Skip query if all unread notifications are retrieved [ticket/14483] Do not send headers by default on access via controller Conflicts: phpBB/phpbb/notification/manager.php
| * | | | Merge pull request #4206 from marc1706/ticket/14519Máté Bartus2016-03-081-1/+3
| |\ \ \ \ | | | | | | | | | | | | [ticket/14519] Skip query if all unread notifications are retrieved
| | * | | | [ticket/14519] Skip query if all unread notifications are retrievedMarc Alexander2016-03-081-1/+3
| | |/ / / | | | | | | | | | | | | | | | PHPBB3-14519
| * | | | Merge pull request #4207 from marc1706/ticket/14132Máté Bartus2016-03-081-0/+4
| |\ \ \ \ | | | | | | | | | | | | [ticket/14132] Use transaction for adding notifications to type table
| | * | | | [ticket/14132] Use transaction for adding notifications to type tableMarc Alexander2016-03-081-0/+4
| | |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This will prevent a race condition that might occur by two posts being submitted at the same time with the notification type IDs not being cached. PHPBB3-14132
| * | | | Merge pull request #4204 from marc1706/ticket/14483Máté Bartus2016-03-082-14/+22
| |\ \ \ \ | | |/ / / | |/| | | [ticket/14483] Do not send headers by default on access via controller
| | * | | [ticket/14483] Do not send headers by default on access via controllerMarc Alexander2016-03-062-14/+22
| | | | | | | | | | | | | | | | | | | | PHPBB3-14483
* | | | | [release-3.2.0-b2] Update versions to 3.2.0-3-devTristan Darricau2016-03-073-5/+5
| | | | |
* | | | | Merge branch '3.1.x' into 3.2.xMarc Alexander2016-03-071-8/+5
|\ \ \ \ \ | |/ / / /
| * | | | Merge pull request #4203 from Elsensee/ticket/14514Marc Alexander2016-03-071-8/+5
| |\ \ \ \ | | |/ / / | |/| | | | | | | | [ticket/14514] Don't skip users when converting passwords
| | * | | [ticket/14514] Don't skip users when converting passwordsOliver Schramm2016-03-061-8/+5
| |/ / / | | | | | | | | | | | | PHPBB3-14514
* | | | Merge branch '3.1.x' into 3.2.xMarc Alexander2016-03-051-1/+1
|\ \ \ \ | |/ / /
| * | | Merge pull request #4200 from RMcGirr83/ticket_14508Marc Alexander2016-03-051-1/+1
| |\ \ \ | | | | | | | | | | | | | | | [ticket/14508] Change language notice on account activation
| | * | | [ticket/14508] Adjust account inactive languageRichard McGirr2016-03-031-1/+1
| | | | | | | | | | | | | | | | | | | | PHPBB3-14508
| | * | | [ticket/14508] Change language notice on account activationRichard McGirr2016-03-021-1/+1
| | |/ / | | | | | | | | | | | | PHPBB3-14508
* | | | Merge pull request #4201 from CHItA/ticket/14510Tristan Darricau2016-03-021-0/+1
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [ticket/14510] Prevent infinite loop in add_bots task * CHItA/ticket/14510: [ticket/14510] Prevent infinite loop in add_bots task
| * | | | [ticket/14510] Prevent infinite loop in add_bots taskMáté Bartus2016-03-021-0/+1
|/ / / / | | | | | | | | | | | | PHPBB3-14510
* | | | Merge pull request #4196 from CHItA/ticket/14487Marc Alexander2016-03-019-9/+209
|\ \ \ \ | | | | | | | | | | | | | | | [ticket/14487] Try to handle connection timeouts
| * | | | [ticket/14487] Add missing use statementMáté Bartus2016-02-291-0/+1
| | | | | | | | | | | | | | | | | | | | PHPBB3-14487
| * | | | [ticket/14487] Add loading indicator while polling statusMáté Bartus2016-02-291-0/+2
| | | | | | | | | | | | | | | | | | | | PHPBB3-14487
| * | | | [ticket/14487] Update javascriptMáté Bartus2016-02-291-54/+50
| | | | | | | | | | | | | | | | | | | | PHPBB3-14487
| * | | | [ticket/14487] Try to handle connection timeoutsMáté Bartus2016-02-288-9/+210
| | | | | | | | | | | | | | | | | | | | PHPBB3-14487
* | | | | Merge pull request #4194 from Nicofuma/ticket/14499Marc Alexander2016-02-2912-25/+510
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | [ticket/14499] Add command to update the board from CLI
| * | | | | [ticket/14499] Fix wording and commentsTristan Darricau2016-02-293-2/+3
| | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-14499
| * | | | | [ticket/14499] Add missing config settingsTristan Darricau2016-02-282-2/+5
| | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-14499
| * | | | | [ticket/14499] Add command to update the board from CLITristan Darricau2016-02-2512-25/+506
| | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-14499
* | | | | | Merge pull request #4197 from marc1706/ticket/14503Máté Bartus2016-02-281-0/+3
|\ \ \ \ \ \ | | | | | | | | | | | | | | [ticket/14503] Enable superglobals in cli
| * | | | | | [ticket/14503] Enable superglobals in cliMarc Alexander2016-02-281-0/+3
|/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This is for example needed for outputting help on commands. PHPBB3-14503
* | | | | | Merge branch '3.1.x' into 3.2.xMarc Alexander2016-02-282-6/+8
|\ \ \ \ \ \ | | |_|/ / / | |/| | | |
| * | | | | Merge pull request #4153 from gn36/ticket/14443Marc Alexander2016-02-282-6/+8
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | [ticket/14443] Introduce additional parameter to messenger
| | * | | | | [ticket/14443] substr($var, 0, 1) -> $var[0]Martin Beckmann2016-02-271-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-14443
| | * | | | | [ticket/14443] Avoid duplicate slashesMartin Beckmann2016-02-021-4/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-14443
| | * | | | | [ticket/14443] Introduce additional parameter to messengerMartin Beckmann2016-02-012-6/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-14443
* | | | | | | Merge branch '3.1.x' into 3.2.xMarc Alexander2016-02-271-1/+27
|\ \ \ \ \ \ \ | |/ / / / / / | | | | | | | | | | | | | | | | | | | | | Conflicts: phpBB/includes/functions_content.php