1
0
mirror of https://github.com/phpbb/phpbb.git synced 2025-07-12 12:46:38 +02:00
Commit Graph

668 Commits

Author SHA1 Message Date
7256a2d944 [feature/avatars] Add phpbb prefix to new functions
Although get_user_avatar() is not new, the phpbb prefix was prepended. This
is due to the fact that it was entirely rewritten and is therefore more or
less a completely new function.

PHPBB3-10018
2013-01-04 15:10:43 +01:00
c9338b38b3 Merge branch 'develop' of github.com:marc1706/phpbb3 into feature/avatars 2012-12-24 14:34:10 +01:00
53c4a328a6 [ticket/11243] Show download all link on all pages of topic with attachments
PHPBB3-11243
2012-12-11 11:42:34 -05:00
2265811cd1 Merge branch 'feature/avatars' of https://github.com/igorw/phpbb3 into feature/avatars
Conflicts:
	phpBB/adm/style/acp_groups.html
	phpBB/adm/style/acp_users_avatar.html
	phpBB/includes/acp/acp_groups.php
	phpBB/includes/acp/acp_users.php
	phpBB/includes/functions_display.php
	phpBB/install/database_update.php
	phpBB/install/schemas/mssql_schema.sql
	phpBB/styles/prosilver/template/ucp_avatar_options.html
2012-11-12 14:57:28 +01:00
d0ce637251 Merge remote-tracking branch 'Fyorl/feature/attach-dl' into develop
* Fyorl/feature/attach-dl: (75 commits)
  [feature/attach-dl] Removed the use of some abbreviations
  [feature/attach-dl] Changed $files_added checks
  [feature/attach-dl] Renamed $post_id to $post_msg_id
  [feature/attach-dl] Fixed a comment
  [feature/attach-dl] Optimised an sql query
  [feature/attach-dl] Fixed the logic in an sql statement
  [feature/attch-dl] $forum_id cast to int
  [feature/attach-dl] Fixed $file_added to $files_added
  [feature/attach-dl] Moved definition of $archive_name
  [feature/attach-dl] Swapped the order of an if statement
  [feature/attach-dl] Cast variables to int
  [feature/attach-dl] Added $archive_path
  [feature/attach-dl] Used COMMA_SEPARATOR instead of actual comma
  [feature/attach-dl] Renamed $count to $files_added
  [feature/attach-dl] Removed sprintf() use
  [feature/attach-dl] Removed need for array_keys()
  [feature/attach-dl] Added multiple attachment downloads to PMs
  [feature/attach-dl] Removed reliance on current($row)
  [feature/attach-dl] Renamed to phpbb_download_handle_forum_auth
  [feature/attach-dl] Moved PM authentication handling into own function
  ...
2012-08-26 18:56:09 +02:00
e1a4aa3ea2 [feature/attach-dl] Removed the use of some abbreviations
PHPBB3-11042
2012-08-20 21:52:42 +01:00
310c906932 Merge remote-tracking branch 'nickvergessen/feature/php-events-4' into develop 2012-08-20 09:09:53 -04:00
64bc658c04 [feature/php-events] Fix doc of core.viewtopic_get_post_data
PHPBB3-9550
2012-08-20 09:54:12 +02:00
6ad805713d [feature/php-events] Fix doc of core.viewtopic_cache_guest_data
PHPBB3-9550
2012-08-20 09:52:35 +02:00
53aadd60a6 [feature/attach-dl] Renamed $post_id to $post_msg_id
PHPBB3-11042
2012-08-17 16:16:02 +01:00
773c513ac0 [feature/attach-dl] Moved include of compress class inside function
PHPBB3-11042
2012-08-07 16:59:57 +01:00
058bf77a39 [feature/attach-dl] Moved functions_compress include
PHPBB3-11042
2012-08-07 12:00:10 +01:00
c277c240f8 [feature/php-events] Fix doc and naming of core.viewtopic_modify_page_title
PHPBB3-9550
2012-08-06 17:05:22 +02:00
dcb4d3b926 [feature/php-events] Fix doc and naming of core.viewtopic_modify_post_row
PHPBB3-9550
2012-08-06 16:45:00 +02:00
eb80d280b1 [feature/php-events] Fix doc and naming of core.viewtopic_cache_user_data
PHPBB3-9550
2012-08-06 16:44:52 +02:00
ff12de97b7 [feature/php-events] Fix doc and naming of core.viewtopic_cache_guest_data
PHPBB3-9550
2012-08-06 16:44:40 +02:00
3f710b58a5 [feature/php-events] Fix doc and naming of core.viewtopic_get_post_data
PHPBB3-9550
2012-08-06 15:37:02 +02:00
18d7210a11 [feature/attach-dl] Prefixed gen_download_links with phpbb_
PHPBB3-11042
2012-08-04 13:58:50 +01:00
ee7d9614c0 [feature/attach-dl] Downloading all attachments fully implemented
Added a function to list all available archiving methods and integrated
it with the prosilver style.

