aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB
Commit message (Expand)AuthorAgeFilesLines
* Merge remote-tracking branch 'github-dhruv/ticket/10797' into developNils Adermann2012-04-203-3/+3
|\
| * [ticket/10797] language key rank moved to commonDhruv Goel2012-04-203-2/+1
| * [ticket/10797] user rank is displayed in mcp_warn.phpDhruv Goel2012-04-162-2/+3
* | [ticket/10813] Installer now checks json extensionriadhchtara2012-04-192-1/+23
* | Merge PR #761 branch 'naderman/ticket/10756' into developOleg Pudeyev2012-04-1814-53/+178
|\ \
| * | [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-198-12/+10
| * | [ticket/10756] Removing path provider from template classVjacheslav Trushkin2012-04-195-13/+8
| * | [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
* | | [ticket/10759] Make sure style ids are integersNils Adermann2012-04-191-1/+1
* | | [ticket/10759] Don't select imageset_id, it's not neededNils Adermann2012-04-191-1/+1
* | | [ticket/10759] Clarify comments a bitNils Adermann2012-04-191-3/+3
* | | [ticket/10759] Retrieve style_id after INSERT since we cannot set itNils Adermann2012-04-191-2/+9
* | | [ticket/10759] Fix whitespace in database_update.phpNils Adermann2012-04-191-4/+4
* | | [ticket/10759] Fixing style in database updaterVjacheslav Trushkin2012-04-191-28/+127
|/ /
* | Merge remote-tracking branch 'github-cyberalien/ticket/10762' into developNils Adermann2012-04-193-3/+5
|\ \
| * | [ticket/10762] Check for phpbb_version when installing styleVjacheslav Trushkin2012-04-041-1/+1
| * | [ticket/10762] Changing version format in style.cfgVjacheslav Trushkin2012-04-042-2/+4
* | | Merge PR #727 branch 'rahulr92/ticket/10777' into developOleg Pudeyev2012-04-171-1/+2
|\ \ \
| * | | [ticket/10777] Split the comment into 2 linesRahul R2012-04-131-1/+2
| * | | [ticket/10777] Corrected typo in commentRahul R2012-04-101-1/+1
* | | | Merge remote-tracking branch 'callumacrae/ticket/10783' into developAndreas Fischer2012-04-131-1/+1
|\ \ \ \
| * | | | [ticket/10783] Fixed an HTML error with assets_version.Callum Macrae2012-04-131-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-1313-22/+36
|\ \ \ \ \ | |/ / / /
| * | | | [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 remote-tracking branch 'marc1706/ticket/10784' into developIgor Wiedler2012-04-122-5/+13
|\ \ \ \ \
| * | | | | [ticket/10784] Do not show ajax overlay unless neededMarc Alexander2012-04-122-5/+13
* | | | | | Merge branch 'develop-olympus' into developAndreas Fischer2012-04-121-2/+3
|\ \ \ \ \ \
| * | | | | | [ticket/10788] Move ckwalsh and kellanved to the Former Contributors section.Andreas Fischer2012-04-111-2/+2
| * | | | | | [ticket/10788] Add imkingdavid to the list of developers in docs/AUTHORS.Andreas Fischer2012-04-111-0/+1
* | | | | | | Merge remote-tracking branch 'callumacrae/ticket/10785' into developAndreas Fischer2012-04-111-2/+2
|\ \ \ \ \ \ \ | |_|/ / / / / |/| | | | | |
| * | | | | | [ticket/10785] Fixed illegal use of $_REQUEST in develop/fill.php.Callum Macrae2012-04-111-2/+2
| | |/ / / / | |/| | | |
* | | | | | Merge remote-tracking branch 'upstream/develop' into ticket/10734Shibu Lijack2012-04-10100-4748/+3130
|\ \ \ \ \ \ | | |_|/ / / | |/| | | |
| * | | | | 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-096-11/+11
| |\ \ \ \ \ | | |_|/ / / | |/| | | |
| | * | | | [ticket/10754] Changing $style to $phpbb_styleVjacheslav Trushkin2012-04-036-11/+11
| * | | | | 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