aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
...
* | | | | | | Merge PR #761 branch 'naderman/ticket/10756' into developOleg Pudeyev2012-04-1818-58/+183
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * naderman/ticket/10756: [ticket/10756] Fixing variable declarations in style and template classes [ticket/10756] Renaming phpbb_style_template to phpbb_template [ticket/10756] Removing path provider from template class [ticket/10756] Creating locator interface [ticket/10756] Renaming template classes [ticket/10756] Moving template classes
| * | | | | | | [ticket/10756] Fixing variable declarations in style and template classesVjacheslav Trushkin2012-04-193-23/+22
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixing variable declaration, removing function from template locator that does not belong there PHPBB3-10756
| * | | | | | | [ticket/10756] Renaming phpbb_style_template to phpbb_templateVjacheslav Trushkin2012-04-1910-14/+12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Renaming phpbb_style_template to phpbb_template PHPBB3-10756
| * | | | | | | [ticket/10756] Removing path provider from template classVjacheslav Trushkin2012-04-197-15/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Removing path provider from template class because it is not used by template class PHPBB3-10756
| * | | | | | | [ticket/10756] Creating locator interfaceVjacheslav Trushkin2012-04-193-5/+138
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Creating locator interface to be used in template class PHPBB3-10756
| * | | | | | | [ticket/10756] Renaming template classesVjacheslav Trushkin2012-04-1910-24/+24
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Renaming template classes from phpbb_style_template_ to phpbb_template_ PHPBB3-10756
| * | | | | | | [ticket/10756] Moving template classesVjacheslav Trushkin2012-04-196-0/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Moving template class files from includes/style/ to includes/template/ and removing template_ file prefix PHPBB3-10756
* | | | | | | | Merge PR #760 branch 'naderman/ticket/10759' into developOleg Pudeyev2012-04-181-29/+135
|\ \ \ \ \ \ \ \ | |/ / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * naderman/ticket/10759: [ticket/10759] Make sure style ids are integers [ticket/10759] Don't select imageset_id, it's not needed [ticket/10759] Clarify comments a bit [ticket/10759] Retrieve style_id after INSERT since we cannot set it [ticket/10759] Fix whitespace in database_update.php [ticket/10759] Fixing style in database updater
| * | | | | | | [ticket/10759] Make sure style ids are integersNils Adermann2012-04-191-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-10759
| * | | | | | | [ticket/10759] Don't select imageset_id, it's not neededNils Adermann2012-04-191-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-10759
| * | | | | | | [ticket/10759] Clarify comments a bitNils Adermann2012-04-191-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-10759
| * | | | | | | [ticket/10759] Retrieve style_id after INSERT since we cannot set itNils Adermann2012-04-191-2/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-10759
| * | | | | | | [ticket/10759] Fix whitespace in database_update.phpNils Adermann2012-04-191-4/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-10759
| * | | | | | | [ticket/10759] Fixing style in database updaterVjacheslav Trushkin2012-04-191-28/+127
|/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixing error in database updater caused by style components merge PHPBB3-10759
* | | | | | | Merge remote-tracking branch 'github-cyberalien/ticket/10762' into developNils Adermann2012-04-193-3/+5
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * github-cyberalien/ticket/10762: [ticket/10762] Check for phpbb_version when installing style [ticket/10762] Changing version format in style.cfg
| * | | | | | | [ticket/10762] Check for phpbb_version when installing styleVjacheslav Trushkin2012-04-041-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Check if phpbb_version exists when installing style. Do not warn users about installing outdated styles yet, that part of acp_styles will be changed in different branch. PHPBB3-10762
| * | | | | | | [ticket/10762] Changing version format in style.cfgVjacheslav Trushkin2012-04-042-2/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Splitting version into style_version and phpbb_version in style.cfg PHPBB3-10762
* | | | | | | | Merge PR #727 branch 'rahulr92/ticket/10777' into developOleg Pudeyev2012-04-171-1/+2
|\ \ \ \ \ \ \ \ | |_|_|_|_|_|_|/ |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * rahulr92/ticket/10777: [ticket/10777] Split the comment into 2 lines [ticket/10777] Corrected typo in comment
| * | | | | | | [ticket/10777] Split the comment into 2 linesRahul R2012-04-131-1/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Split the comment into 2 lines each having less than 79 characters. PHPBB3-10777
| * | | | | | | [ticket/10777] Corrected typo in commentRahul R2012-04-101-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | savely was corrected to safely PHPBB3-10777
* | | | | | | | Merge remote-tracking branch 'callumacrae/ticket/10783' into developAndreas Fischer2012-04-131-1/+1
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * callumacrae/ticket/10783: [ticket/10783] Fixed an HTML error with assets_version.
| * | | | | | | | [ticket/10783] Fixed an HTML error with assets_version.Callum Macrae2012-04-131-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-10783
* | | | | | | | | Merge remote-tracking branch 'naderman/ticket/10783' into developOleg Pudeyev2012-04-123-10/+11
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * naderman/ticket/10783: [ticket/10783] Correctly add assets_version config var to includejs urls
| * | | | | | | | | [ticket/10783] Correctly add assets_version config var to includejs urlsNils Adermann2012-04-133-10/+11
|/ / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-10783
* | | | | | | | | Merge remote-tracking branch 'github-callumacrae/ticket/10783' into developNils Adermann2012-04-1313-22/+36
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * github-callumacrae/ticket/10783: [ticket/10783] Added assets_version to ACP and simple_*.html. [ticket/10783] Added assets_version to subsilver2. [ticket/10783] Added ?assets_version to assets.
| * | | | | | | | [ticket/10783] Added assets_version to ACP and simple_*.html.Callum Macrae2012-04-117-11/+11
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-10783
| * | | | | | | | [ticket/10783] Added assets_version to subsilver2.Callum Macrae2012-04-111-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-10783
| * | | | | | | | [ticket/10783] Added ?assets_version to assets.Callum Macrae2012-04-115-10/+24
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-10783
* | | | | | | | | Merge remote-tracking branch 'marc1706/ticket/10784' into developIgor Wiedler2012-04-122-5/+13
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * marc1706/ticket/10784: [ticket/10784] Do not show ajax overlay unless needed
| * | | | | | | | | [ticket/10784] Do not show ajax overlay unless neededMarc Alexander2012-04-122-5/+13
| | |_|_|_|_|_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-10784
* | | | | | | | | Merge branch 'develop-olympus' into developAndreas Fischer2012-04-121-2/+3
|\ \ \ \ \ \ \ \ \ | | |_|_|_|_|/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * develop-olympus: [ticket/10788] Move ckwalsh and kellanved to the Former Contributors section. [ticket/10788] Add imkingdavid to the list of developers in docs/AUTHORS.
| * | | | | | | | Merge remote-tracking branch 'bantu/ticket/10788' into develop-olympusAndreas Fischer2012-04-121-2/+3
| |\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * bantu/ticket/10788: [ticket/10788] Move ckwalsh and kellanved to the Former Contributors section. [ticket/10788] Add imkingdavid to the list of developers in docs/AUTHORS.
| | * | | | | | | | [ticket/10788] Move ckwalsh and kellanved to the Former Contributors section.Andreas Fischer2012-04-111-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-10788
| | * | | | | | | | [ticket/10788] Add imkingdavid to the list of developers in docs/AUTHORS.Andreas Fischer2012-04-111-0/+1
| |/ / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-10788
* | | | | | | | | Merge remote-tracking branch 'callumacrae/ticket/10785' into developAndreas Fischer2012-04-111-2/+2
|\ \ \ \ \ \ \ \ \ | |_|/ / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | * callumacrae/ticket/10785: [ticket/10785] Fixed illegal use of $_REQUEST in develop/fill.php.
| * | | | | | | | [ticket/10785] Fixed illegal use of $_REQUEST in develop/fill.php.Callum Macrae2012-04-111-2/+2
| | |/ / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | PHPBB3-10785
* | | | | | | | Merge remote-tracking branch 'upstream/develop' into ticket/10734Shibu Lijack2012-04-10125-4834/+3409
|\ \ \ \ \ \ \ \ | | |_|/ / / / / | |/| | | | | | | | | | | | | | | | | | | | | | Conflicts: phpBB/styles/prosilver/theme/tweaks.css
| * | | | | | | Merge branch 'develop-olympus' into developNils Adermann2012-04-102-1/+12
| |\ \ \ \ \ \ \ | | | |/ / / / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | * develop-olympus: [ticket/10774] Correctly specify index name when creating unique index on MySQL. [ticket/10774] Add unit tests for UNIQUE index existence and creation.
| | * | | | | | Merge remote-tracking branch 'github-bantu/ticket/10774' into develop-olympusNils Adermann2012-04-102-1/+12
| | |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * github-bantu/ticket/10774: [ticket/10774] Correctly specify index name when creating unique index on MySQL. [ticket/10774] Add unit tests for UNIQUE index existence and creation.
| | | * | | | | | [ticket/10774] Correctly specify index name when creating unique index on MySQL.Andreas Fischer2012-04-101-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-10774
| | | * | | | | | [ticket/10774] Add unit tests for UNIQUE index existence and creation.Andreas Fischer2012-04-101-0/+11
| | |/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-10774
| * | | | | | | Merge remote-tracking branch 'github-cyberalien/ticket/10754' into developNils Adermann2012-04-096-11/+11
| |\ \ \ \ \ \ \ | | |_|/ / / / / | |/| | | | | | | | | | | | | | | | | | | | | | * github-cyberalien/ticket/10754: [ticket/10754] Changing $style to $phpbb_style
| | * | | | | | [ticket/10754] Changing $style to $phpbb_styleVjacheslav Trushkin2012-04-036-11/+11
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Renaming global variable $style to $phpbb_style PHPBB3-10754
| * | | | | | | Merge branch 'develop-olympus' into developAndreas Fischer2012-04-083-1/+57
| |\ \ \ \ \ \ \ | | | |/ / / / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * develop-olympus: [ticket/10561] Removed extra tabs, changes made to $db->sql_query() [ticket/10561] Changed $temp_style_id to $style_id [ticket/10561] Added function desc for phpbb_style_is_active() [ticket/10561] Casted $config['default_style'] to int [ticket/10561] Reverted to phpbb_style_is_active() [ticket/10561] Added to database_update:database_update_info() [ticket/10561] Added section in database_update.php [ticket/10561] Moved and renamed the funtion validate_style(). [ticket/10561] Fixed syntax error and renamed return variables. [ticket/10561] Changes made to $db->sql_fetchrow(). [ticket/10561] Changes made to function phpbb_style_is_active(). [ticket/10561] All users can choose deactivated styles (fixed). Conflicts: phpBB/install/database_update.php
| | * | | | | | Merge remote-tracking branch 'sadu/ticket/10561' into develop-olympusAndreas Fischer2012-04-083-1/+57
| | |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * sadu/ticket/10561: [ticket/10561] Removed extra tabs, changes made to $db->sql_query() [ticket/10561] Changed $temp_style_id to $style_id [ticket/10561] Added function desc for phpbb_style_is_active() [ticket/10561] Casted $config['default_style'] to int [ticket/10561] Reverted to phpbb_style_is_active() [ticket/10561] Added to database_update:database_update_info() [ticket/10561] Added section in database_update.php [ticket/10561] Moved and renamed the funtion validate_style(). [ticket/10561] Fixed syntax error and renamed return variables. [ticket/10561] Changes made to $db->sql_fetchrow(). [ticket/10561] Changes made to function phpbb_style_is_active(). [ticket/10561] All users can choose deactivated styles (fixed).
| | | * | | | | | [ticket/10561] Removed extra tabs, changes made to $db->sql_query()Hari Sankar R2012-04-091-5/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Substituted $db->sql_query() with _sql() PHPBB3-10561
| | | * | | | | | [ticket/10561] Changed $temp_style_id to $style_idHari Sankar R2012-04-091-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-10561
| | | * | | | | | [ticket/10561] Added function desc for phpbb_style_is_active()Hari Sankar R2012-04-091-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-10561
| | | * | | | | | [ticket/10561] Casted $config['default_style'] to intHari Sankar R2012-04-092-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-10561
| | | * | | | | | [ticket/10561] Reverted to phpbb_style_is_active()Hari Sankar R2012-04-073-5/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Changes made to function name, reverted to old. PHPBB3-10561
generated by cgit v1.2.1 (git 2.21.0) at 2025-09-02 09:46:55 +0000