aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB/includes
Commit message (Expand)AuthorAgeFilesLines
* [ticket/11700] Fix unit tests after develop mergeNils Adermann2013-09-171-1/+1
* Merge remote-tracking branch 'github-phpbb/develop' into ticket/11700Nils Adermann2013-09-174-112/+39
|\
| * Merge remote-tracking branch 'EXreaction/ticket/11832' into developJoas Schilling2013-09-164-112/+39
| |\
| | * [ticket/11832] Correct ROOT_PATH variableNathan Guse2013-09-151-1/+1
| | * [ticket/11832] Fix INCLUDE(JS/CSS)Nathan Guse2013-09-133-5/+12
| | * [ticket/11832] Fix constructions of phpbb_filesystemNathan Guse2013-09-131-5/+4
| | * [ticket/11832] Fix smiley pathsNathan Guse2013-09-131-2/+2
| | * [ticket/11832] Create phpbb_symfony_request to handle initiating symfony_requestNathan Guse2013-09-131-41/+0
| | * Merge branch 'develop' of github.com:phpbb/phpbb3 into ticket/11832Nathan Guse2013-09-135-55/+32
| | |\
| | * \ Merge remote-tracking branch 'remotes/imkingdavid/ticket/11824' into ticket/1...Nathan Guse2013-09-121-0/+48
| | |\ \
| | * | | [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-128-8/+559
| | |\ \ \
| | * | | | [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-091-5/+2
| | * | | | [ticket/11832] Inject dependencies for phpbb_get_web_root_path (also moving)Nathan Guse2013-09-091-44/+5
* | | | | | [ticket/11700] Correctly load extensions with nonprefixed namespacesNils Adermann2013-09-171-1/+1
* | | | | | Merge remote-tracking branch 'github-phpbb/develop' into ticket/11700Nils Adermann2013-09-1632-263/+2103
|\ \ \ \ \ \ | |/ / / / /
| * | | | | [ticket/11795] Move PM popup JS to forum_fn.jsVjacheslav Trushkin2013-09-141-1/+0
| * | | | | [ticket/11795] Get rid of pagination JS variablesVjacheslav Trushkin2013-09-141-2/+1
| * | | | | Merge remote-tracking branch 'imkingdavid/ticket/11824' into developJoas Schilling2013-09-131-0/+48
| |\ \ \ \ \ | | | |_|/ / | | |/| | / | | |_|_|/ | |/| | |
| | * | | [ticket/11824] Revert changes in functions.phpDavid King2013-09-121-3/+3
| | * | | [ticket/11824] Revert changes to functions_content.phpDavid King2013-09-121-2/+2
| | * | | [ticket/11824] Correct a commentDavid King2013-09-061-1/+1
| | * | | [ticket/11824] Remove unused globalsDavid King2013-09-061-1/+1
| | * | | [ticket/11824] Fix smiliesDavid King2013-09-061-2/+2
| | * | | [ticket/11824] Fix logicDavid King2013-09-061-1/+1
| | * | | [ticket/11824] Add option for mod_rewriteDavid King2013-09-032-3/+51
| * | | | Merge branch 'develop' of github.com:phpbb/phpbb3 into ticket/11373Nathan Guse2013-09-1227-222/+2006
| |\ \ \ \
| | * \ \ \ Merge pull request #1620 from EXreaction/ticket/11745David King2013-09-121-23/+6
| | |\ \ \ \
| | | * | | | [ticket/11745] Group request approved notificationNathan Guse2013-07-271-23/+6
| | * | | | | Merge pull request #1617 from EXreaction/ticket/11744David King2013-09-122-34/+25
| | |\ \ \ \ \ | | | |/ / / /
| | | * | | | [ticket/11744] Move notification from ucp_groups to group_user_addNathaniel Guse2013-07-262-8/+15
| | | * | | | [ticket/11744] Group join request notificationNathan Guse2013-07-262-31/+15
| | * | | | | Merge remote-tracking branch 'remotes/upstream/develop-olympus' into developNathan Guse2013-09-122-0/+2
| | |\ \ \ \ \ | | | |_|_|_|/ | | |/| | | |
| | | * | | | [ticket/11829] Use report_closed to determine status in MCP report_detailsrechosen2013-09-042-0/+2
| | * | | | | Merge branch 'develop' of git://github.com/phpbb/phpbb3 into feature/oauthJoseph Warner2013-09-103-2/+1302
| | |\ \ \ \ \ | | | | |_|_|/ | | | |/| | |
| | | * | | | [ticket/develop/11832] Fix path detectionVjacheslav Trushkin2013-09-091-1/+7
| | | * | | | Merge pull request #1618 from VSEphpbb/ticket/11747Nathan Guse2013-09-051-1/+76
| | | |\ \ \ \
| | | | * | | | [ticket/11747] ucp_prefs_post core eventsMatt Friedman2013-07-261-0/+25
| | | | * | | | [ticket/11747] ucp_prefs_view core eventsMatt Friedman2013-07-261-0/+25
| | | | * | | | [ticket/11747] ucp_prefs_personal core eventsMatt Friedman2013-07-261-0/+25
| | | | * | | | [ticket/11747] Add $phpbb_dispatcher to globalMatt Friedman2013-07-261-1/+1
| | | | | |/ / | | | | |/| |
| | | * | | | [ticket/11825] Move schema_data.php into includes/ instead of phpbb/Dhruv2013-09-031-0/+1194
| | | | |_|/ | | | |/| |
| | * | | | [feature/oauth] Merge branch 'develop' of git://github.com/phpbb/phpbb3 into ...Joseph Warner2013-09-0624-195/+186
| | |\ \ \ \ | | | |/ / /
| | | * | | Merge remote-tracking branch 'EXreaction/ticket/11791' into developDavid King2013-09-021-1/+1
| | | |\ \ \
| | | | * | | [ticket/11791] Load adm/ events from styles/adm/event/Nathan Guse2013-09-021-1/+1
| | | * | | | [ticket/11215] Add commented-out URL rewrite capability to .htaccessDavid King2013-09-021-0/+8
| | | * | | | Merge remote-tracking branch 'upstream/develop' into ticket/11215David King2013-09-021-0/+5
| | | |\ \ \ \
| | | | * \ \ \ Merge branch 'develop-olympus' into developAndreas Fischer2013-09-021-0/+5
| | | | |\ \ \ \ | | | | | |/ / / | | | | |/| | / | | | | | | |/ | | | | | |/|
| | | | | * | Merge branch 'prep-release-3.0.12' into develop-olympusAndreas Fischer2013-09-021-1/+4
| | | | | |\ \