1
0
mirror of https://github.com/phpbb/phpbb.git synced 2025-06-02 12:34:59 +02:00

1555 Commits

Author SHA1 Message Date
Drae
dc71c0629e [feature/pagination-as-list] Various fixes and improvements
Extracted common template code for prosilver as per subsilver2.
Various other fixups and oversight corrections, changed name
of the "new" template function and re-introduced existing
version. Altered on_page to compensate for removal of some
templating vars from pagination routine.

PHPBB3-10968
2012-07-18 14:31:21 +01:00
Drae
922147f05a [ticket/10968] Render pagination within the template
Since phpBB 2 pagination has been rendered mostly within the source. This
limits just what designers can do with pagination. The current form is also
questionable in terms of "best practice". The aim is to move rendering
completely to the template via the use of a block element. Enabling S_
template vars also allows for control over specific aspects of the
pagination output such as next, previous, active and ellipsis.

Related to this - merging the capabilities of the topic_generate_pagination
with generate_pagination removes an element of duplication.

PHPBB3-10968
2012-07-18 14:30:20 +01:00
Joas Schilling
515e1662a9 [feature/new-tz-handling] Remove "timezone might be numeric"
As we updated all of the used values, there really shouldn't be one anymore.

PHPBB3-9558
2012-07-18 15:01:29 +02:00
Joas Schilling
f4136eacdc Merge branch 'develop' of git://github.com/phpbb/phpbb3 into feature/new-tz-handling 2012-07-18 11:07:32 +02:00
Joas Schilling
3637cd395e [feature/new-tz-handling] Properly name new timezone selection function
Marked the old one as deprecated and made it using the new function.

PHPBB3-9558
2012-07-17 16:09:05 +02:00
Nathan
97350944e3 [ticket/7598] Use $user->lang['COMMA_SEPARATOR']
PHPBB3-7598
2012-07-14 17:40:37 -05:00
Nathan
f3e6547acf [ticket/7598] Inactive users action notification (ACP)
When performing an action on users in the ACP Inactive Users, such as activating, deleting, or reminding, trigger_error is now called to give a notification that the action was performed

PHPBB3-7598
2012-07-13 22:18:28 -05:00
Dhruv Goel
0e9174d168 [feature/sphinx-fulltext-search] use keywords_search instead of get_name
using keyword_search method instead of get_name to distinguish between the
search backend classes present in includes/search and other helper classes.

PHPBB3-10946
2012-07-12 17:32:03 +05:30
Igor Wiedler
1b3cb68c2f Merge remote-tracking branch 'upstream/develop' into feature/avatars
* upstream/develop: (255 commits)
  [ticket/10935] Limit number of PM rules per user to 5000
  [ticket/10801] Fixed quickmod tools.
  [ticket/9551] uncomment line and change length to 255
  [ticket/10925] Clarify installation requirements for SQLite
  [ticket/10938] Serve subforum listing on forumlist from template loop
  [ticket/10640] Change subject length in mcp in subsilver
  [ticket/10640] Change subject length in MCP
  [ticket/10640] Do not change default value of truncate_string()
  [ticket/10640] Change maximum subject length
  [ticket/10936] remove PCRE and mbstring support check
  [ticket/10936] fix language key
  [ticket/10829] Delete T_STYLESHEET_NAME - no longer used.
  [ticket/10829] $style_name -> $style_path in style class.
  [ticket/10743] Renaming user->theme
  [ticket/10743] Changing obtain_cfg_items
  [ticket/10882] Fix test name - oops.
  [ticket/10931] Apply strtolower() correctly, i.e. not on false.
  [ticket/10931] Also test get_bytes() and get_string() with false.
  [ticket/10931] Make to_numeric function globally available.
  [ticket/10932] Use included composer.phar in build process
  ...

Conflicts:
	phpBB/includes/mcp/mcp_warn.php
	phpBB/install/database_update.php
	phpBB/styles/prosilver/template/ucp_avatar_options.html