Heavy modifications to download/file.php to support archiving and
downloading of multiple files at once.

PHPBB3-11042
2012-08-04 13:18:20 +01:00
5bffd9883d [feature/attach-dl] Added links to the templates
PHPBB3-11042
2012-08-02 20:47:09 +01:00
16736d4e4c [feature/php-events] Make naming of postrow consistent with others (post_row)
PHPBB3-9550
2012-08-01 10:18:53 +02:00
f01d742b56 [feature/php-events] Add additional vars and control to viewtopic_postrow event
PHPBB3-9550
2012-08-01 10:18:51 +02:00
3f1b4e83ae [feature/events] Removing the third trigger_event parameter
PHPBB3-9550
2012-08-01 10:18:44 +02:00
8af7d225ef [feature/events] Change to use the new method of adding events
PHPBB3-9550
2012-08-01 10:18:44 +02:00
713f8e4782 [feature/events] Adding ledge viewtopic_user_cache
Used by phpBB Gallery

PHPBB3-9550
2012-08-01 10:18:41 +02:00
2581b0e1e3 [feature/events] Adding ledge viewtopic_user_cache_guest
Used by phpBB Gallery

PHPBB3-9550
2012-08-01 10:18:40 +02:00
dcf97714a5 [feature/events] Adding ledge viewtopic_get_userdata
Used by phpBB Gallery

PHPBB3-9550
2012-08-01 10:18:40 +02:00
a47ac64e5f [feature/events] Adding ledge viewtopic_page_header
Used by phpBB Gallery

PHPBB3-9550
2012-08-01 10:18:40 +02:00
54caef8f90 [feature/events] Add core.viewtopic_postrow ledge
PHPBB3-9550
2012-08-01 10:18:38 +02:00
67665f5957 [ticket/10990] Use $user->lang['COMMA_SEPARATOR'] when appropriate
PHPBB3-10990
2012-07-22 14:32:03 -05:00
0e2a30a27b Merge branch 'develop' into feature/avatars
* develop: (201 commits)
  [feature/new-tz-handling] Don't use global user but make it a parameter
  [feature/new-tz-handling] Fix size of suggestion button in chrome
  [feature/new-tz-handling] Fall back to UTC, if the timezone is invalid
  [feature/new-tz-handling] Add previous selected value to validation if valid
  [feature/new-tz-handling] Display suggestion when a different value is selected
  [ticket/10998] Add border-radius to forum rules block - prosilver
  [feature/new-tz-handling] Remove additional marking of selected items
  [feature/new-tz-handling] Move update helper function to new class
  [feature/new-tz-handling] Fix unit test
  [feature/new-tz-handling] Delete old variable which is not used anymore
  [feature/new-tz-handling] Rename $user->tz back to $user->timezone
  [feature/pagination-as-list] New parameter for name of start var
  [feature/pagination-as-list] Updates for nils comments
  [feature/pagination-as-list] Rename and deprecate functions
  [feature/pagination-as-list] Various fixes and improvements
  [ticket/10968] Render pagination within the template
  [feature/new-tz-handling] Remove "timezone might be numeric"
  [feature/new-tz-handling] Add function to update the timezone
  [feature/new-tz-handling] Correctly update user and board timezones on update
  [ticket/10996] Use correct DBMS name in Travis config for PostgreSQL
  ...
