Commit graph

22214 commits

Author SHA1 Message Date
Tristan Darricau
d13e02c7b1 [ticket/12777] Rename extension status functions and add is_configured()
PHPBB3-12777
2014-06-27 10:49:13 +02:00
Joas Schilling
59c0a31fc4 [ticket/12645] Replace support links in SUPPORT_BODY with 3.1 links
PHPBB3-12645
2014-06-27 10:18:36 +02:00
Andreas Fischer
cc4f1e401e Merge pull request #2665 from nickvergessen/ticket/12196-ascraeus
[ticket/12196] Fix typo in "referrer"

* nickvergessen/ticket/12196-ascraeus:
  [ticket/12196] Fix typo in "referrer"
2014-06-26 23:46:40 +02:00
Andreas Fischer
e8d7204580 Merge pull request #2661 from n-aleha/ticket/12773
[ticket/12773] Fix language variable name in cli extension enable command

* n-aleha/ticket/12773:
  [ticket/12773] Fix language variable name in cli extension enable command
2014-06-26 23:44:41 +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
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
Andreas Fischer
66efb1889d Merge pull request #2662 from dhruvgoel92/ticket/12196
[ticket/12196] Revert Fix typo "referer" in acp/attachments

* dhruvgoel92/ticket/12196:
  [ticket/12196] Revert Fix typo "referer" in acp/attachments
2014-06-26 23:33:46 +02:00
Dhruv
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
n-aleha
a54d74bf09 [ticket/12773] Fix language variable name in cli extension enable command
PHPBB3-12773
2014-06-26 21:05:32 +03:00
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
Stanislav Atanasov
deb393bff3 [ticket/12771] Shanging substr to strpos
Logical change ...

PHPBB3-12771
2014-06-26 20:56:00 +03:00
Dhruv
fbbf210747 Merge remote-tracking branch 'nickvergessen/ticket/12196' into develop-olympus
# By Joas Schilling
# Via Joas Schilling
* nickvergessen/ticket/12196:
  [ticket/12196] Fix typo "referer" in acp/attachments
2014-06-26 23:23:33 +05:30
Marc Alexander
9b27d00d5f Merge remote-tracking branch 'nickvergessen/ticket/12099' into develop-ascraeus
* nickvergessen/ticket/12099:
  [ticket/12099] Fix correction in path_helper test
  [ticket/12099] Prepend ./ to path to fix assets
  [ticket/12099] Deduplicate path generation
  [ticket/12099] Fix clean_path() ".." stripping when previous directory was "."
  [ticket/12099] Break clean_path tests with a simple test
  [ticket/12099] Clean paths in tests
  [ticket/12099] Correctly fix go back to root before prepending the root path
  [ticket/12099] Clean some paths before using them
  [ticket/12099] Fix several issues in path_helper test
2014-06-26 15:07:05 +02:00
Marc Alexander
eb9321c3a1 [ticket/9801] Remove spaces before * in docblock
PHPBB3-9801
2014-06-26 14:37:38 +02:00
Marc Alexander
40a65abc3a [ticket/12764] Properly handle errors upon connecting to MySQLi database
As the db_connect_id gets set up by mysql_init(), the db_connect_id will be an
object with empty settings instead of just empty. Even if mysql_real_connect()
encounters an error upon connecting, the db_connect_id is still set. This
will result in trying to just access the database which obviously does
nothing.
By setting db_connect_id to an empty string, the script will not try to query
th database and properly handle any errors that occur upon connecting.

PHPBB3-12764
2014-06-26 14:33:08 +02:00
Stanislav Atanasov
c14db9ccd0 [ticket/12771] Change var name
Change var name

PHPBB3-12771
2014-06-26 14:19:49 +03:00
Shitiz Garg
570acb7ccc [ticket/12772] Remove config_text parameter from message.form.topic
Broke Email topic since the topic_form class doesn't require this to be passed

PHPBB3-12772
2014-06-26 16:44:40 +05:30
Stanislav Atanasov
5a76b36dfb [ticket/12771] Bug in profilefield_base_migration when used in ext
The base migration class should create lang entry for the new CPF
but it is supposed to strip it of phpbb_ prefix. As extensions
CPFs do not use phpbb_ prefix it will not create a lang entry.
This is as simple solution as it can be done.

