aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* [ticket/11495] Fix description of get_sql_whereJoas Schilling2013-04-171-3/+1
* [ticket/11495] Use unique properties for the column namesJoas Schilling2013-04-172-102/+95
* [ticket/11495] Add unit tests for the implemented functionsJoas Schilling2013-04-168-0/+1259
* [ticket/11495] Add forum implementation of nestedsetJoas Schilling2013-04-163-0/+169
* [ticket/11495] Add abstract implementation of the interfaceJoas Schilling2013-04-162-0/+714
* [ticket/11495] Add basic interface with nestedset operationsJoas Schilling2013-04-162-0/+192
* Merge remote-tracking branch 'nickvergessen/ticket/11491' into developAndreas Fischer2013-04-151-10/+24
|\
| * [ticket/11491] Copy files back only if we saved them previouslyJoas Schilling2013-04-121-3/+9
| * [ticket/11491] Only copy files from phpBB/ext/ the directory existsJoas Schilling2013-04-121-4/+9
| * [ticket/11491] Correctly remove the store/temp_ext/ directory after useJoas Schilling2013-04-121-2/+2
| * [ticket/11491] Fix path to the ext/ folderJoas Schilling2013-04-121-1/+1
| * [ticket/11491] Add extension_acp_test.php to functional groupJoas Schilling2013-04-121-0/+3
| * [ticket/11491] Fix class name of functional testJoas Schilling2013-04-121-1/+1
| * [ticket/11491] Move file to correct directoryJoas Schilling2013-04-121-0/+0
* | Merge branch 'develop-olympus' into developAndreas Fischer2013-04-151-0/+3
|\ \
| * \ Merge remote-tracking branch 'dhruvgoel92/ticket/11493' into develop-olympusAndreas Fischer2013-04-151-0/+3
| |\ \
| | * | [ticket/11493] add checks for Notice and WarningDhruv2013-04-151-0/+2
| | * | [ticket/11493] add check for phpBB Debug in functional testsDhruv2013-04-151-0/+1
* | | | Merge remote-tracking branch 'marc1706/ticket/11488' into developAndreas Fischer2013-04-152-2/+2
|\ \ \ \
| * | | | [ticket/11488] Use correct base class in email notification methodMarc Alexander2013-04-152-2/+2
|/ / / /
* | | | Merge remote-tracking branch 'nickvergessen/ticket/11494' into developAndreas Fischer2013-04-141-14/+35
|\ \ \ \
| * | | | [ticket/11494] Filter crawler in first placeJoas Schilling2013-04-151-23/+18
| * | | | [ticket/11494] Use functions instead of repeatingJoas Schilling2013-04-131-19/+29
| * | | | [ticket/11494] Fix memberlist leaders functional testsJoas Schilling2013-04-111-8/+24
| | |_|/ | |/| |
* | | | Merge remote-tracking branch 'hjpotter92/ticket/11225' into developAndreas Fischer2013-04-131-19/+0
|\ \ \ \
| * | | | [ticket/11225] Deletion of unused mcp_jumpbox.html filehjpotter922013-04-111-19/+0
* | | | | Merge pull request #1184 from marc1706/ticket/11314Nils Adermann2013-04-1212-866/+511
|\ \ \ \ \
| * \ \ \ \ Merge branch 'develop' of https://github.com/phpbb/phpbb3 into ticket/11314Marc Alexander2013-03-26213-2819/+15863
| |\ \ \ \ \
| * | | | | | [ticket/11314] Modify files to comply with coding standardsMarc Alexander2013-03-268-734/+352
| * | | | | | [ticket/11314] Fix JSHint issues in adm editor.jsMarc Alexander2013-03-261-36/+33
| * | | | | | [ticket/11314] Fix issues mentioned in jshint reportMarc Alexander2013-03-268-181/+207
| * | | | | | Merge branch 'develop' of https://github.com/phpbb/phpbb3 into ticket/11314Marc Alexander2013-02-27138-3112/+8143
| |\ \ \ \ \ \
| * | | | | | | [ticket/11314] Add missing radix parametersMarc Alexander2013-01-132-2/+2
| * | | | | | | [ticket/11314] Fix whitespace issuesMarc Alexander2013-01-122-9/+8
| * | | | | | | [ticket/11314] Add missing "use strict" to timezone.js filesMarc Alexander2013-01-103-0/+6
| * | | | | | | [ticket/11314] Use return variable instead of overusing the return keywordMarc Alexander2013-01-101-4/+5
| * | | | | | | [ticket/11314] Add missing semi-colonsMarc Alexander2013-01-101-2/+2
| * | | | | | | [ticket/11314] Cleanup core.js codingMarc Alexander2013-01-101-11/+9
* | | | | | | | Merge branch 'develop-olympus' into developNils Adermann2013-04-121-41/+42
|\ \ \ \ \ \ \ \ | |_|_|_|_|/ / / |/| | | | | / / | | |_|_|_|/ / | |/| | | | |
| * | | | | | Merge branch 'ticket/11358' into develop-olympusNils Adermann2013-04-121-41/+42
| |\ \ \ \ \ \ | | |_|_|_|_|/ | |/| | | | |
| | * | | | | [ticket/11358] Removed all trailing white spaces.erangamapa2013-04-121-4/+4
| | * | | | | [ticket/11358] Fixed the code according to coding guidlines.erangamapa2013-04-121-42/+43
* | | | | | | Merge remote-tracking branch 'rechosen/ticket/11116' into developAndreas Fischer2013-04-111-2/+2
|\ \ \ \ \ \ \
| * | | | | | | [ticket/11116] Made ACP "extension not available" error message E_USER_WARNINGrechosen2013-04-111-2/+2
| | |_|_|_|_|/ | |/| | | | |
* | | | | | | Merge pull request #1336 from nickvergessen/ticket/11492Nils Adermann2013-04-113-3/+124
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | |
| * | | | | | [ticket/11492] Initialize $user_ids and $group_users arraysJoas Schilling2013-04-111-3/+5
| * | | | | | [ticket/11492] Fix the test once moreJoas Schilling2013-04-111-7/+1
| * | | | | | [ticket/11492] Fix issues with log objectJoas Schilling2013-04-111-16/+10
| * | | | | | [ticket/11492] Split into mutliple testsJoas Schilling2013-04-111-6/+16
| * | | | | | [ticket/11492] Do not add the user againJoas Schilling2013-04-111-1/+0