aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB
Commit message (Expand)AuthorAgeFilesLines
...
| * | | | | | | | | | [ticket/11824] Fix logicDavid King2013-09-062-3/+3
| * | | | | | | | | | [ticket/11824] Add option for mod_rewriteDavid King2013-09-037-16/+92
* | | | | | | | | | | [ticket/11843] The twig lexer fixes DEFINE variables with underscores againrechosen2013-09-131-1/+1
* | | | | | | | | | | Merge pull request #1622 from EXreaction/ticket/11373David King2013-09-125-2/+97
|\ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ Merge branch 'develop' of github.com:phpbb/phpbb3 into ticket/11373Nathan Guse2013-09-12214-5055/+6436
| |\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | [ticket/11373] Use inheritdocNathan Guse2013-08-281-13/+3
| * | | | | | | | | | | | [ticket/11373] Prune old read notifications with cronNathan Guse2013-07-275-5/+110
* | | | | | | | | | | | | Merge pull request #1689 from EXreaction/ticket/11727David King2013-09-122-7/+165
|\ \ \ \ \ \ \ \ \ \ \ \ \ | |_|/ / / / / / / / / / / |/| | | | | | | | | | | |
| * | | | | | | | | | | | [ticket/11727] Fix indentationNathan Guse2013-09-121-1/+1
| * | | | | | | | | | | | [ticket/11727] Fix indentationNathan Guse2013-09-121-9/+9
| * | | | | | | | | | | | [ticket/11727] Template loader support for safe directories to load files fromNathan Guse2013-09-022-7/+165
* | | | | | | | | | | | | Merge pull request #1620 from EXreaction/ticket/11745David King2013-09-126-35/+147
|\ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | [ticket/11745] Correct language, coding guidelinesNathan Guse2013-09-122-3/+5
| * | | | | | | | | | | | | [ticket/11745] Group request approved notificationNathan Guse2013-07-275-33/+143
* | | | | | | | | | | | | | Merge pull request #1617 from EXreaction/ticket/11744David King2013-09-128-41/+292
|\ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | [ticket/11744] Cast to intNathan Guse2013-07-281-1/+1
| * | | | | | | | | | | | | | [ticket/11744] InheritdocNathan Guse2013-07-281-54/+7
| |/ / / / / / / / / / / / /
| * | | | | | | | | | | | | [ticket/11744] CommentsNathan Guse2013-07-271-1/+1
| * | | | | | | | | | | | | [ticket/11744] LanguageNathan Guse2013-07-271-1/+1
| * | | | | | | | | | | | | [ticket/11744] Create null log class (primarily for unit test)Nathaniel Guse2013-07-261-0/+125
| * | | | | | | | | | | | | [ticket/11744] Move notification from ucp_groups to group_user_addNathaniel Guse2013-07-262-8/+15
| * | | | | | | | | | | | | [ticket/11744] Group join request notificationNathan Guse2013-07-267-38/+204
| | |/ / / / / / / / / / / | |/| | | | | | | | | | |
* | | | | | | | | | | | | Merge pull request #1705 from EXreaction/ticket/11833David King2013-09-122-4/+4
|\ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | [ticket/11833] Prevent Twig errors from invalid template loops using BEGINELSENathan Guse2013-09-091-3/+3
| * | | | | | | | | | | | | [ticket/11833] Fix bad template loopNathan Guse2013-09-091-1/+1
* | | | | | | | | | | | | | Merge branch 'develop' of github.com:phpbb/phpbb3 into ticket/11816Nathan Guse2013-09-1258-62/+2920
|\ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ Merge pull request #1708 from EXreaction/ticket/11828David King2013-09-121-4/+4
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | | | | [ticket/11828] Fix greedy operators in lexerNathan Guse2013-09-121-4/+4
| * | | | | | | | | | | | | | | Merge pull request #1690 from EXreaction/ticket/11822David King2013-09-122-2/+37
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | | | | | [ticket/11822] Use namespace lookup order for asset loadingNathan Guse2013-09-022-2/+37
| | | |_|_|/ / / / / / / / / / / | | |/| | | | | | | | | | | | |
| * | | | | | | | | | | | | | | Merge pull request #1640 from brunoais/ticket/11637Nathan Guse2013-09-121-8/+2
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | | | | | [ticket/11637] generate_text_for_display on search.phpbrunoais2013-08-041-8/+2
| * | | | | | | | | | | | | | | | Merge remote-tracking branch 'remotes/upstream/develop-olympus' into developNathan Guse2013-09-124-3/+5
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |_|_|_|_|_|_|/ / / / / / / / | | |/| | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | Merge pull request #1698 from rechosen/ticket/11829Nathan Guse2013-09-124-3/+5
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | * | | | | | | | | | | | | | | [ticket/11829] Use report_closed to determine status in MCP report_detailsrechosen2013-09-044-3/+5
| * | | | | | | | | | | | | | | | | Merge pull request #1699 from rechosen/ticket/9550Nathan Guse2013-09-121-1/+14
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|_|_|_|/ / / / / | |/| | | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | | [ticket/9550] Add the core.viewtopic_post_rowset_data event to viewtopic.phprechosen2013-09-061-1/+14
| | | |_|_|_|_|/ / / / / / / / / / | | |/| | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | [ticket/11835] Fix ucp_auth_link adding in migrationNathan Guse2013-09-101-1/+1
| | |_|_|_|_|/ / / / / / / / / / | |/| | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | Merge branch 'develop' of git://github.com/phpbb/phpbb3 into feature/oauthJoseph Warner2013-09-1021-169/+253
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'develop-olympus' into developAndreas Fischer2013-09-101-1/+0
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | |/ / / / / / / / / / / / / | | | |/| | | | | | | | / / / / / | | | |_|_|_|_|_|_|_|_|/ / / / / | | |/| | | | | | | | | | | | |
| | | * | | | | | | | | | | | | Merge branch 'prep-release-3.0.12' into develop-olympusAndreas Fischer2013-09-101-1/+0
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ | | | | |_|_|_|_|_|_|_|/ / / / / | | | |/| | | | | | | | | | / / | | | | | |_|_|_|_|_|_|_|_|/ / | | | | |/| | | | | | | | | |
| | | | * | | | | | | | | | | [prep-release-3.0.12] Remove changelog entry for ticket that was not resolved.Andreas Fischer2013-09-101-1/+0
| | * | | | | | | | | | | | | [ticket/develop/11832] Fix path detectionVjacheslav Trushkin2013-09-091-1/+7
| | | |_|/ / / / / / / / / / | | |/| | | | | | | | | | |
| * | | | | | | | | | | | | [feature/oauth] Fix tabindexJoseph Warner2013-09-091-5/+5
| * | | | | | | | | | | | | [feature/oauth] Merge branch 'develop' of git://github.com/phpbb/phpbb3 into ...Joseph Warner2013-09-06169-5080/+3522
| |\ \ \ \ \ \ \ \ \ \ \ \ \ | | | |_|_|_|_|_|_|/ / / / / | | |/| | | | | | | | | | |
| * | | | | | | | | | | | | [feature/oauth] Fix bug on ucp_auth_link related to error displayJoseph Warner2013-09-021-0/+1
| * | | | | | | | | | | | | [feature/oauth] More small fixesJoseph Warner2013-09-023-7/+7
| * | | | | | | | | | | | | [feature/oauth] More minor changes from reviewJoseph Warner2013-09-025-21/+22
| * | | | | | | | | | | | | [feature/oauth] Fix small bug introduced by update in OAuth libraryJoseph Warner2013-09-021-0/+30
| * | | | | | | | | | | | | [feature/oauth] Fix small issues on ucp pagesJoseph Warner2013-09-022-2/+3