aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB
Commit message (Expand)AuthorAgeFilesLines
* [ticket/11700] Get functional tests running after develop mergeNils Adermann2013-09-173-3/+3
* [ticket/11700] Fix unit tests after develop mergeNils Adermann2013-09-175-16/+18
* Merge remote-tracking branch 'github-phpbb/develop' into ticket/11700Nils Adermann2013-09-1713-133/+308
|\
| * Merge remote-tracking branch 'EXreaction/ticket/11832' into developJoas Schilling2013-09-1613-133/+307
| |\
| | * [ticket/11832] Correct ROOT_PATH variableNathan Guse2013-09-151-1/+1
| | * [ticket/11832] get_url() from phpbb_template_asset should return web pathNathan Guse2013-09-152-4/+9
| | * [ticket/11832] Fix INCLUDE(JS/CSS)Nathan Guse2013-09-1310-25/+97
| | * [ticket/11832] Fix constructions of phpbb_filesystemNathan Guse2013-09-132-6/+10
| | * [ticket/11832] Fix smiley pathsNathan Guse2013-09-131-2/+2
| | * Merge branch 'develop' of github.com:phpbb/phpbb3 into ticket/11832Nathan Guse2013-09-131-1/+1
| | |\
| | * | [ticket/11832] Create phpbb_symfony_request to handle initiating symfony_requestNathan Guse2013-09-135-55/+68
| | * | Merge branch 'develop' of github.com:phpbb/phpbb3 into ticket/11832Nathan Guse2013-09-1326-106/+766
| | |\ \
| | * \ \ Merge remote-tracking branch 'remotes/imkingdavid/ticket/11824' into ticket/1...Nathan Guse2013-09-126-13/+89
| | |\ \ \
| | * | | | [ticket/11832] Fix build_url and the S_LOGIN_ACTIONNathan Guse2013-09-121-16/+18
| | * | | | Merge branch 'develop' of github.com:phpbb/phpbb3 into ticket/11832Nathan Guse2013-09-1249-43/+2851
| | |\ \ \ \
| | * | | | | [ticket/11832] Changing comments to say app.php rather than index.phpNathan Guse2013-09-121-3/+3
| | * | | | | [ticket/11832] We must instantiate the $phpbb_filesystem in commonNathan Guse2013-09-121-0/+1
| | * | | | | [ticket/11832] Fix the web path correctionsNathan Guse2013-09-121-10/+34
| | * | | | | [ticket/11832] More extensive testingNathan Guse2013-09-101-5/+7
| | * | | | | [ticket/11832] Use $phpbb_filesystem instead of the container in append_sidNathan Guse2013-09-101-4/+6
| | * | | | | [ticket/11832] update_web_root_path helper and testsNathan Guse2013-09-092-12/+29
| | * | | | | [ticket/11832] Inject dependencies for phpbb_get_web_root_path (also moving)Nathan Guse2013-09-094-45/+77
* | | | | | | [ticket/11700] Add back accidently deleted file in cache dirNils Adermann2013-09-171-0/+10
* | | | | | | [ticket/11700] Correctly load extensions with nonprefixed namespacesNils Adermann2013-09-177-13/+14
* | | | | | | [ticket/11700] Correctly convert old acm type to namespaced class nameNils Adermann2013-09-161-1/+1
* | | | | | | [ticket/11700] Use underscores in avatar driver template file namesNils Adermann2013-09-161-1/+1
* | | | | | | [ticket/11700] namespacify phpbb_permissions classNils Adermann2013-09-161-13/+15
* | | | | | | [ticket/11700] Correct service definitions with namespacesNils Adermann2013-09-161-4/+4
* | | | | | | [ticket/11700] Load avatar explanations correctly from namespacesNils Adermann2013-09-161-1/+1
* | | | | | | [ticket/11700] Correctly generate lang key from avatar driver classNils Adermann2013-09-161-1/+1
* | | | | | | [ticket/11700] Fix leftover backslashes in commentsNils Adermann2013-09-1613-18/+18
* | | | | | | [ticket/11700] And some last comments with backslashesNils Adermann2013-09-1611-30/+30
* | | | | | | [ticket/11700] Fix a few more commentsNils Adermann2013-09-1614-20/+20
* | | | | | | [ticket/11700] The word "them" in a comment is not a classNils Adermann2013-09-161-1/+1
* | | | | | | [ticket/11700] Actually "one" in comments is not a classNils Adermann2013-09-163-5/+5
* | | | | | | [ticket/11700] Fix authentication acp after develop mergeNils Adermann2013-09-166-28/+36
* | | | | | | [ticket/11700] Fix installation after develop mergeNils Adermann2013-09-167-14/+22
* | | | | | | [ticket/11700] Fix tests after merging new develop codeNils Adermann2013-09-1613-61/+68
* | | | | | | Merge remote-tracking branch 'github-phpbb/develop' into ticket/11700Nils Adermann2013-09-16250-5706/+7833
|\ \ \ \ \ \ \ | |/ / / / / /
| * | | | | | [ticket/11735] Display disabled checkbox in subsilver for read notificationsDhruv2013-09-161-1/+1
| * | | | | | [ticket/11735] Display disabled checkbox when notification is already readDhruv2013-09-151-1/+1
| * | | | | | Merge remote-tracking branch 'Prosk8er/ticket/11844' into developDhruv2013-09-151-1/+1
| |\ \ \ \ \ \
| | * | | | | | [ticket/11844] update acp/authentication language varProsk8er2013-09-141-1/+1
| * | | | | | | [ticket/11795] Remove PM popupVjacheslav Trushkin2013-09-143-14/+1
| * | | | | | | [ticket/11795] Remove outdated comment from forum_fn.jsVjacheslav Trushkin2013-09-141-2/+0
| * | | | | | | [ticket/11795] Move find user JS to forum_fnVjacheslav Trushkin2013-09-143-42/+48
| * | | | | | | [ticket/11795] Replace TWIG with phpBB syntax in ACPVjacheslav Trushkin2013-09-142-2/+2
| * | | | | | | [ticket/11795] Move MSN scripts to forum_fn.jsVjacheslav Trushkin2013-09-142-71/+59
| * | | | | | | [ticket/11795] Use phpBB template syntax instead of TWIGVjacheslav Trushkin2013-09-143-6/+4
| * | | | | | | [ticket/11795] Move PM popup JS to forum_fn.jsVjacheslav Trushkin2013-09-144-14/+12