mirror/php-phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-02-26 04:52:36 +01:00
Code Issues Releases Wiki Activity
22,583 Commits 17 Branches 190 Tags
Commit Graph

8918 Commits

Author SHA1 Message Date
Dhruv
a99725d27c Merge branch 'develop-ascraeus' into develop 
# By Oliver Schramm
# Via Dhruv (1) and Oliver Schramm (1)
* develop-ascraeus:
  [ticket/12674] Use user's colour in 'Last edited' line in sent PMs
 2014-07-01 00:36:45 +05:30
Oliver Schramm
6d1403cb13 [ticket/12674] Use user's colour in 'Last edited' line in sent PMs 
PHPBB3-12674
 2014-06-30 00:01:14 +02:00
Joas Schilling
7ad88ba32b Merge branch 'develop-ascraeus' into develop 
* develop-ascraeus:
  [ticket/12777] Add tests for unavailable extension
  [ticket/12777] Add tests
  [ticket/12777] Add is_purged()
  [ticket/12777] Update doc block of is_configured()
  [ticket/12777] Rename extension status functions and add is_configured()
 2014-06-29 23:41:28 +02:00
Joas Schilling
5652f33ccc Merge pull request #2669 from Nicofuma/ticket/12777 
[ticket/12777] Rename extension status functions and add is_configured()

* Nicofuma/ticket/12777:
  [ticket/12777] Add tests for unavailable extension
  [ticket/12777] Add tests
  [ticket/12777] Add is_purged()
  [ticket/12777] Update doc block of is_configured()
  [ticket/12777] Rename extension status functions and add is_configured()
 2014-06-29 23:33:47 +02:00
Tristan Darricau
d13e02c7b1 [ticket/12777] Rename extension status functions and add is_configured() 
PHPBB3-12777
 2014-06-27 10:49:13 +02:00
Andreas Fischer
eef50ae41b Merge branch 'develop-ascraeus' into develop 
* develop-ascraeus:
  [ticket/12196] Fix typo in "referrer"
 2014-06-26 23:46:40 +02:00
Joas Schilling
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
Andreas Fischer
dd835790c6 Merge branch 'develop-ascraeus' into develop 
* develop-ascraeus:
  [ticket/12196] Revert Fix typo "referer" in acp/attachments
 2014-06-26 23:33:47 +02:00
Andreas Fischer
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
Dhruv
a730c0291f [ticket/12196] Revert Fix typo "referer" in acp/attachments 
This reverts commit 9bc1f7924d5ef00fb988b81347d4c5c730b25eb2.
https://tracker.phpbb.com/browse/PHPBB3-12196

PHPBB3-12196
 2014-06-27 00:07:15 +05:30
Dhruv
cb6c0db51b Merge branch 'develop-ascraeus' into develop 
# By Joas Schilling
# Via Dhruv (2) and Joas Schilling (1)
* develop-ascraeus:
  [ticket/12196] Fix typo "referer" in acp/attachments
 2014-06-26 23:30:33 +05:30
Dhruv
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
Joas Schilling
9bc1f7924d [ticket/12196] Fix typo "referer" in acp/attachments 
PHPBB3-12196
 2014-06-25 23:17:02 +02:00