2012-06-27 14:47:13 +02:00
Joas Schilling
217d9280dd [feature/new-tz-handling] Fix comment and validation in ACP board module
PHPBB3-9558
2012-06-19 19:21:59 +02:00
Joas Schilling
5f96e5d374 [feature/new-tz-handling] Fix timezone option when editing a user in the ACP
PHPBB3-9558
2012-06-18 15:09:45 +02:00
Joas Schilling
3c6272ff04 [feature/new-tz-handling] Remove appearances of board_dst and user_dst
PHPBB3-9558
2012-06-18 15:08:46 +02:00
Joas Schilling
f9bc825264 [feature/new-tz-handling] Fix timezone validation in ACP user section
PHPBB3-9558
2012-06-18 15:08:23 +02:00
Joas Schilling
09499fb128 [feature/new-tz-handling] Fix handling of timezone and dst in dateformat_select
PHPBB3-9558
2012-06-18 15:07:58 +02:00
Nils Adermann
b16f3834a3 Merge branch 'develop-olympus' into develop
By Andreas Fischer
via Andreas Fischer (1) and Nils Adermann (1)
* develop-olympus:
  [ticket/10550] Sort not installed styles list in the styles section of the ACP.

Conflicts:
	phpBB/includes/acp/acp_styles.php
2012-05-31 15:46:23 +02:00
Nils Adermann
7eaedcc8de Merge remote-tracking branch 'github-bantu/ticket/10550' into develop-olympus
By Andreas Fischer
via Andreas Fischer
* github-bantu/ticket/10550:
  [ticket/10550] Sort not installed styles list in the styles section of the ACP.
2012-05-31 15:43:09 +02:00
Nils Adermann
bafaf3700c Merge branch 'develop-olympus' into develop
By Andreas Fischer
via Andreas Fischer (1) and Nils Adermann (1)
* develop-olympus:
  [ticket/10611] Filter out not existing database tables when making a backup.
  [ticket/10611] Use phpbb_db_tools::sql_list_tables() instead of get_tables().
  [ticket/10611] Generate db_tools instance in acp_database module.
2012-05-31 15:34:58 +02:00
Andreas Fischer
9240ddbfa7 [ticket/10611] Filter out not existing database tables when making a backup.
Using $this->db_tools->sql_list_tables() as the first argument gives us table
names as array keys as a by-product which might be useful at some point.

PHPBB3-10611
2012-05-30 13:45:00 +02:00
Andreas Fischer
515c27270f [ticket/10611] Use phpbb_db_tools::sql_list_tables() instead of get_tables().
get_tables() was deprecated by phpbb_db_tools::sql_list_tables()

This prevents unnecessarily loading functions_install.php

PHPBB3-10611
2012-05-30 13:41:36 +02:00
Andreas Fischer
6036b948ff [ticket/10611] Generate db_tools instance in acp_database module.
PHPBB3-10611
2012-05-30 13:38:41 +02:00
Nils Adermann
8438b61cef Merge remote-tracking branch 'github-dhruv/ticket/10308' into develop
By Dhruv Goel
via Dhruv Goel
* github-dhruv/ticket/10308:
  [ticket/10308] fixes indentation
  [ticket/10308] fixes language variable name
  [ticket/10308] makes variable boolean
  [ticket/10308] fixes sql query, limit it to 1
  [ticket/10308] fixes user deletion if no posts
  [ticket/10308] renames language key to USER_NO_POSTS_DELETE
  [ticket/10308] fix language and user's total posts
  [ticket/10308] fixes language entity.
  [ticket/10308] Displays message to user if there are no posts.
  [ticket/10308] disable retain/ delete posts option when deleting a user
