aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* [ticket/11786] Fix indentation in the PHPDoc of core.group_delete_user_beforerechosen2013-09-231-2/+2
* Merge branch 'develop' of git://github.com/phpbb/phpbb3 into ticket/11786rechosen2013-09-23241-5537/+8041
|\
| * Merge remote-tracking branch 'cyberalien/ticket/11846' into developAndreas Fischer2013-09-232-4/+8
| |\
| | * [ticket/11846] Replace empty p with margin-topVjacheslav Trushkin2013-09-152-4/+8
| * | Merge remote-tracking branch 'fredsa/ticket/11606' into developAndreas Fischer2013-09-231-14/+35
| |\ \
| | * | [ticket/11606] remove preg_replace() /e modifier in make_clickable()Fred Sauer2013-06-131-14/+35
| * | | Merge remote-tracking branch 'EXreaction/ticket/11832' into developJoas Schilling2013-09-1626-161/+557
| |\ \ \
| | * | | [ticket/11832] Correct paths in testsNathan Guse2013-09-153-17/+19
| | * | | [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-1321-41/+170
| | * | | [ticket/11832] Fix constructions of phpbb_filesystemNathan Guse2013-09-138-14/+41
| | * | | [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-137-75/+110
| | * | | | Merge branch 'develop' of github.com:phpbb/phpbb3 into ticket/11832Nathan Guse2013-09-1335-362/+1178
| | |\ \ \ \
| | * \ \ \ \ Merge remote-tracking branch 'remotes/imkingdavid/ticket/11824' into ticket/1...Nathan Guse2013-09-127-19/+139
| | |\ \ \ \ \
| | * | | | | | [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-1252-43/+3073
| | |\ \ \ \ \ \
| | * | | | | | | [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-122-12/+45
| | * | | | | | | [ticket/11832] More extensive testingNathan Guse2013-09-102-12/+49
| | * | | | | | | [ticket/11832] Use dirname(__FILE__)Nathan Guse2013-09-101-1/+1
| | * | | | | | | [ticket/11832] Use $phpbb_filesystem instead of the container in append_sidNathan Guse2013-09-102-5/+9
| | * | | | | | | Revert "[ticket/11832] Make $phpbb_container a global initiated by the framew...Nathan Guse2013-09-105-27/+11
| | * | | | | | | [ticket/11832] Make $phpbb_container a global initiated by the frameworkNathan Guse2013-09-095-11/+27
| | * | | | | | | [ticket/11832] Fix log testsNathan Guse2013-09-091-1/+3
| | * | | | | | | [ticket/11832] update_web_root_path helper and testsNathan Guse2013-09-093-12/+99
| | * | | | | | | [ticket/11832] Inject dependencies for phpbb_get_web_root_path (also moving)Nathan Guse2013-09-0910-51/+83
| * | | | | | | | Merge remote-tracking branch 'dhruv/ticket/11735' into developJoas Schilling2013-09-151-1/+1
| |\ \ \ \ \ \ \ \
| | * | | | | | | | [ticket/11735] Display disabled checkbox in subsilver for read notificationsDhruv2013-09-161-1/+1
| * | | | | | | | | Merge remote-tracking branch 'dhruv/ticket/11735' into developJoas Schilling2013-09-151-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
| * | | | | | | | Merge pull request #1666 from cyberalien/ticket/11795Nathan Guse2013-09-1415-251/+149
| |\ \ \ \ \ \ \ \ | | |/ / / / / / / | |/| | | | | | |
| | * | | | | | | [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
| | * | | | | | | [ticket/11795] Get rid of pagination JS variablesVjacheslav Trushkin2013-09-148-23/+24
| | * | | | | | | [ticket/11795] Get rid of onload_functionsVjacheslav Trushkin2013-09-142-42/+0
| | * | | | | | | [ticket/11795] Use data-reset-on-edit attr to reset elementsVjacheslav Trushkin2013-09-143-30/+7
| | * | | | | | | [ticket/11795] Redo form elements auto-focusVjacheslav Trushkin2013-09-143-25/+12
| |/ / / / / / /
| * | | | | | | Merge pull request #1710 from Hardolaf/ticket/11837Nathan Guse2013-09-131-0/+1
| |\ \ \ \ \ \ \
| | * | | | | | | [ticket/11837] Replace escaped single quote with utf-8 single quoteJoseph Warner2013-09-131-1/+1