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

8853 Commits

Author SHA1 Message Date
f776ac7d58 [ticket/12759] Cache lang_options for pm_viewmessage
PHPBB3-12759
2014-06-27 17:48:36 +05:30
7e769083bf [ticket/12196] Fix typo in "referrer"
Referer is a typo in the HTTP RFC and should not be used in the UI

PHPBB3-12196
2014-06-26 23:44:21 +02:00
ffa1f9baf5 Merge branch 'develop-olympus' into develop-ascraeus
* develop-olympus:
  [ticket/12196] Revert Fix typo "referer" in acp/attachments
2014-06-26 23:33:47 +02:00
a730c0291f [ticket/12196] Revert Fix typo "referer" in acp/attachments
This reverts commit 9bc1f7924d.
https://tracker.phpbb.com/browse/PHPBB3-12196

PHPBB3-12196
2014-06-27 00:07:15 +05:30
eb3e1b35d6 Merge branch 'develop-olympus' into develop-ascraeus
# By Joas Schilling
# Via Dhruv (1) and Joas Schilling (1)
* develop-olympus:
  [ticket/12196] Fix typo "referer" in acp/attachments
2014-06-26 23:30:06 +05:30
9bc1f7924d [ticket/12196] Fix typo "referer" in acp/attachments
PHPBB3-12196
2014-06-25 23:17:02 +02:00
8b00be6fce Merge pull request #2567 from Crizz0/ticket/12680
[Ticket/12680] - Adds alternative text to contact icon in viewtopic.php

* Crizz0/ticket/12680:
  [ticket/12680] Adds variable for guest user
  [ticket/12680] Brings back get_username_string()
  [ticket/12680] Solves last bugs. viewprofile: contact --> contact nickname
  [ticket/12680] Still some problems with displaying the nickname in ucp
  [ticket/12680] Little changes, but some issues are still there
  [ticket/12680] Removes unnessesary $user->lang from CONTACT_USER
  [ticket/12680] Adds alternativ text with new variable to contact:
  [ticket/12680] Adds second alternativ text and font-size: 0 to remove text
  [ticket/12680] Adds alternative text to contact icon in viewtopic.php
2014-06-25 19:36:18 +02:00
5265091c83 Merge pull request #2649 from VSEphpbb/ticket/12760
[ticket/12760] Fix wording for unapproved posts icon...

* VSEphpbb/ticket/12760:
  [ticket/12760] Fix wording for unapproved posts icon...
2014-06-25 14:16:53 +02:00
e42b316d87 [ticket/12760] Fix wording for unapproved posts icon...
in last post column of forum lists.
https://tracker.phpbb.com/browse/PHPBB3-12760

PHPBB3-12760
2014-06-24 20:47:51 -07:00
19b4391eef [prep-release-3.1.0-RC1] Update phpBB Version for RC2 development 2014-06-25 00:06:08 +02:00
894dcaaaad [prep-release-3.1.0-RC1] Update version to 3.1.0-RC1 2014-06-24 23:21:43 +02:00
b5b0175d59 Merge branch 'develop-olympus' into develop-ascraeus
* develop-olympus:
  [ticket/12755] Apply de morgan to conditional
  [ticket/12755] Terminate upload loop if upload reaches filesize
  [ticket/12755] Change upload in remote_upload() method to fit get_remote_file
  [ticket/12755] Add language string for timed out remote upload
  [ticket/12755] Add timeout to remote upload to prevent infinite loop
2014-06-24 20:59:11 +02:00
8b3cc9a6c4 [ticket/12755] Apply de morgan to conditional
PHPBB3-12755
2014-06-24 19:53:52 +02:00
309dbb4ef9 [ticket/12755] Terminate upload loop if upload reaches filesize
Terminate the upload loop if the expected filesize has been reached instead
of trying to read more bytes until the timeout has been reached.