2012-05-29 16:40:00 +02:00
Andreas Fischer
701bf571df [ticket/10550] Sort not installed styles list in the styles section of the ACP.
PHPBB3-10550
2012-05-29 15:29:31 +02:00
Oleg Pudeyev
3b6ca178aa Merge PR #721 branch 'rahulr92/ticket/10650' into develop
* rahulr92/ticket/10650:
  [ticket/10650] Subject is cleared if no permissions exist
  [ticket/10650] Changed apostrophe to utf8 single quote
  [ticket/10650] Moving censoring to before truncation
  [ticket/10650] Added apostrophe in explanation in language file
  [ticket/10650] Inserted correct utf ELLIPSIS character
  [ticket/10650] Added space after if and comment
  [ticket/10650] Added ellipsis to language file
  [ticket/10650] Added href title to subject link
  [ticket/10650] Made use of truncate_string() function
  [ticket/10650] Removed changes from acp_forums.php
  [ticket/10650]Removed incorrect newline
  [ticket/10650] Changed acp option from per forum to global
  [ticket/10650] Added checking for empty subjects
  [ticket/10650] Corrected intendation
  [ticket/10650]Added permission checking and utf8 functions
  [ticket/10650] Cropped subject and inserted newline
  [ticket/10650] Corrected space before true
  [ticket/10650] Changed language files and forumlist
  [ticket/10650] Added static sql files
  [ticket/10650] Displaying last topic on forum list

Conflicts:
	phpBB/install/database_update.php
	phpBB/language/en/common.php
2012-05-21 23:42:48 -04:00
Dhruv Goel
23ea588880 [ticket/10308] makes variable boolean
makes user_row['user_has_posts'] boolean instead of 1 or 0.

PHPBB3-10308
2012-05-10 22:53:43 +05:30
Dhruv Goel
164054f067 [ticket/10308] fixes sql query, limit it to 1
instead of fetching all posts by user we limit the query to 1 to check if
a user has posts or not

PHPBB3-10308
2012-05-10 22:53:04 +05:30
Dhruv Goel
59177a86c4 [ticket/10308] fix language and user's total posts
language modified to be clear and select box disappears in case no
posts by user. user's total posts are fetched using a new query.

PHPBB3-10308
2012-05-10 22:50:13 +05:30
Andreas Fischer
52c7193ad0 Merge branch 'develop-olympus' into develop
* develop-olympus:
  [ticket/10846] fixing SQL query bug in acp_main.php
2012-05-01 13:38:25 +02:00
Senky
665f38d42f [ticket/10846] fixing SQL query bug in acp_main.php
PHPBB3-10846
2012-04-30 22:01:53 +02:00
Oleg Pudeyev
5b48df4168 [feature/prune-users] Move quote to the correct line.
PHPBB3-9622
2012-04-25 19:41:50 -04:00
Oleg Pudeyev
7d92cccf74 Merge PR #731 branch 'VSEphpbb/ticket/10779' into develop
* VSEphpbb/ticket/10779:
  [ticket/10779] Move jQuery CDN option to Load Settings
2012-04-25 17:52:24 -04:00
Oleg Pudeyev
0f36e15f86 [feature/prune-users] Split one line into two lines for readability.
PHPBB3-9622
2012-04-19 20:37:21 -04:00
Oleg Pudeyev
6151f46abe [feature/prune-users] Fix issues with queries pointed out by bantu.
PHPBB3-9622
2012-04-19 20:35:13 -04:00
Oleg Pudeyev
953e829b52 [feature/prune-users] Non-cosmetic changes per bantu's review.
PHPBB3-9622
2012-04-19 20:35:13 -04:00
Matt Friedman
4176ee1c95 [ticket/10779] Move jQuery CDN option to Load Settings
http://tracker.phpbb.com/browse/PHPBB3-10779

PHPBB3-10779
2012-04-10 15:19:26 -07:00
Igor Wiedler
b2b812f171 [feature/avatars] Do not assign in an if statement
PHPBB3-10018
2012-04-08 22:13:10 +02:00
Igor Wiedler
3b71e81cfb [feature/avatars] Simplify clean_row, move it to avatar manager
PHPBB3-10018
2012-04-08 21:29:52 +02:00
Igor Wiedler
81fb4268cd [feature/avatars] Introduce an avatar driver interface
PHPBB3-10018
2012-04-08 16:40:19 +02:00
Igor Wiedler
eea2ec5052 [feature/avatars] Introduce global phpbb_avatar_manager
PHPBB3-10018
2012-04-08 16:27:09 +02:00
Rahul R
b0f5db152f [ticket/10650] Removed changes from acp_forums.php
Removed unneccesary changes from acp_forums.php

