aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* [ticket/10783] Fixed an HTML error with assets_version.Callum Macrae2012-04-131-1/+1
* [ticket/10783] Added assets_version to ACP and simple_*.html.Callum Macrae2012-04-117-11/+11
* [ticket/10783] Added assets_version to subsilver2.Callum Macrae2012-04-111-1/+1
* [ticket/10783] Added ?assets_version to assets.Callum Macrae2012-04-115-10/+24
* Merge branch 'develop-olympus' into developAndreas Fischer2012-04-083-1/+57
|\
| * Merge remote-tracking branch 'sadu/ticket/10561' into develop-olympusAndreas Fischer2012-04-083-1/+57
| |\
| | * [ticket/10561] Removed extra tabs, changes made to $db->sql_query()Hari Sankar R2012-04-091-5/+5
| | * [ticket/10561] Changed $temp_style_id to $style_idHari Sankar R2012-04-091-2/+2
| | * [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-092-2/+2
| | * [ticket/10561] Reverted to phpbb_style_is_active()Hari Sankar R2012-04-073-5/+6
| | * [ticket/10561] Added to database_update:database_update_info()Hari Sankar R2012-04-071-18/+27
| | * [ticket/10561] Added section in database_update.phpHari Sankar R2012-04-061-0/+18
| | * [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 PR #716 branch 'develop-olympus' into developOleg Pudeyev2012-04-071-4/+0
|\ \ \ | |/ /
| * | Merge PR #716 branch 'callumacrae/ticket/10455' into develop-olympusOleg Pudeyev2012-04-071-4/+0
| |\ \
| | * | [ticket/10455] Removed NOTE from prosilver overall_header.html.Callum Macrae2012-04-051-4/+0
* | | | Merge PR #718 branch 'develop-olympus' into developOleg Pudeyev2012-04-071-1/+1
|\ \ \ \ | |/ / /
| * | | Merge PR #718 branch 'NeoAdonis/ticket/10764' into develop-olympusOleg Pudeyev2012-04-071-1/+1
| |\ \ \
| | * | | [ticket/10764] FAQ now mentions Area51 instead of SourceForgeAdonais Romero González2012-04-051-1/+1
| | * | | [ticket/10764] FAQ now mentions GitHub instead of SourceForgeAdonais Romero González2012-04-051-1/+1
| |/ / /
* | | | Merge branch 'develop-olympus' into developOleg Pudeyev2012-04-051-1/+1
|\ \ \ \ | |/ / /
| * | | Merge remote-tracking branch 'Fyorl/ticket/10508' into develop-olympusOleg Pudeyev2012-04-051-1/+1
| |\ \ \
| | * | | [ticket/10508] Marked as read message now less specific.Fyorl2012-04-041-1/+1
* | | | | 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
* | | | | | Merge remote-tracking branch 'p/ticket/10547' into developAndreas Fischer2012-04-051-0/+3
|\ \ \ \ \ \
| * | | | | | [ticket/10547] User is not logged in as admin after installationGabriel Anca2012-04-041-0/+3
|/ / / / / /
* | | | | | Merge branch 'develop-olympus' into developAndreas Fischer2012-04-051-6/+59
|\ \ \ \ \ \ | | |/ / / / | |/| | | |
| * | | | | Merge remote-tracking branch 'p/ticket/10760' into develop-olympusAndreas Fischer2012-04-051-6/+59
| |\ \ \ \ \
| | * | | | | [ticket/10760] Fix numbering in php fun facts.Oleg Pudeyev2012-04-041-5/+5
| | * | | | | [ticket/10760] Value must be quoted as it might be two words.Oleg Pudeyev2012-04-041-1/+1
| | * | | | | [ticket/10760] PHP is great. This commit is the proof.Oleg Pudeyev2012-04-041-0/+24
| | * | | | | [ticket/10760] Catch both versions of parse error output in php.Oleg Pudeyev2012-04-041-0/+14
| | * | | | | [ticket/10760] Account for display_errors=stderr in pre-commit hook.Oleg Pudeyev2012-04-031-1/+7
| | * | | | | [ticket/10760] Quote PHP_BIN when using it.Oleg Pudeyev2012-04-031-2/+2
| | * | | | | [ticket/10760] Use echo -e only if echo understands -e.Oleg Pudeyev2012-04-031-2/+9
| | * | | | | [ticket/10760] Use externally specified PHP_BIN if any.Oleg Pudeyev2012-04-031-3/+5
* | | | | | | Merge branch 'ticket/10650' into developOleg Pudeyev2012-04-0414-33/+1
|\ \ \ \ \ \ \
| * | | | | | | [ticket/10650] Revert merge of 'rahulr92/ticket/10650' into developOleg Pudeyev2012-04-0414-33/+1
|/ / / / / / /
* | | | | | | Merge remote-tracking branch 'rahulr92/ticket/10650' into developDavid King2012-04-0414-1/+33
|\ \ \ \ \ \ \
| * | | | | | | [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-052-1/+6