PHPBB3-12771
2014-06-26 13:18:27 +03:00
Marc Alexander
69b9aa2859 Merge remote-tracking branch 'nickvergessen/ticket/12462' into develop-ascraeus 2014-06-25 23:23:18 +02:00
Joas Schilling
9bc1f7924d [ticket/12196] Fix typo "referer" in acp/attachments
PHPBB3-12196
2014-06-25 23:17:02 +02:00
Joas Schilling
29ec455a45 [ticket/12462] Do not use string "None" for different options
... it limits translations.

PHPBB3-12462
2014-06-25 22:14:33 +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
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
Joas Schilling
d083f29244 Merge pull request #2650 from PayBas/ticket/12766
[ticket/12766] Event exporter does not like RCx as version

* PayBas/ticket/12766:
  [ticket/12766] Event exporter does not like RCx as version
2014-06-25 14:06:39 +02:00
PayBas
1b0b4cd5e2 [ticket/12766] Event exporter does not like RCx as version
PHPBB3-12766
2014-06-25 13:35:57 +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
3e9d62b9b0 Merge branch 'prep-release-3.1.0-RC1' into develop-ascraeus
* prep-release-3.1.0-RC1:
  [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:18 +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
60cb10e62b [prep-release-3.1.0-RC1] Add changelog for 3.1.0-RC1 2014-06-24 23:21:58 +02:00
Joas Schilling
cf92032ebb [prep-release-3.1.0-RC1] Prepare Changelog 2014-06-24 23:21:54 +02:00
Joas Schilling
6a9baaab0b [prep-release-3.1.0-RC1] Add migration for 3.1.0-RC1 2014-06-24 23:21:48 +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
70a98e6f63 Merge pull request #2648 from dhruvgoel92/ticket/12562
Revert "[ticket/12562] Add max-width to proSilver"

* dhruvgoel92/ticket/12562:
  [ticket/12562] Revert "Add max-width to proSilver"
2014-06-24 21:10:44 +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
Andreas Fischer
2596dbc850 Merge pull request #2633 from marc1706/ticket/12755
[ticket/12755] Add timeout to remote upload to prevent infinite loop

* marc1706/ticket/12755:
  [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:10 +02:00
Dhruv
c563d96633 [ticket/12562] Revert "Add max-width to proSilver"
https://tracker.phpbb.com/browse/PHPBB3-12562

PHPBB3-12562
2014-06-25 00:28:50 +05:30
Marc Alexander
8b3cc9a6c4 [ticket/12755] Apply de morgan to conditional
PHPBB3-12755
2014-06-24 19:53:52 +02:00
Shitiz Garg
24eeab4883 [ticket/12334] Add get_profile_value_raw unit test for type_bool
PHPBB3-12334
2014-06-24 22:46:43 +05:30
Shitiz Garg
e406cc6fad [ticket/12334] Add get_profile_value_raw unit test for type_date
PHPBB3-12334
2014-06-24 22:46:43 +05:30
Shitiz Garg
15929201b8 [ticket/12334] Add get_profile_value_raw unit tests for type_dropdown
PHPBB3-12334
2014-06-24 22:46:43 +05:30
Shitiz Garg
ab6d36dd57 [ticket/12334] Add get_profile_value_raw unit test for type_string
PHPBB3-12334
2014-06-24 22:46:33 +05:30
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
277e9a7a85 [ticket/9801] Add viewonline_helper service to allow proper testing
The viewonline_helper service can and will be extended in the future which
will allow us to also test the viewonline page better.

PHPBB3-9801
2014-06-24 18:49:31 +02:00
Shitiz Garg
e9fbaac212 [ticket/12334] Add get_profile_value_raw unit test for type_url
PHPBB3-12334
2014-06-24 22:15:20 +05:30
Shitiz Garg
7a5afdeb4c [ticket/12334] Add get_profile_value_raw unit tests for type_int
PHPBB3-12334
2014-06-24 22:12:00 +05:30
PayBas
8cef0b6971 [ticket/12334] Removed tests
Will be implemented in #2459

PHPBB3-12334
2014-06-24 21:47:29 +05:30
PayBas
349fbabd2e [ticket/12334] Dropdowns cannot be tested this way
PHPBB3-12334
2014-06-24 21:47:29 +05:30
PayBas
ac97497d95 [ticket/12334] Added test get_profile_value_raw
PHPBB3-12334
2014-06-24 21:47:29 +05:30
PayBas
2b451a174b [ticket/12334] Changed from valueid to value_raw
PHPBB3-12334
2014-06-24 21:47:29 +05:30
PayBas
507eca319d [ticket/12334] Implemented get_profile_valueid method
PHPBB3-12334
2014-06-24 21:47:29 +05:30