1
0
mirror of https://github.com/phpbb/phpbb.git synced 2025-06-03 21:15:42 +02:00

12575 Commits

Author SHA1 Message Date
Vjacheslav Trushkin
d25b607ca1 [feature/merging-style-components] Updating test cases
Updating code in test cases for new template classes.

PHPBB3-10632
2012-03-15 21:12:13 +02:00
Vjacheslav Trushkin
fd96f97dc3 [feature/merging-style-components] Updating style initialization
Changing template initialization to style initialization.

PHPBB3-10632
2012-03-15 21:11:34 +02:00
Vjacheslav Trushkin
1ce4d4c4fc [feature/merging-style-components] Changing style class
Moving functions that deal with styles from template to style class, updating docblocks

PHPBB3-10632
2012-03-15 21:09:49 +02:00
Vjacheslav Trushkin
5b149e93b9 [feature/merging-style-components] Changing template class
Removing functions that are now handled by phpbb_style class, allowing to write $context, updating docblocks

PHPBB3-10632
2012-03-15 21:08:41 +02:00
Vjacheslav Trushkin
0b2abe5250 [feature/merging-style-components] Changing resource locator
Changing "template" to "style" in all functions that deal with styles, changing error messages, updating docblocks

PHPBB3-10632
2012-03-15 21:06:24 +02:00
Vjacheslav Trushkin
c692e0d92d [feature/merging-style-components] Changing path provider
Changing set_templates() to set_style() and removing second parameter, changing get_main_template_path() to get_main_style_path(), removing template_root_for_style(), updating docblocks

PHPBB3-10632
2012-03-15 21:04:27 +02:00
Vjacheslav Trushkin
8b7c2c3c65 [feature/merging-style-components] Renaming style locator
Renaming style locator to style resource locator

PHPBB3-10632
2012-03-15 16:33:13 +02:00
Vjacheslav Trushkin
c83f386c92 [feature/merging-style-components] Changing $style to $style_id
Changing $style to $style_id in user::setup to avoid conflict with new global style variable

PHPBB3-10632
2012-03-15 13:41:23 +02:00
Vjacheslav Trushkin
3997ffac2a [feature/merging-style-components] Creating style class
Creating phpbb_style class, changing template initialization to style initialization

PHPBB3-10632
2012-03-15 13:13:21 +02:00
Vjacheslav Trushkin
39944a08b9 [feature/merging-style-components] New acp_styles template
New acp_styles.html, completely rewritten

PHPBB3-10632
2012-03-15 00:20:11 +02:00
Vjacheslav Trushkin
e35a20f957 [feature/merging-style-components] New acp_styles
New acp_styles, completely rewritten

PHPBB3-10632
2012-03-14 23:47:57 +02:00
Vjacheslav Trushkin
0c6955e73c [feature/merging-style-components] Adding new language variables
Adding new language variables for acp_styles and removing some unused variables

PHPBB3-10632
2012-03-14 23:45:54 +02:00
Vjacheslav Trushkin
ce215658eb [feature/merging-style-components] Adjusting unit tests
Adjusting unit tests for new styles table structure

PHPBB3-10632
2012-03-14 23:45:02 +02:00
Vjacheslav Trushkin
f32cc3ae8f [feature/merging-style-components] Admin.css additions for acp_styles
Adding background colors for row iterations and font color for disabled rows to admin control panel css.

PHPBB3-10632
2012-03-14 23:45:01 +02:00
Vjacheslav Trushkin
95a69639fd [feature/merging-style-components] Adding template information to style.cfg
Adding template data to style.cfg and removing obsolete comments

PHPBB3-10632
2012-03-14 23:26:23 +02:00
Vjacheslav Trushkin
1cc9f60f95 [feature/merging-style-components] Removing theme.cfg and template.cfg
Removing theme.cfg and template.cfg

PHPBB3-10632
2012-03-14 23:26:01 +02:00
Vjacheslav Trushkin
68336ab137 [feature/merging-style-components] Updating coding guidelines
Updating template inheritance section in coding guidelines

PHPBB3-10632
2012-03-14 23:25:07 +02:00
Vjacheslav Trushkin
ae7d290a22 [feature/merging-style-components] Updating PHP files
Removing theme and template entries in all files, except for acp styles section

