aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB/includes
Commit message (Expand)AuthorAgeFilesLines
* [feature/twig] Replace phpBB template with TwigNathan Guse2013-06-103-395/+897
* [feature/twig] BEGIN loops now workNathan Guse2013-06-102-5/+4
* [feature/twig] Replace phpBB template code with Twig syntax, then parse w/TwigNathan Guse2013-06-106-67/+146
* [feature/twig] More work on the lexerNathan Guse2013-06-103-2/+41
* [feature/twig] Working on DEFINENathan Guse2013-06-103-1/+60
* [feature/twig] Support our old INCLUDE statements (no quotes)Nathan Guse2013-06-091-13/+23
* [feature/twig] WIP extension/lexer/some tokenparsers/nodesNathan Guse2013-06-097-0/+395
* Merge remote-tracking branch 'remotes/nickv/ticket/11481' into developNathan Guse2013-06-0712-0/+1434
|\
| * [ticket/11481] Move prepended slash from calls into functionJoas Schilling2013-06-065-5/+5
| * [ticket/11481] Remove globals and use dependency injection insteadJoas Schilling2013-06-0611-125/+115
| * [ticket/11481] Use container for all classes and inject dependenciesJoas Schilling2013-06-067-33/+81
| * [ticket/11481] Move functions from feed into helper classJoas Schilling2013-06-061-0/+159
| * [ticket/11481] Move active topics feed to own fileJoas Schilling2013-06-061-0/+139
| * [ticket/11481] Move topics feed to own fileJoas Schilling2013-06-061-0/+93
| * [ticket/11481] Move news feed to own fileJoas Schilling2013-06-061-0/+115
| * [ticket/11481] Move forums feed to own fileJoas Schilling2013-06-061-0/+78
| * [ticket/11481] Move topic feed to own fileJoas Schilling2013-06-061-0/+114
| * [ticket/11481] Move forum feed to own fileJoas Schilling2013-06-061-0/+145
| * [ticket/11481] Move overall feed to own fileJoas Schilling2013-06-061-0/+99
| * [ticket/11481] Move feed topic base to own fileJoas Schilling2013-06-061-0/+61
| * [ticket/11481] Move feed post base to own fileJoas Schilling2013-06-061-0/+59
| * [ticket/11481] Move feed base to own fileJoas Schilling2013-06-061-0/+230
| * [ticket/11481] Move feed factory to own fileJoas Schilling2013-06-061-0/+104
* | Merge remote-tracking branch 'remotes/Marc/ticket/11587' into developNathaniel Guse2013-06-061-4/+13
|\ \ | |/ |/|
| * [ticket/11587] Pass legend and teampage settings to group_create()Marc Alexander2013-06-041-4/+13
* | Merge branch 'develop-olympus' into developDhruv2013-06-051-2/+9
|\ \ | |/ |/|
| * Merge remote-tracking branch 'bantu/ticket/11583' into develop-olympusDhruv2013-06-051-2/+9
| |\
| | * [ticket/11583] Use a new lang key instead of giving the old one a new meaning.Andreas Fischer2013-06-031-1/+1
| | * [ticket/11583] Allow FULLTEXT indexes on InnoDB when on MySQL 5.6.4 or higher.Andreas Fischer2013-06-011-1/+8
* | | [ticket/11586] Move $filedata['thumbnail'] to where it might be returned.Andreas Fischer2013-06-031-3/+3
* | | [ticket/11586] Combine $filedata['post_attach'] assign into a single statement.Andreas Fischer2013-06-031-8/+1
* | | [ticket/11586] Use a variable for $cat_id == ATTACHMENT_CATEGORY_IMAGE.Andreas Fischer2013-06-031-8/+8
* | | [ticket/11586] Combine administrator/moderator checks together.Andreas Fischer2013-06-031-7/+7
* | | Merge branch 'develop-olympus' into developAndreas Fischer2013-06-031-10/+10
|\ \ \ | |/ /
| * | Merge remote-tracking branch 'erangamapa/ticket/11145' into develop-olympusAndreas Fischer2013-06-031-10/+10
| |\ \
| | * | [ticket/11145] Wrong error thrown when uploading a bigger image.erangamapa2013-05-251-10/+10
* | | | Merge branch 'develop-olympus' into developAndreas Fischer2013-06-031-0/+10
|\ \ \ \ | |/ / /
| * | | [ticket/10840] Add check_form_key to acp_groups.phpJoas Schilling2013-06-031-0/+10
| | |/ | |/|
* | | Merge remote-tracking branch 'Elsensee/ticket/11409' into developJoas Schilling2013-05-311-0/+2
|\ \ \
| * | | [ticket/11409] Add success message after updating group position settingsOliver Schramm2013-05-311-0/+2
* | | | Merge remote-tracking branch 'EXreaction/ticket/11387' into developJoas Schilling2013-05-311-3/+2
|\ \ \ \ | |/ / / |/| | |
| * | | [ticket/11387] Log module added only after it has been addedNathaniel Guse2013-03-021-3/+2
* | | | Merge branch 'develop-olympus' into developJoas Schilling2013-05-271-1/+1
|\ \ \ \ | | |/ / | |/| |
| * | | [ticket/11578] Add missing underscore after 'validate' function prefixmarc17062013-05-271-1/+1
* | | | Merge branch 'develop-olympus' into developJoas Schilling2013-05-271-1/+1
|\ \ \ \ | |/ / /
| * | | [ticket/11538] Compare to '' instead of using empty(), so '0' does not pass.Andreas Fischer2013-05-261-1/+1
* | | | Merge branch 'develop-olympus' into developAndreas Fischer2013-05-263-19/+48
|\ \ \ \ | |/ / /
| * | | Merge remote-tracking branch 'marc1706/ticket/11538' into develop-olympusAndreas Fischer2013-05-263-6/+46
| |\ \ \
| | * | | [ticket/11538] Add optional switch as argument to hex colour validationMarc Alexander2013-05-193-5/+7
| | * | | [ticket/11538] Limit comment in acp_groups to 80 characters per lineMarc Alexander2013-05-191-4/+4