1
0
mirror of https://github.com/phpbb/phpbb.git synced 2025-05-30 19:24:13 +02:00

8429 Commits

Author SHA1 Message Date
Cesar G
7c1ab5f79d [ticket/11959] Remove use of plurals and make it possible to use Oxford comma.
PHPBB3-11959
2014-03-19 03:08:34 -07:00
Cesar G
3da1f6d989 [ticket/11959] Rename phpbb_gen_string_list() & fix incorrect var name.
PHPBB3-11959
2014-03-19 03:08:33 -07:00
Cesar G
f0a85a90cc [ticket/11959] Add function to create a string list.
PHPBB3-11959
2014-03-19 03:08:33 -07:00
Joas Schilling
1af7697143 Merge remote-tracking branch 'prototech/ticket/12160' into develop
* prototech/ticket/12160:
  [ticket/12160] Use phpbb_check_installation_exists() in the other modules.
  [ticket/12160] Move phpbb_check_installation_exists() to functions_install.php
  [ticket/12160] Check if phpBB is installed before creating phpBB container.
  [ticket/12160] Add function to check if phpBB is installed.
2014-03-18 11:00:43 +01:00
Joas Schilling
f9438bcbf7 Merge branch 'ticket/11239' of github.com:geetakshi/phpbb into develop
# By geetakshi
# Via geetakshi
* 'ticket/11239' of github.com:geetakshi/phpbb:
  [ticket/11239] Removing hard-coded, language specific possessive
  [ticket/11239] Including username before Overview title
2014-03-16 23:30:54 +01:00
geetakshi
4d191f254d [ticket/11239] Removing hard-coded, language specific possessive
PHPBB3-11239
2014-03-16 15:36:47 +05:30
geetakshi
7647b51d5d [ticket/11239] Including username before Overview title
Adding username to the page title to avoid confusion while managing
multiple users in ACP

PHPBB3-11239
2014-03-16 02:12:50 +05:30
Joas Schilling
9be5405e5b [prep-release-3.1.0-b1] Update build version to 3.1.0-b2-dev 2014-03-15 17:32:07 +01:00
Joas Schilling
407e0dbd8b [prep-release-3.1.0-b1] Update version to 3.1.0-b1 2014-03-15 15:37:21 +01:00
Maël Soucaze
e1278320a2 [ticket/12272] Fix hardcoded colons in subforums.
In subforums list, under the parent forum description, there are two
harcoded colons instead of {L_COLON}.

PHPBB3-12272
2014-03-15 14:25:11 +01:00
Joas Schilling
0aa23d203e Merge remote-tracking branch 'EXreaction/ticket/9871-2' into develop
* EXreaction/ticket/9871-2:
  [ticket/9871] Can set current version to use instead of the phpBB version
  [ticket/9871] Fix indentation on comment
  [ticket/9871] Fix test name
  [ticket/9871] Split fast and slow version tests
  [ticket/9871] Option to force the stability when checking for updates
  [ticket/9871] Allow setting the host/file to load for the version class
  [ticket/9871] Restore get_remote_file_test
  [ticket/9871] Fix tests
  [ticket/9871] Typehint and comment on var types
  [ticket/9871] Mark test as slow
  [ticket/9871] Restore phpbb_version_compare
  [ticket/9871] Restore get_remote_file
  [ticket/9871] Use $request->variable instead of request_var
  [ticket/9871] Update version check file to use json format
2014-03-14 14:04:30 +01:00
Joas Schilling
7b08a483fd Merge branch 'develop-olympus' into develop
* develop-olympus:
  [ticket/12202] Use an array in the data provider instead of exploding manually
  [ticket/12202] Can't call htmlspecialchars before checking for quotes
  [ticket/12202] Fix tests
  [ticket/12202] Test for parse_cfg_file
  [ticket/12202] Use copyright symbol in style.cfg files
  [ticket/12202] Apply htmlspecialchars to style.cfg data

Conflicts:
	phpBB/styles/prosilver/style.cfg
	phpBB/styles/subsilver2/style.cfg