PHPBB3-10632
2012-03-14 23:24:16 +02:00
Vjacheslav Trushkin
234e5d6402 [feature/merging-style-components] Implementing unlimited parent templates
Implementing possibility of unlimited levels of parent templates. Paths are stored in style_parent_tree, entries are separated by /

PHPBB3-10632
2012-03-14 23:22:02 +02:00
Vjacheslav Trushkin
ae3b0f736d [feature/merging-style-components] Updating database and acp modules
Removing theme and template tables, adding new columns to styles table, deleting acp modules, deleting code that updates theme in updater

PHPBB3-10632
2012-03-14 23:18:18 +02:00
Vjacheslav Trushkin
b7d84a586c [feature/merging-style-components] Renaming template classes
Changing template classes prefixes from phpbb_template to phpbb_style (for classes that will work with styles) or phpbb_style_template (for classes that are specific to templates)

PHPBB3-10632
2012-03-14 23:12:11 +02:00
Vjacheslav Trushkin
7d414d04ca [feature/merging-style-components] Moving template classes to style
Moving includes/template/ to includes/style/, adding template_ prefix to classes that deal only with templates

PHPBB3-10632
2012-03-14 22:57:58 +02:00
David King
7dfb8d7c20 Merge branch 'develop-olympus' into develop 2012-03-11 12:59:52 -04:00
David King
b652e1a1bb Merge branch 'unknownbliss/ticket/10697' into develop-olympus 2012-03-11 12:58:55 -04:00
Michael Cullum
24f1896b3c [ticket/10697] Updating gitignore to match develop branch
PHPBB3-10697
2012-03-11 09:42:56 +00:00
Andreas Fischer
3850b05fbb Merge branch 'develop-olympus' into develop
* develop-olympus:
  [ticket/7432] Delete redundant reference to "appropriate menu item".
  [ticket/7432] Explain what users are inactive in more detail.
2012-03-09 23:43:11 +01:00
Andreas Fischer
aee79c6cdb Merge remote-tracking branch 'p/ticket/7432' into develop-olympus
* p/ticket/7432:
  [ticket/7432] Delete redundant reference to "appropriate menu item".
  [ticket/7432] Explain what users are inactive in more detail.
2012-03-09 23:41:43 +01:00
Oleg Pudeyev
c001bb9c03 Merge branch 'develop-olympus' into develop
* develop-olympus:
  [ticket/9831] Fix saving unchecked checkbox field value
  [ticket/9831] Correctly store checkbox default value for boolean CPF.
2012-03-09 05:55:56 -05:00
Oleg Pudeyev
bd1fb91dd2 Merge remote-tracking branch 'rxu/ticket/9831' into develop-olympus
* rxu/ticket/9831:
  [ticket/9831] Fix saving unchecked checkbox field value
  [ticket/9831] Correctly store checkbox default value for boolean CPF.
2012-03-09 05:24:03 -05:00
Oleg Pudeyev
5c4788a24c Merge branch 'develop-olympus' into develop
* develop-olympus:
  [ticket/9084] Explain the logic.
  [ticket/9084] Don't hide 'non-entered' dropdown CPF value if not required
2012-03-09 04:42:16 -05:00
Oleg Pudeyev
0ec8e9dbff Merge remote-tracking branch 'rxu/ticket/9084' into develop-olympus
* rxu/ticket/9084:
  [ticket/9084] Explain the logic.
  [ticket/9084] Don't hide 'non-entered' dropdown CPF value if not required
2012-03-09 04:42:05 -05:00
Oleg Pudeyev
cd61de4bfd [ticket/9084] Explain the logic.
PHPBB3-9084
2012-03-09 04:35:09 -05:00
Oleg Pudeyev
35309de0b7 Merge branch 'develop-olympus' into develop
* develop-olympus:
  [ticket/10653] Call get_row_count of base class in mysql get_estimated_row_count
  [ticket/9813] Only get posts table row count if we detected a fulltext index.
  [ticket/9813] Also use estimated row count of posts table for fulltext mysql.
  [ticket/10653] Fix parameter to substr() in unit tests. Should be 1, not -1.
  [ticket/10653] Unit tests for get_row_count() and get_estimated_row_count().
  [ticket/10653] Add ability to count table rows to database abstraction layer.
  [ticket/9813] Use table status row count only if greater than 100000 or exact.
  [ticket/9813] Use SHOW TABLE STATUS to get search stats for native on MySQL.
