aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'develop' of github.com:phpbb/phpbb3 into ticket/11816Nathan Guse2013-09-0653-4437/+2436
|\
| * Merge pull request #1618 from VSEphpbb/ticket/11747Nathan Guse2013-09-058-1/+152
| |\
| | * [ticket/11747] Tweak some of the wording in the events docMatt Friedman2013-07-271-8/+8
| | * [ticket/11747] Use _prepend and _append for template eventsMatt Friedman2013-07-267-24/+24
| | * [ticket/11747] ucp_prefs_post template eventsMatt Friedman2013-07-263-0/+18
| | * [ticket/11747] ucp_prefs_post core eventsMatt Friedman2013-07-261-0/+25
| | * [ticket/11747] ucp_prefs_view template eventsMatt Friedman2013-07-263-0/+40
| | * [ticket/11747] ucp_prefs_view core eventsMatt Friedman2013-07-261-0/+25
| | * [ticket/11747] ucp_prefs_personal template eventsMatt Friedman2013-07-263-0/+18
| | * [ticket/11747] ucp_prefs_personal core eventsMatt Friedman2013-07-261-0/+25
| | * [ticket/11747] Add $phpbb_dispatcher to globalMatt Friedman2013-07-261-1/+1
| * | Merge pull request #1435 from cyberalien/ticket/11562Nathan Guse2013-09-051-121/+8
| |\ \
| | * | [ticket/11562] Use jQuery in subPanelsVjacheslav Trushkin2013-08-301-17/+3
| | * | [ticket/11562] Remove submit_default_button from forum_fnVjacheslav Trushkin2013-08-301-92/+0
| | * | [ticket/11562] Convert marklist() to jQueryVjacheslav Trushkin2013-08-301-12/+5
| * | | Merge pull request #1695 from dhruvgoel92/ticket/11825Nathan Guse2013-09-053-2/+2
| |\ \ \
| | * | | [ticket/11825] Move schema_data.php into includes/ instead of phpbb/Dhruv2013-09-033-2/+2
| * | | | Merge pull request #1651 from cyberalien/ticket/11782Nathan Guse2013-09-057-43/+81
| |\ \ \ \
| | * | | | [ticket/11782] Apply line-height correctlyVjacheslav Trushkin2013-08-111-1/+1
| | * | | | [ticket/11782] RTL support for post noticesVjacheslav Trushkin2013-08-111-0/+7
| | * | | | [ticket/11782] Change p.rules to p.post-notice in CSSVjacheslav Trushkin2013-08-112-13/+31
| | * | | | [ticket/11782] Change p.rules to p.post-notice in templatesVjacheslav Trushkin2013-08-114-30/+43
| * | | | | Merge branch 'develop-olympus' into developAndreas Fischer2013-09-051-0/+3
| |\ \ \ \ \ | | |_|/ / / | |/| | | |
| | * | | | Merge branch 'prep-release-3.0.12' into develop-olympusAndreas Fischer2013-09-052-0/+9
| | |\ \ \ \
| | | * | | | [prep-release-3.0.12] Update Changelog for 3.0.12-RC3 release.Andreas Fischer2013-09-021-0/+3
| | | * | | | [prep-release-3.0.12] Bumping version number for 3.0.12-RC3.Andreas Fischer2013-09-023-3/+9
| * | | | | | Merge remote-tracking branch 'EXreaction/ticket/11791' into developDavid King2013-09-025-5/+5
| |\ \ \ \ \ \
| | * | | | | | [ticket/11791] Load adm/ events from styles/adm/event/Nathan Guse2013-09-025-5/+5
| * | | | | | | Merge remote-tracking branch 'EXreaction/ticket/11818' into developDavid King2013-09-022-160/+349
| |\ \ \ \ \ \ \
| | * | | | | | | [ticket/11818] Update Symfony dependencies to 2.3.*Nathan Guse2013-09-022-160/+349
| * | | | | | | | Merge remote-tracking branch 'EXreaction/ticket/11755' into developDavid King2013-09-024-2786/+1456
| |\ \ \ \ \ \ \ \
| | * | | | | | | | [ticket/11755] MySQL upgrader out of dateNathan Guse2013-09-024-2786/+1456
| | |/ / / / / / /
| * | | | | | | | Merge pull request #1102 from imkingdavid/ticket/11215Nathan Guse2013-09-026-34/+95
| |\ \ \ \ \ \ \ \
| | * | | | | | | | [ticket/11215] Remove unnecessary commentDavid King2013-09-021-4/+0
| | * | | | | | | | [ticket/11215] Fix helper_url_test.php testsDavid King2013-09-021-1/+1
| | * | | | | | | | [ticket/11215] Add newline back to .htaccess, fix wordingDavid King2013-09-021-3/+3
| | * | | | | | | | [ticket/11215] Update comment in .htaccessDavid King2013-09-021-4/+4
| | * | | | | | | | [ticket/11215] Uncomment rewrite rules in .htaccessDavid King2013-09-021-4/+4
| | * | | | | | | | [ticket/11215] Make controller helper url() method use correct formatDavid King2013-09-022-16/+18
| | * | | | | | | | [ticket/11215] Add commented-out URL rewrite capability to .htaccessDavid King2013-09-022-4/+34
| | * | | | | | | | Merge remote-tracking branch 'upstream/develop' into ticket/11215David King2013-09-025-4/+15
| | |\ \ \ \ \ \ \ \ | | | |/ / / / / / /
| | * | | | | | | | [ticket/11215] Everything appears to be working...David King2013-08-311-19/+9
| | * | | | | | | | Merge branch 'develop' into ticket/11215David King2013-08-31350-2426/+1904
| | |\ \ \ \ \ \ \ \ | | | | |/ / / / / / | | | |/| | | | | |
| | * | | | | | | | Merge branch 'develop' into ticket/11215David King2013-07-141-1/+1
| | |\ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ Merge branch 'develop' into ticket/11215David King2013-07-1311-38/+120
| | |\ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ Merge branch 'develop' into ticket/11215David King2013-07-13111-1580/+3615
| | |\ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ \ Merge branch 'develop' into ticket/11215David King2013-07-132-14/+191
| | |\ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | | [ticket/11215] Don't try to use when it isn't thereDavid King2013-07-131-2/+2
| | * | | | | | | | | | | | Merge branch 'develop' into ticket/11215David King2013-07-1327-252/+577
| | |\ \ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | | | [ticket/11215] Don't try to correct paths during testsDavid King2013-07-121-1/+1