2014-03-14 13:55:53 +01:00
Joas Schilling
943e4e35ee Merge remote-tracking branch 'exreaction/ticket/12202' into develop-olympus
* exreaction/ticket/12202:
  [ticket/12202] Use an array in the data provider instead of exploding manually
  [ticket/12202] Can't call htmlspecialchars before checking for quotes
  [ticket/12202] Fix tests
  [ticket/12202] Test for parse_cfg_file
  [ticket/12202] Use copyright symbol in style.cfg files
  [ticket/12202] Apply htmlspecialchars to style.cfg data
2014-03-14 13:53:55 +01:00
Dhruv Goel
287c2b95ee Merge pull request #2126 from nickvergessen/ticket/forumhulp/12241
[ticket/12241] Event to add and/or modify acp_board configurations
2014-03-14 18:00:14 +05:30
Nathan Guse
0c40cd5f13 [ticket/9871] Fix indentation on comment
PHPBB3-9871
2014-03-14 07:03:37 -05:00
Joas Schilling
56318fb5c4 [ticket/12241] Add @var for the arguments
PHPBB3-12241
2014-03-14 12:49:04 +01:00
Joas Schilling
7821cf0257 [ticket/12241] Update event name and version match our guidelines
PHPBB3-12241
2014-03-14 12:43:15 +01:00
Forumhulp.com
4b7a718f85 [ticket/12241] Add submit to event variables
PHPBB3-12241
2014-03-14 09:38:57 +01:00
Forumhulp.com
9d87b1a3c7 [ticket/12241] Move $phpbb_dispatcher to the top
PHPBB3-12241
2014-03-14 09:38:31 +01:00
Forumhulp.com
6db1a2bfad [ticket/12241] Event to add and/or modify acp_board configurations
PHPBB3-12241
2014-03-14 09:38:11 +01:00
Nathan Guse
36837e1975 Merge pull request #2109 from nickvergessen/ticket/11581
[ticket/11581] Hide categories on level 0 when they have no visible children
2014-03-13 19:31:22 -05:00
Joas Schilling
eb1dd47e39 [ticket/11581] Hide categories when they have no visible children
PHPBB3-11581
2014-03-13 11:25:45 +01:00
Andreas Fischer
4ecfc07e03 Merge pull request #2113 from nickvergessen/ticket/8041
[ticket/8041] Merge item name into "Return to" string for better translations

* nickvergessen/ticket/8041:
  [ticket/8041] Add space/tabs after => in array list
  [ticket/8041] Wrap forum name, topic title and pm folder name with quotes
  [ticket/8041] Merge item name into "Return to" string for better translations
2014-03-13 11:02:29 +01:00
Joas Schilling
db63d0fbf9 [ticket/8041] Add space/tabs after => in array list
PHPBB3-8041
2014-03-13 10:41:41 +01:00
Joas Schilling
dbebe30c9a Merge branch 'develop-olympus' into develop
* develop-olympus:
  [ticket/12176] Reword comment about config entries.
  [ticket/12176] Add newest_user_colour to config array to ensure it exists
  [ticket/12176] Display correct message when trying to delete founder.
  [ticket/12176] Add functional test for founder deletion message.

Conflicts:
	tests/test_framework/phpbb_functional_test_case.php
2014-03-13 10:27:19 +01:00
Joas Schilling
03eb23cbae Merge remote-tracking branch 'bantu/ticket/12176' into develop-olympus
* bantu/ticket/12176:
  [ticket/12176] Reword comment about config entries.
  [ticket/12176] Add newest_user_colour to config array to ensure it exists
  [ticket/12176] Display correct message when trying to delete founder.
  [ticket/12176] Add functional test for founder deletion message.
2014-03-13 10:16:41 +01:00
Nathan Guse
d69012ea6d Merge pull request #2104 from nickvergessen/ticket/12261
[ticket/12261] Remove web root path from login redirect url
2014-03-12 18:48:41 -05:00
Andreas Fischer
b809bea3d4 Merge branch 'develop-olympus' into develop
* develop-olympus:
  [ticket/10549] using correct variable in includes/functions_module.php too
  [ticket/10549] changed "right" to "incorrect"

Conflicts:
	phpBB/includes/functions_module.php
2014-03-12 16:28:47 +01:00
Joas Schilling
9419edd686 [ticket/8041] Merge item name into "Return to" string for better translations
PHPBB3-8041
2014-03-12 01:05:05 +01:00
Crizzo
d95d062a42 [ticket/10549] using correct variable in includes/functions_module.php too
PHPBB3-10549
2014-03-11 18:45:46 +01:00
Joas Schilling
ad6fda5776 Merge remote-tracking branch 'rxu3/ticket/12260' into develop
* rxu3/ticket/12260:
  [ticket/12260] Add core events to delete_posts() function.
