aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB/includes
Commit message (Expand)AuthorAgeFilesLines
* Merge remote-tracking branch 'brunoais/ticket/10871' into developAndreas Fischer2012-05-041-2/+0
|\
| * [ticket/10871] Delete the unwanted implodeBruno Ais2012-05-041-2/+0
* | Merge remote-tracking branch 'Senky/ticket/10847' into developAndreas Fischer2012-05-012-2/+2
|\ \
| * | [ticket/10847] fixing all misspelled "dependant" to "dependent"Senky2012-04-302-2/+2
* | | Merge branch 'develop-olympus' into developAndreas Fischer2012-05-011-1/+1
|\ \ \ | |/ / |/| |
| * | [ticket/10846] fixing SQL query bug in acp_main.phpSenky2012-04-301-1/+1
* | | Merge PR #731 branch 'VSEphpbb/ticket/10779' into developOleg Pudeyev2012-04-251-2/+2
|\ \ \ | |_|/ |/| |
| * | [ticket/10779] Move jQuery CDN option to Load SettingsMatt Friedman2012-04-101-2/+2
* | | Merge branch 'develop-olympus' into developNils Adermann2012-04-211-0/+10
|\ \ \ | | |/ | |/|
| * | [ticket/10492] Separate config generation from the installerPatrick Webster2012-04-201-0/+52
| * | Merge remote-tracking branch 'github-dhruv/ticket/10797' into develop-olympusNils Adermann2012-04-201-2/+2
| |\ \
* | \ \ Merge PR #734 branch 'shibulijack/ticket/10688' into developOleg Pudeyev2012-04-192-2/+2
|\ \ \ \
| * | | | [ticket/10688] Updated version to 3.1Shibu Lijack2012-04-112-2/+2
* | | | | Merge remote-tracking branch 'github-dhruv/ticket/10797' into developNils Adermann2012-04-201-2/+2
|\ \ \ \ \ | | |_|/ / | |/| | |
| * | | | [ticket/10797] user rank is displayed in mcp_warn.phpDhruv Goel2012-04-161-2/+2
* | | | | [ticket/10756] Fixing variable declarations in style and template classesVjacheslav Trushkin2012-04-193-23/+22
* | | | | [ticket/10756] Renaming phpbb_style_template to phpbb_templateVjacheslav Trushkin2012-04-196-9/+8
* | | | | [ticket/10756] Removing path provider from template classVjacheslav Trushkin2012-04-193-11/+5
* | | | | [ticket/10756] Creating locator interfaceVjacheslav Trushkin2012-04-193-5/+138
* | | | | [ticket/10756] Renaming template classesVjacheslav Trushkin2012-04-198-21/+21
* | | | | [ticket/10756] Moving template classesVjacheslav Trushkin2012-04-196-0/+0
* | | | | Merge remote-tracking branch 'github-cyberalien/ticket/10762' into developNils Adermann2012-04-191-1/+1
|\ \ \ \ \
| * | | | | [ticket/10762] Check for phpbb_version when installing styleVjacheslav Trushkin2012-04-041-1/+1
* | | | | | [ticket/10783] Correctly add assets_version config var to includejs urlsNils Adermann2012-04-132-6/+7
* | | | | | Merge remote-tracking branch 'github-callumacrae/ticket/10783' into developNils Adermann2012-04-132-4/+7
|\ \ \ \ \ \ | |_|_|_|_|/ |/| | | | |
| * | | | | [ticket/10783] Added ?assets_version to assets.Callum Macrae2012-04-112-4/+7
* | | | | | Merge branch 'develop-olympus' into developNils Adermann2012-04-101-1/+1
|\ \ \ \ \ \ | | |_|_|_|/ | |/| | | |
| * | | | | [ticket/10774] Correctly specify index name when creating unique index on MySQL.Andreas Fischer2012-04-101-1/+1
* | | | | | Merge remote-tracking branch 'github-cyberalien/ticket/10754' into developNils Adermann2012-04-092-4/+4
|\ \ \ \ \ \ | |_|/ / / / |/| | | | |
| * | | | | [ticket/10754] Changing $style to $phpbb_styleVjacheslav Trushkin2012-04-032-4/+4
* | | | | | Merge branch 'develop-olympus' into developAndreas Fischer2012-04-082-1/+29
|\ \ \ \ \ \ | | |/ / / / | |/| | | |
| * | | | | Merge remote-tracking branch 'sadu/ticket/10561' into develop-olympusAndreas Fischer2012-04-082-1/+29
| |\ \ \ \ \
| | * | | | | [ticket/10561] Added function desc for phpbb_style_is_active()Hari Sankar R2012-04-091-0/+2
| | * | | | | [ticket/10561] Casted $config['default_style'] to intHari Sankar R2012-04-091-1/+1
| | * | | | | [ticket/10561] Reverted to phpbb_style_is_active()Hari Sankar R2012-04-072-3/+3
| | * | | | | [ticket/10561] Moved and renamed the funtion validate_style().Hari Sankar R2012-04-053-22/+27
| | * | | | | [ticket/10561] Fixed syntax error and renamed return variables.Hari Sankar R2012-04-031-2/+2
| | * | | | | [ticket/10561] Changes made to $db->sql_fetchrow().Hari Sankar R2012-04-031-2/+2
| | * | | | | [ticket/10561] Changes made to function phpbb_style_is_active().Hari Sankar R2012-04-032-6/+8
| | * | | | | [ticket/10561] All users can choose deactivated styles (fixed).Hari Sankar R2012-04-032-1/+20
* | | | | | | Merge remote-tracking branch 'brunoais/ticket/10575' into developAndreas Fischer2012-04-056-6/+6
|\ \ \ \ \ \ \
| * | | | | | | [ticket/10575] Adding public visibility to the methods.Bruno Ais2012-04-056-6/+6
| * | | | | | | [ticket/10575] Fixing non-static access to static functions get_instanceBruno Ais2012-04-056-6/+6
* | | | | | | | [ticket/10650] Revert merge of 'rahulr92/ticket/10650' into developOleg Pudeyev2012-04-042-10/+0
* | | | | | | | Merge remote-tracking branch 'rahulr92/ticket/10650' into developDavid King2012-04-042-0/+10
|\ \ \ \ \ \ \ \
| * | | | | | | | [ticket/10650] Added checking for empty subjectsRahul R2012-04-051-1/+1
| * | | | | | | | [ticket/10650] Corrected intendationRahul R2012-04-051-4/+4
| * | | | | | | | [ticket/10650]Added permission checking and utf8 functionsRahul R2012-04-051-4/+4
| * | | | | | | | [ticket/10650] Cropped subject and inserted newlineRahul R2012-04-051-0/+5
| * | | | | | | | [ticket/10650] Corrected space before trueRahul2012-04-051-1/+1