PHPBB3-12755
2014-06-24 19:07:49 +02:00
5ee1e07e17 [ticket/12755] Change upload in remote_upload() method to fit get_remote_file
PHPBB3-12755
2014-06-24 11:53:32 +02:00
952b4de231 [ticket/12612] Prefix check_ids() with phpbb_
PHPBB3-12612
2014-06-23 23:01:52 +02:00
4ac43856f7 [ticket/12612] Prefix mcp_sorting() with phpbb_
PHPBB3-12612
2014-06-23 23:00:13 +02:00
c315fc6c89 [ticket/12612] Prefix get_*_data() with phpbb_ and delete unused global
PHPBB3-12612
2014-06-23 22:58:41 +02:00
bba23f61b3 [ticket/12612] Prefix module url functions with phpbb_
PHPBB3-12612
2014-06-23 22:54:15 +02:00
e4437e19e8 [ticket/12612] Prefix upload_popup() with phpbb_
PHPBB3-12612
2014-06-23 22:49:00 +02:00
5403b48788 [ticket/12612] Prefix handle_post_delete() with phpbb and remove unused global
PHPBB3-12612
2014-06-23 22:48:08 +02:00
0abc1f0f97 [ticket/12612] Prefix custom UCP module function with phpbb_
PHPBB3-12612
2014-06-23 22:46:20 +02:00
b72fdd9acf [ticket/12612] Prefix _sort_last_active() with phpbb_
PHPBB3-12612
2014-06-23 22:38:58 +02:00
7575c478c7 [ticket/12612] Prefix show_profile() with phpbb and delete unused global
PHPBB3-12612
2014-06-23 22:34:17 +02:00
8817b59377 [ticket/12755] Add language string for timed out remote upload
PHPBB3-12755
2014-06-23 20:35:36 +02:00
c740772d93 Merge pull request #2574 from lucifer4o/ticket/12690
[ticket/12690] Add core.submit_pm_after event

* lucifer4o/ticket/12690:
  [ticket/12690] Find a space
  [ticket/12690] Remove $msg_id and chmod
  [ticket/12690] Add other info to core.submit_pm_after
  [ticket/12690] Add core.submit_pm_after event
2014-06-23 19:46:50 +02:00
453f2904c2 [ticket/12680] Solves last bugs. viewprofile: contact --> contact nickname
PHPBB3-12680
2014-06-23 19:38:44 +02:00
dfbe072d51 Merge pull request #2571 from Crizz0/ticket/12563
[ticket/12563] Changes 2 style specific language variables for better understanding
2014-06-23 22:04:20 +05:30
1f9e1fd177 Merge remote-tracking branch 'github-nickvergessen/ticket/12612-ascraeus' into develop-ascraeus
* github-nickvergessen/ticket/12612-ascraeus:
  [ticket/12612] Move functions from mcp.php to functions_mcp.php
  [ticket/12612] Move function from ucp.php to functions_user.php
  [ticket/12612] Move functions from memberlist.php to functions_display.php
  [ticket/12612] Move functions from posting.php to functions_posting.php
2014-06-23 11:19:15 -04:00
ec69a22899 [ticket/12761] Remove the execute bit from functions_user.php
PHPBB3-12761
2014-06-23 17:13:03 +03:00
4f2acbaed2 Merge pull request #2629 from nickvergessen/ticket/12747
[ticket/12747] Drop support for Firebird

* nickvergessen/ticket/12747:
  [ticket/12747] Remove some methods which are not used anymore
  [ticket/12747] Drop support for Firebird

Conflicts:
	phpBB/phpbb/db/driver/firebird.php
2014-06-22 23:41:14 +02:00
de04304e94 Merge pull request #2591 from rxu/ticket/12704
[ticket/12704] Improve the load time information in the footer when enabled

* rxu/ticket/12704:
  [ticket/12704] Improve the load time information in the footer when enabled
2014-06-22 23:09:21 +02:00
bb8be29fd5 Merge pull request #2575 from lucifer4o/ticket/12691
[ticket/12691] Add core.delete_pm to funtion delete_pm

* lucifer4o/ticket/12691:
  [ticket/12691] Comment change
  [ticket/12691] Change event to core.delete_pm_before
  [ticket/12691] Add core.delete_pm to funtion delete_pm
2014-06-22 22:59:37 +02:00
1e97502d90 Merge pull request #2586 from lucifer4o/ticket/12701
[Ticket/12701] Add events to user_add function

* lucifer4o/ticket/12701:
  [ticket/12701] Add change
  [ticket/12701] Rmove before event and expand modify_data
  [ticket/12701] Add events to user_add function
