makary/phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-06-11 22:08:54 +00:00
Code Issues Projects Releases Packages Wiki Activity
13165 commits 18 branches 192 tags 206 MiB
Commit graph

13165 commits

This branch
This branch
All branches
Author SHA1 Message Date
Oleg Pudeyev
ccdd176b72 [task/php54-ascraeus] Bring p_master#module_auth into PHP 5 era. 
Split module_auth into a static and a non-static version.

Call the static version statically and the non-static version non-statically.

PHPBB3-10615
 2012-03-16 04:56:41 -04:00
Oleg Pudeyev
5efdbfa5e4 [task/php54] Disable E_STRICT in Olympus when running on PHP 5.4. 
We cannot use static in Olympus because it must be PHP 4 compatible.

Therefore disable E_STRICT for Olympus.

This commit should be reverted for Ascraeus.

PHPBB3-10615
 2012-03-15 22:47:42 -04:00
Oleg Pudeyev
71afba0ded [task/php54] Refactor error_reporting call slightly. 
Separate error level assignment into a variable in this commit
so that the only difference between Olympus and Ascraeus
is the addition of logic altering $level.

PHPBB3-10615
 2012-03-15 22:46:06 -04:00
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
Joas Schilling
33dce916e2 [ticket/10690] Fix undefined UNAPPROVED_POSTS_ZERO_TOTAL in queue 
PHPBB3-10690
 2012-03-14 22:22:22 +01: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
Joas Schilling
3b7a6a3efa [ticket/10689] Fix "First character"-option in "Find a member"-search 
PHPBB3-10689
 2012-03-12 00:39:12 +01:00
rxu
ff8d523768 [ticket/10684] Rename function phpbb_get_banned_users_ids() parameter 
PHPBB3-10684
 2012-03-12 01:57:51 +08:00
rxu
da395edbca [ticket/10684] Remove intval mapping for array keys 
PHP manual for arrays http://php.net/manual/en/language.types.array.php states
that the following key cast will occur: Strings containing valid integers will
be cast to the integer type. E.g. the key "8" will actually be stored under 8.
Thus, no intval mapping for numeric array keys is needed.

PHPBB3-10684
 2012-03-12 01:47:28 +08:00
rxu
321d0d9b56 [ticket/10684] Adjust pm_notifications() to handle stale bans 
- Add parameter (array) to the function phpbb_get_banned_users_ids()
- Fix function pm_notification() to handle users with stale bans

PHPBB3-10684
 2012-03-12 01:44:00 +08: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
Igor Wiedler
ae984025f0 Merge branch 'develop' into feature/event-dispatcher 
* develop: (95 commits)
  [ticket/9084] Explain the logic.
  [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.
  [feature/append_var] Adding test case
  [ticket/7432] Delete redundant reference to "appropriate menu item".
  [ticket/10618] Change phpBB 3 to phpBB 3.1.
  [ticket/10685] Refactor template test defaults for php 5.4 compatibility.
  [feature/append_var] Adding append_var template class function
  [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.
  [ticket/8652] Comment for also updating forum watch table in user_notification.
  [ticket/8652] Sending 2 emails on 2 replies
  [ticket/10680] Add /phpBB/ext/* to .gitignore
  [ticket/10672] Fix total post count language string in statistics and feed
  [ticket/9220] Remove margin on table.table1 so it's centered in the blue box.
  [ticket/10453] Fixing spacing
  ...

Conflicts:
	tests/bootstrap.php
 2012-03-11 15:18:33 +01:00
Igor Wiedler
e02d92ac62 [feature/event-dispatcher] Use real EventDispatcher through composer 
* replace the copy-pasta EventDispatcher with the real one from Symfony2
* use composer for managing this dependency, use composer autoloading

PHPBB3-9550
 2012-03-11 15:15:33 +01:00
Igor Wiedler
5dd5df46a4 [feature/event-dispatcher] Remove copied EventDispatcher code 
PHPBB3-9550
 2012-03-11 14:55:30 +01:00
Michael Cullum
24f1896b3c [ticket/10697] Updating gitignore to match develop branch 
PHPBB3-10697
 2012-03-11 09:42:56 +00:00
rxu
a79b3490c2 [ticket/10684] Cast user_id to integer 
PHPBB3-10684
 2012-03-11 00:56:07 +08:00
Michael Cullum
668c61686b [ticket/10694] Adjusting details link to 5.3 announcement 
PHPBB3-10694
 2012-03-10 16:47:07 +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
rxu
89a6cb2886 [ticket/10684] Refactor $sql_ignore_users array update 
PHPBB3-10684
 2012-03-10 00:17:39 +08:00
Michael Cullum
fbe8086697 [ticket/10694] Update PHP warning to 5.3.2 
PHPBB3-10694
 2012-03-09 16:10:02 +00:00
rxu
f563647e4b [ticket/10684] Remove isset() for $sql_ignore_users update 
PHPBB3-10684
 2012-03-09 22:35:13 +08: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
rxu
ee6783109a [ticket/10684] Fix 2 typos in comment lines. 
PHPBB3-10684
 2012-03-09 16:41:49 +08:00
rxu
025de9ee19 [ticket/10684] Send notifications for users with stale bans 
PHPBB3-10684
 2012-03-08 23:28:03 +08:00