2012-03-08 08:44:32 -05:00
Oleg Pudeyev
d380a1a36f Merge remote-tracking branch 'bantu/ticket/9813' into develop-olympus
* bantu/ticket/9813:
  [ticket/10653] Call get_row_count of base class in mysql get_estimated_row_count
  [ticket/9813] Only get posts table row count if we detected a fulltext index.
  [ticket/9813] Also use estimated row count of posts table for fulltext mysql.
  [ticket/10653] Fix parameter to substr() in unit tests. Should be 1, not -1.
  [ticket/10653] Unit tests for get_row_count() and get_estimated_row_count().
  [ticket/10653] Add ability to count table rows to database abstraction layer.
  [ticket/9813] Use table status row count only if greater than 100000 or exact.
  [ticket/9813] Use SHOW TABLE STATUS to get search stats for native on MySQL.
2012-03-08 08:44:24 -05:00
Andreas Fischer
c11607bdd1 [ticket/10653] Call get_row_count of base class in mysql get_estimated_row_count
There is no point in fetching the table status again.

PHPBB3-10653
2012-03-08 14:39:03 +01:00
Andreas Fischer
01d90e59a8 [ticket/9813] Only get posts table row count if we detected a fulltext index.
PHPBB3-9813
2012-03-08 14:38:59 +01:00
Oleg Pudeyev
65e711cbb0 Merge remote-tracking branch 'cyberalien/feature/append_var' into develop
* cyberalien/feature/append_var:
  [feature/append_var] Adding test case
  [feature/append_var] Adding append_var template class function
2012-03-07 18:20:49 -05:00
Vjacheslav Trushkin
ebdd03872a [feature/append_var] Adding test case
Adding test case for append_var

PHPBB3-10666
2012-03-08 01:01:16 +02:00
Oleg Pudeyev
89a0cbc57e [ticket/7432] Delete redundant reference to "appropriate menu item".
PHPBB3-7432
2012-03-07 18:00:57 -05:00
Andreas Fischer
74dfea22a1 Merge remote-tracking branch 'p/ticket/10618' into develop
* p/ticket/10618:
  [ticket/10618] Change phpBB 3 to phpBB 3.1.
  [ticket/10618] Replace phpBB 3.0 with phpBB 3 for 3.1.
2012-03-07 12:56:32 +01:00
Andreas Fischer
0eb7f18c98 Merge remote-tracking branch 'p/ticket/10685' into develop
* p/ticket/10685:
  [ticket/10685] Refactor template test defaults for php 5.4 compatibility.
2012-03-07 12:37:53 +01:00
Oleg Pudeyev
6e207e3f69 [ticket/10618] Change phpBB 3 to phpBB 3.1.
PHPBB3-10618
2012-03-06 19:42:33 -05:00
Oleg Pudeyev
6e5fc53f0d [ticket/10685] Refactor template test defaults for php 5.4 compatibility.
PHPBB3-10685
2012-03-06 19:34:20 -05:00
Vjacheslav Trushkin
a98117b229 [feature/append_var] Adding append_var template class function
Adding append_var template class function

PHPBB3-10666
2012-03-05 02:41:42 +02:00
Andreas Fischer
785c75254e [ticket/9813] Also use estimated row count of posts table for fulltext mysql.
Since this is 'only' for statistics anyway, using an estimated value does no
harm. Also, if MyISAM is the underlying storage engine for the posts table,
the value will actually be exact.

PHPBB3-9813
2012-03-05 00:29:28 +01:00
Andreas Fischer
f3af5945e3 [ticket/10653] Fix parameter to substr() in unit tests. Should be 1, not -1.
PHPBB3-10653
2012-03-04 22:11:45 +01:00
Andreas Fischer
6df721b215 [ticket/10653] Unit tests for get_row_count() and get_estimated_row_count().
PHPBB3-10653
2012-03-04 01:59:40 +01:00
Andreas Fischer
f9953fc339 [ticket/10653] Add ability to count table rows to database abstraction layer.
PHPBB3-10653
2012-03-03 21:04:01 +01:00
Andreas Fischer
97cf433dea [ticket/9813] Use table status row count only if greater than 100000 or exact.
PHPBB3-9813
2012-03-03 21:03:55 +01:00
Andreas Fischer
efe25a0b49 [ticket/9813] Use SHOW TABLE STATUS to get search stats for native on MySQL.
PHPBB3-9813
2012-03-03 21:03:50 +01:00