2014-06-22 22:57:40 +02:00
2ee8b738e5 [ticket/12690] Find a space
Lost a spce there ... found it ...

PHPBB3-12690
2014-06-22 23:22:15 +03:00
c4e48ed0b9 [ticket/12563] Adds « and » to the links in acp_styles.php
PHPBB3-12563
2014-06-22 22:02:46 +02:00
152d5fc263 [ticket/12701] Add change
Change back to since
Add change

PHPBB3-12701
2014-06-22 22:07:04 +03:00
165c5f8f15 [ticket/12701] Rmove before event and expand modify_data
Removing core.user_add_before
Adding $user_row and $cp_data to core.user_add_modify_data

PHPBB3-12701
2014-06-22 22:07:04 +03:00
dd075e4bbc [ticket/12701] Add events to user_add function
Add two new events to user_add function
in ./includes/functions_user.php.

core.user_add_before - allow modification of
submitted to function data.
Returns:
@var array $user_row - user_row array - User array
@var array $cp_data - cp_data array - CPF array

core.user_add_after - return user_id, user_row and
cp_data after user registration
Returns:
@var int $user_id - user_id of the new user
@var array $user_row - user_row array - User array
@var array $cp_data - cp_data array - CPF array

Justification:
Allow extensions to parse data before and after
creation of the user.

PHPBB3-12701
2014-06-22 22:07:04 +03:00
992fb8e452 [ticket/12691] Comment change
Change a bit the core event comment

PHPBB3-12691
2014-06-22 22:03:01 +03:00
e8dd7904e9 [ticket/12691] Change event to core.delete_pm_before
Just a requested change by nickvergessen

PHPBB3-12691
2014-06-22 22:03:00 +03:00
cd31aea4be [ticket/12691] Add core.delete_pm to funtion delete_pm
Add core.delete_pm to funtion delete_pm.
Event will return:
int $user_id - ID of the user requested the message delete
array $msg_ids - array of all messages to be deleted
int $folder_id - ID of the user folder where the messages are stored
Justification:
Allow extensions to capture this event
and act as intended by ext author

PHPBB3-12691
2014-06-22 22:03:00 +03:00
85b37a5f4d [ticket/12690] Remove $msg_id and chmod
Remove inneded $msg_id
Chmod file to 644

PHPBB3-12690
2014-06-22 21:54:51 +03:00
9c6f74daff [ticket/12690] Add other info to core.submit_pm_after
Added $mode
Added $subject
Added $data
Added $pm_data

PHPBB3-12690
2014-06-22 21:54:51 +03:00
e05df3bf3d [ticket/12690] Add core.submit_pm_after event
Add core.submit_pm_after to funtion submit_pm.
Event will return just submited msg_id. It should be plased
just before return $data['msg_id'];

Justification:
Using only core.submit_pm_before does not allow to
follow up after message submission.
The message ID is recieved at DB submission.
Some times we need the MSG_ID as identifier

PHPBB3-12690
2014-06-22 21:54:51 +03:00
80ac276971 Merge pull request #2530 from PayBas/ticket/12646
[ticket/12646] Add data-# attribute to breadcrumb links

* PayBas/ticket/12646:
  [ticket/12646] Changed to navlinks.MICRODATA
  [ticket/12646] Add check for navlinks.FORUM_ID
  [ticket/12646] Changed index/home data attr & updated subsilver
  [ticket/12646] Add data-f attribute to breadcrumb links
2014-06-22 20:50:23 +02:00
32a2c95f90 [ticket/12723] Add Sniff ensuring PHP files use the correct file header
PHPBB3-12723
2014-06-22 00:45:34 +02:00
0499655ba4 [ticket/12755] Add timeout to remote upload to prevent infinite loop
PHPBB3-12755
2014-06-21 11:55:54 +02:00
rxu
f850d5fa90 [ticket/12704] Improve the load time information in the footer when enabled
PR #2570 has added new constant to display load time information without
debug mode is being on (https://tracker.phpbb.com/browse/PHPBB3-12687).
This patch expands the total load time info with SQL/PHP load times,
while hiding the additional info with <abbr> element.

PHPBB3-12704
2014-06-20 20:57:32 +08:00
04164affe6 [ticket/12747] Drop support for Firebird
PHPBB3-12747
2014-06-20 12:35:42 +02:00