2012-07-21 00:37:48 +02:00
737828f009 Merge pull request #843 from nickvergessen/feature/new-tz-handling
Feature/new tz handling
2012-07-19 08:46:25 -07:00
584d49459d [feature/pagination-as-list] New parameter for name of start var
Add a new parameter to hold the name of the start variable. This
fulfills ticket PHPBB3-8535.

PHPBB3-10968
2012-07-18 14:32:42 +01:00
27d8aef528 [feature/pagination-as-list] Updates for nils comments
Re-remove deprecated functions, change on_page to phpbb_on_page,
add null returns, remove globals and pass as params.

PHPBB3-10968
2012-07-18 14:32:18 +01:00
cf4d6e926d [feature/pagination-as-list] Rename and deprecate functions
Returned and marked deprecated topic_generate_pagination. Rename
new function in line with coding guidelines.

PHPBB3-10968
2012-07-18 14:31:50 +01:00
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
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
f4136eacdc Merge branch 'develop' of git://github.com/phpbb/phpbb3 into feature/new-tz-handling 2012-07-18 11:07:32 +02:00
d9fd0cce0a Merge PR #759 branch 'nickvergessen/ticket/10811' into develop
* nickvergessen/ticket/10811:
  [ticket/10811] Make toogle_subscribe more generic so it can toogle all links
  [ticket/10811] Make it easier for MODs/Extensions to define the alt-text
  [ticket/10811] Make subscribe/unsubscribe repeatable with AJAX
  [ticket/10811] Fix AJAX callback alt_text so it can be repeated.
2012-07-05 10:44:48 -04:00
f1056a9b2f [ticket/10811] Make toogle_subscribe more generic so it can toogle all links
PHPBB3-10811
2012-07-05 01:03:19 +02:00
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
8f027b68d6 Merge branch 'feature/new-tz-handling' of https://github.com/p/phpbb3 into feature/new-tz-handling
Conflicts:
	phpBB/includes/functions_profile_fields.php
	phpBB/includes/session.php
	phpBB/install/database_update.php
2012-06-04 18:09:35 +02:00
fc3a19567f [ticket/10811] Make it easier for MODs/Extensions to define the alt-text
PHPBB3-10811
2012-05-16 13:44:40 +02:00
b83fa0349a [ticket/10847] fixing all misspelled "dependant" to "dependent"
PHPBB3-10847
2012-04-30 21:55:24 +02:00
f8a5a16d0b [ticket/10777] Split the comment into 2 lines
Split the comment into 2 lines each having
less than 79 characters.

PHPBB3-10777
2012-04-13 18:34:28 +05:30
779b16041c [ticket/10777] Corrected typo in comment
savely was corrected to safely

PHPBB3-10777
2012-04-10 21:27:09 +05:30
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
0e55b2393d [ticket/10270] Removed all the inline language and HTML from the JS.
PHPBB3-10270
2012-03-31 02:09:17 +02:00
8a28456f75 [ticket/10273] AJAXified approve / disapprove posts (in viewtopic).
This commit AJAXifies the moderator approval functionality, and adds it to
viewtopic instead of the MCP. This commit has involved some language changes,
which may affect fallbacks.

PHPBB3-10273
2012-03-31 02:00:22 +02:00
ddf1a05ad0 [ticket/10510] Added docs to viewtopic quick mod tools array.
PHPBB3-10510
2012-03-29 21:09:02 +01:00