PHPBB3-10650
2012-04-08 11:12:29 +05:30
Rahul R
c524236ef6 [ticket/10650] Changed acp option from per forum to global
Changed the display last subject acp toggle option from
per forum to global. Modified associated database entries.
New option is available in ACP General->Board Features.
Also corrected <br /> in forumlist_body.html.

PHPBB3-10650
2012-04-08 10:34:44 +05:30
Rahul
bc21dec9c0 [ticket/10650] Corrected space before true
Inserted a space before 'true' as per coding
guidelines.

PHPBB3-10650
2012-04-08 10:33:16 +05:30
Rahul
9b30bd6392 [ticket/10650] Displaying last topic on forum list
The most recent topic title of the forum can now
be displayed on the board index. An option is provided
in the ACP under the 'General Forum Setting' which
allows the admin to enable or disable this feature.

PHPBB3-10650
2012-04-08 10:32:19 +05:30
Igor Wiedler
e861bb0e04 [feature/avatars] Use request object in avatar drivers
PHPBB3-10018
2012-04-07 19:20:11 +02:00
Igor Wiedler
24daef1aaf Merge branch 'develop' into feature/avatars
* develop: (335 commits)
  [ticket/10575] Adding public visibility to the methods.
  [ticket/10575] Fixing non-static access to static functions get_instance
  [ticket/10547] User is not logged in as admin after installation
  [ticket/10650] Revert merge of 'rahulr92/ticket/10650' into develop
  [ticket/10650] Added checking for empty subjects
  [ticket/10650] Corrected intendation
  [ticket/10650]Added permission checking and utf8 functions
  [ticket/10650] Cropped subject and inserted newline
  [ticket/10650] Corrected space before true
  [ticket/10650] Changed language files and forumlist
  [ticket/10650] Added static sql files
  [ticket/10650] Displaying last topic on forum list
  [ticket/10760] Fix numbering in php fun facts.
  [ticket/10760] Value must be quoted as it might be two words.
  [ticket/10760] PHP is great. This commit is the proof.
  [ticket/10760] Catch both versions of parse error output in php.
  [ticket/10607] Added 'Powered by' translation string.
  [ticket/10760] Account for display_errors=stderr in pre-commit hook.
  [ticket/10760] Quote PHP_BIN when using it.
  [ticket/10760] Use echo -e only if echo understands -e.
  ...
2012-04-07 18:27:30 +02:00
Oleg Pudeyev
98964a913c [ticket/10650] Revert merge of 'rahulr92/ticket/10650' into develop
The pull request (#654) was merged a little too quickly.

In particular, display_last_subject per-forum option needs consensus.

This reverts commit b1fb34a4d7e446768b9f66ba6dd359173cd2a5fb, reversing
changes made to 7d6b289671c51694f17dd5f9849abf2534b55e59.

PHPBB3-10650
2012-04-04 19:23:05 -04:00
Rahul
1dd5b48434 [ticket/10650] Corrected space before true
Inserted a space before 'true' as per coding
guidelines.

PHPBB3-10650
2012-04-05 00:46:01 +05:30
Rahul
f32547c215 [ticket/10650] Displaying last topic on forum list
The most recent topic title of the forum can now
be displayed on the board index. An option is provided
in the ACP under the 'General Forum Setting' which
allows the admin to enable or disable this feature.

PHPBB3-10650
2012-04-05 00:45:26 +05:30
Vjacheslav Trushkin
bb62804407 [ticket/10762] Check for phpbb_version when installing style
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
2012-04-04 13:13:12 +03:00
Vjacheslav Trushkin
e27326a57b [ticket/10752] Fixes for acp_styles
Adding form token, changing functions to public/protected, fixing few more errors

PHPBB3-10752
2012-04-03 14:26:38 +03:00
Vjacheslav Trushkin
f739d7acce [ticket/10752] Changing private to protected variables in acp_styles
Changing private to protected variables in acp_styles

PHPBB3-10752
2012-04-03 01:14:14 +03:00