aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB
Commit message (Expand)AuthorAgeFilesLines
* Merge pull request #1549 from cyberalien/ticket/10999Nathan Guse2013-07-132-1/+3
|\
| * [ticket/10999] Fix assets_version in ACPVjacheslav Trushkin2013-07-132-1/+3
* | Merge branch 'develop-olympus' into developAndreas Fischer2013-07-131-0/+3
|\ \ | |/ |/|
| * Merge branch 'prep-release-3.0.12' into develop-olympusAndreas Fischer2013-07-131-0/+3
| |\
| | * [prep-release-3.0.12] More changelog items for the 3.0.12 release.Andreas Fischer2013-07-131-0/+3
* | | Merge remote-tracking branch 'github-phpbb/develop' into developNils Adermann2013-07-131-0/+1
|\ \ \
| * \ \ Merge pull request #1548 from cyberalien/ticket/11687Nathan Guse2013-07-131-0/+1
| |\ \ \
| | * | | [ticket/11687] Add assets_version to phpbb_configVjacheslav Trushkin2013-07-131-0/+1
* | | | | Merge branch 'develop-olympus' into developNils Adermann2013-07-1315-44/+44
|\ \ \ \ \ | |/ / / / |/| | / / | | |/ / | |/| |
| * | | Merge branch 'prep-release-3.0.12' into develop-olympusNils Adermann2013-07-1315-44/+44
| |\ \ \ | | | |/ | | |/|
| | * | Merge remote-tracking branch 'github-marc1706/ticket/11112' into prep-release...Nils Adermann2013-07-1315-44/+44
| | |\ \
| | | * | [ticket/11112] Do not change opensource.org link to httpsMarc Alexander2013-07-121-1/+1
| | | * | [ticket/11112] Use https for user-visible links to phpbb.comMarc Alexander2013-07-1215-44/+44
* | | | | Merge branch 'develop-olympus' into developNils Adermann2013-07-131-1/+1
|\ \ \ \ \ | |/ / / / | | | | / | |_|_|/ |/| | |
| * | | Merge branch 'prep-release-3.0.12' into develop-olympusNils Adermann2013-07-131-1/+1
| |\ \ \ | | |/ /
| | * | [ticket/11670] Consistency with logo: Replace "phpBB(tm)" with "phpBB(R)".Andreas Fischer2013-07-131-1/+1
* | | | Merge pull request #1017 from nickvergessen/feature/softdelete-1-permissionNathan Guse2013-07-1392-1472/+3505
|\ \ \ \
| * | | | [ticket/9657] Remove old codeJoas Schilling2013-07-131-1/+0
| * | | | Merge remote-tracking branch 'phpbb/develop' into ticket/9657Joas Schilling2013-07-1377-2321/+2951
| |\ \ \ \
| * | | | | [ticket/9657] Keep approval state of posts/topics when copying themJoas Schilling2013-07-131-6/+35
| * | | | | [ticket/9657] Fix a little error when moving softdeleted topicsJoas Schilling2013-07-121-1/+0
| * | | | | [ticket/9657] Remove last references to m_restore permissionJoas Schilling2013-07-122-4/+2
| * | | | | [ticket/9657] Fix english language :(Joas Schilling2013-07-112-2/+2
| * | | | | [ticket/9657] Notifications do not require emails or jabber anymoreJoas Schilling2013-07-111-2/+2
| * | | | | [ticket/9657] Add type hints for classesJoas Schilling2013-07-112-2/+2
| * | | | | [ticket/9657] Remove sql_visibility as it is always non-emptyJoas Schilling2013-07-116-35/+15
| * | | | | [ticket/9657] Use include instead of include_onceJoas Schilling2013-07-111-3/+9
| * | | | | [ticket/9657] Initialise variable outside of the loopJoas Schilling2013-07-111-0/+1
| * | | | | [ticket/9657] Fix variable naming of phpEx to php_extJoas Schilling2013-07-111-1/+1
| * | | | | [ticket/9657] Fix unit testsJoas Schilling2013-07-111-10/+10
| * | | | | [ticket/9657] Use the service instead of the static classJoas Schilling2013-07-1119-63/+102
| * | | | | [ticket/9657] Make content visibility a service and inject everythingJoas Schilling2013-07-113-94/+146
| * | | | | [ticket/9657] Add new line after opening diffJoas Schilling2013-07-111-2/+4
| * | | | | [ticket/9657] Fix labels on confirm_delete_body.htmlJoas Schilling2013-07-111-3/+3
| * | | | | [ticket/9657] Add , to last element of an arrayJoas Schilling2013-07-111-6/+6
| * | | | | [ticket/9657] DO not use \" inside of double quotesJoas Schilling2013-07-111-4/+4
| * | | | | [ticket/9657] Cast topic_id to integerJoas Schilling2013-07-111-2/+2
| * | | | | [ticket/9657] Correctly use " vs ' and variables in queriesJoas Schilling2013-07-111-5/+5
| * | | | | Merge remote-tracking branch 'phpbb/develop' into feature/softdelete-1-permis...Joas Schilling2013-07-11276-5400/+8398
| |\ \ \ \ \
| * | | | | | [ticket/9657] Check for post visibility when searching with SphinxJoas Schilling2013-03-142-2/+13
| * | | | | | [ticket/9657] Correctly determine the users permissions when deleting postsJoas Schilling2013-03-121-5/+12
| * | | | | | [ticket/9657] Remove AJAX from delete button and approval/restore formJoas Schilling2013-03-122-14/+2
| * | | | | | [ticket/9657] Add note about post being soft deleted in subsilver2Joas Schilling2013-03-121-1/+6
| * | | | | | [ticket/9657] Fix typo in subsilver2 conditionJoas Schilling2013-03-121-1/+1
| * | | | | | [ticket/9657] Provide option to restore post in mcp_postJoas Schilling2013-03-121-1/+12
| * | | | | | [ticket/9657] Populate data about post's delete status in mcp_postJoas Schilling2013-03-121-0/+31
| * | | | | | [ticket/9657] Fix some more subsilver2Joas Schilling2013-03-126-17/+87
| * | | | | | [ticket/9657] Fix some minor issues in prosilverJoas Schilling2013-03-123-7/+7
| * | | | | | [ticket/9657] Finish subsilver2 viewforum and viewtopicJoas Schilling2013-03-128-14/+51
| * | | | | | [ticket/9657] Fix softdelete for subsilver2 - part1Joas Schilling2013-03-117-7/+49