Joas Schilling
c0f041b69f Merge branch 'develop-ascraeus' into develop 
* develop-ascraeus:
  [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:38:58 +02:00
Joas Schilling
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
Joas Schilling
22a834e9e0 Merge branch 'develop-ascraeus' into develop 
* develop-ascraeus:
  [ticket/12760] Fix wording for unapproved posts icon...
 2014-06-25 14:16:58 +02:00
Joas Schilling
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
Matt Friedman
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
Joas Schilling
49af2177a9 Merge branch 'develop-ascraeus' into develop 
* develop-ascraeus:
  [prep-release-3.1.0-RC1] Update phpBB Version for RC2 development
  [prep-release-3.1.0-RC1] Add changelog for 3.1.0-RC1
  [prep-release-3.1.0-RC1] Prepare Changelog
  [prep-release-3.1.0-RC1] Add migration for 3.1.0-RC1
  [prep-release-3.1.0-RC1] Update version to 3.1.0-RC1
 2014-06-25 00:07:27 +02:00
Joas Schilling
19b4391eef [prep-release-3.1.0-RC1] Update phpBB Version for RC2 development 2014-06-25 00:06:08 +02:00
Joas Schilling
894dcaaaad [prep-release-3.1.0-RC1] Update version to 3.1.0-RC1 2014-06-24 23:21:43 +02:00
Andreas Fischer
f4c5e8f12d Merge branch 'develop-ascraeus' into develop 
* develop-ascraeus:
  [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
Andreas Fischer
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
Marc Alexander
8b3cc9a6c4 [ticket/12755] Apply de morgan to conditional 
PHPBB3-12755
 2014-06-24 19:53:52 +02:00
Marc Alexander
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
Marc Alexander
5ee1e07e17 [ticket/12755] Change upload in remote_upload() method to fit get_remote_file 
PHPBB3-12755
 2014-06-24 11:53:32 +02:00
Nils Adermann
10d963a94e Merge branch 'develop-ascraeus' into develop 
* develop-ascraeus:
  [ticket/12612] Prefix check_ids() with phpbb_
  [ticket/12612] Prefix mcp_sorting() with phpbb_
  [ticket/12612] Prefix get_*_data() with phpbb_ and delete unused global
  [ticket/12612] Prefix module url functions with phpbb_
  [ticket/12612] Prefix upload_popup() with phpbb_
  [ticket/12612] Prefix handle_post_delete() with phpbb and remove unused global
  [ticket/12612] Prefix custom UCP module function with phpbb_
  [ticket/12612] Prefix _sort_last_active() with phpbb_
  [ticket/12612] Prefix show_profile() with phpbb and delete unused global
 2014-06-24 01:24:45 -04:00
Joas Schilling
952b4de231 [ticket/12612] Prefix check_ids() with phpbb_ 
PHPBB3-12612
 2014-06-23 23:01:52 +02:00
Joas Schilling
4ac43856f7 [ticket/12612] Prefix mcp_sorting() with phpbb_ 
PHPBB3-12612
 2014-06-23 23:00:13 +02:00
Joas Schilling
c315fc6c89 [ticket/12612] Prefix get_*_data() with phpbb_ and delete unused global 
PHPBB3-12612
 2014-06-23 22:58:41 +02:00
Joas Schilling
bba23f61b3 [ticket/12612] Prefix module url functions with phpbb_ 
PHPBB3-12612
 2014-06-23 22:54:15 +02:00
Joas Schilling
e4437e19e8 [ticket/12612] Prefix upload_popup() with phpbb_ 
PHPBB3-12612
 2014-06-23 22:49:00 +02:00
Joas Schilling
5403b48788 [ticket/12612] Prefix handle_post_delete() with phpbb and remove unused global 
PHPBB3-12612
 2014-06-23 22:48:08 +02:00
Joas Schilling
0abc1f0f97 [ticket/12612] Prefix custom UCP module function with phpbb_ 
PHPBB3-12612
 2014-06-23 22:46:20 +02:00
Joas Schilling
b72fdd9acf [ticket/12612] Prefix _sort_last_active() with phpbb_ 
PHPBB3-12612
 2014-06-23 22:38:58 +02:00
Joas Schilling
7575c478c7 [ticket/12612] Prefix show_profile() with phpbb and delete unused global 
PHPBB3-12612
 2014-06-23 22:34:17 +02:00
Marc Alexander
8817b59377 [ticket/12755] Add language string for timed out remote upload 
PHPBB3-12755
 2014-06-23 20:35:36 +02:00
Joas Schilling
48bd10902b Merge branch 'develop-ascraeus' into develop 
* develop-ascraeus:
  [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:59 +02:00
Joas Schilling
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
Crizzo
453f2904c2 [ticket/12680] Solves last bugs. viewprofile: contact --> contact nickname 
PHPBB3-12680
 2014-06-23 19:38:44 +02:00
Dhruv
6be8c98296 Merge branch 'develop-ascraeus' into develop 
# By Crizzo
# Via Crizzo (1) and Dhruv Goel (1)
* develop-ascraeus:
  [ticket/12563] Adds « and » to the links in acp_styles.php
  [ticket/12563] Removes ending . from <a>
  [ticket/12563] Removes strintf in acp_styles.php and shorts up <a>
  [ticket/12563] Changes 2 language variables to better understandable names
 2014-06-23 22:07:15 +05:30
Dhruv Goel
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
Nils Adermann
9f91e8e9bd Merge branch 'develop-ascraeus' into develop 
* develop-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:39 -04:00
Nils Adermann
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
Andreas Fischer
b79aa2bf78 Merge branch 'develop-ascraeus' into develop 
* develop-ascraeus:
  [ticket/12761] Remove the execute bit from functions_user.php
 2014-06-23 16:17:14 +02:00
n-aleha
ec69a22899 [ticket/12761] Remove the execute bit from functions_user.php 
PHPBB3-12761
 2014-06-23 17:13:03 +03:00
Andreas Fischer
80e0851189 Merge branch 'develop-ascraeus' into develop 
* develop-ascraeus:
  [ticket/12747] Remove some methods which are not used anymore
  [ticket/12747] Drop support for Firebird
 2014-06-22 23:41:26 +02:00
Andreas Fischer
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
Joas Schilling
d18d3b30c7 Merge branch 'develop-ascraeus' into develop 
* develop-ascraeus:
  [ticket/12704] Improve the load time information in the footer when enabled
 2014-06-22 23:13:14 +02:00
Joas Schilling
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