2014-03-11 17:55:38 +01:00
rxu
e8b7f68406 [ticket/12260] Add core events to delete_posts() function.
Events for extensions to perform additional actions on posts deletion.

PHPBB3-12260
2014-03-11 23:31:11 +08:00
Joas Schilling
214f515e9c Merge remote-tracking branch 'dhruvgoel92/ticket/11288' into develop-olympus
* dhruvgoel92/ticket/11288:
  [ticket/11288] Handle +,- without preceeding whitespace characters
2014-03-11 09:46:31 +01:00
Nathan Guse
3181c44fc9 Merge branch 'develop-olympus' into develop
* develop-olympus:
  [ticket/10549] Adds language variables

Conflicts:
	phpBB/includes/functions_module.php
2014-03-10 21:44:04 -05:00
Nathan Guse
23ea833425 Merge pull request #2101 from nickvergessen/ticket/10763
[ticket/10763] Do not call non-static functions statically
2014-03-10 20:51:20 -05:00
Nathan Guse
f7020fb5d1 Merge pull request #2092 from nickvergessen/ticket/12090
[ticket/12090] Pass route name to url() instead of the url itself
2014-03-10 20:50:08 -05:00
Crizzo
ec4c9833ca [ticket/10549] Adds language variables
PHPBB3-10549
2014-03-10 18:35:23 +01:00
Joas Schilling
e8fdc1545a [ticket/12261] Add a functional test for redirect after using login_box()
PHPBB3-12261
2014-03-10 12:35:30 +01:00
Joas Schilling
b876c07377 [ticket/12261] Remove web root path from login redirect url
The redirect url must be relative to the ucp.php and not relative to the
current page.

PHPBB3-12261
2014-03-10 10:15:38 +01:00
Nathaniel Guse
f3d8dfd1e3 [ticket/12202] Can't call htmlspecialchars before checking for quotes
PHPBB3-12202
2014-03-09 17:17:33 -05:00
Joas Schilling
521c6c7d75 [ticket/10763] Do not call messenger::error() statically
PHPBB3-10763
2014-03-09 22:03:38 +01:00
Joas Schilling
37dace4967 [ticket/10763] Do not call non-static transfer() statically
PHPBB3-10763
2014-03-09 21:53:21 +01:00
Joas Schilling
38aef98a69 [ticket/10763] Fix static calls to non static methods in colour_manager
PHPBB3-10763
2014-03-09 21:42:59 +01:00
Nathan Guse
f2d3879da4 [ticket/12202] Apply htmlspecialchars to style.cfg data
PHPBB3-12202
2014-03-09 15:19:52 -05:00
Joas Schilling
2eb24d0ace [ticket/12090] Split finding routes and returning routes into 2 methods
PHPBB3-12090
2014-03-09 18:38:21 +01:00
Nathan Guse
c305bd25e4 Merge pull request #2074 from Crizz0/ticket/12240
Ticket/12240 - Adds specific class to BBCode-Buttons in Template incl. Custom-BBCode support
2014-03-08 19:20:22 -06:00
Dhruv
c51dcbe6a0 [ticket/10945] Fix return values for split_keywords function
The function now returns false if all the words are common words and true
otherwise.

PHPBB3-10945
2014-03-08 21:23:08 +05:30
Dhruv
b6eec5c142 [ticket/10945] Display search query when search fails in native search
If search fails and common words are present, split_keywords returns false
and search.php file prints appropriate message of common words.
If search fails and there are no common words, split_keywords returns true
and keyword_search returns false so that the search query is displayed in
search box.

PHPBB3-10945
2014-03-08 21:20:37 +05:30
Joas Schilling
07c07171f9 [ticket/12090] Make provider a service and inject it into the helper
PHPBB3-12090
2014-03-08 16:37:22 +01:00
Varun Agrawal
429c006440 [ticket/12250] Remove deprecated phpbb_clean_path function
The function phpbb_clean_path() in functions.php is deprecated and is
replaced by filesystem class. Therefore, this function is moved to the
functions_compatibility file.

PHPBB3-12250
2014-03-07 03:44:28 +05:30