1
0
mirror of https://github.com/phpbb/phpbb.git synced 2025-07-16 06:36:39 +02:00
Commit Graph

721 Commits

Author SHA1 Message Date
3b6d371310 Merge branch 'ticket/10945' into ticket/10945-develop
* ticket/10945:
  [ticket/10945] Fix return values for split_keywords function
  [ticket/10945] Display search query when search fails in native search
  [ticket/10945] remove trigger_error call

Conflicts:
	phpBB/phpbb/search/fulltext_native.php
2014-03-08 21:44:30 +05:30
07c07171f9 [ticket/12090] Make provider a service and inject it into the helper
PHPBB3-12090
2014-03-08 16:37:22 +01:00
275910d8b0 [ticket/12090] Fix pagination for routes
No clickable "jump to" at the moment, as we can not get the route url
by the route name in js yet. Need to find another solution later.

PHPBB3-12090
2014-03-08 16:02:44 +01:00
51273f6fb1 [ticket/12090] Pass route name to url() to allow admins to change the routes
PHPBB3-12090
2014-03-07 12:32:38 +01:00
600e5f6c11 [ticket/12251] Add string validation for a-zA-Z0-9 and underscore
PHPBB3-12251
2014-03-06 12:28:36 +01:00
50165fe920 [ticket/12251] Load profile fields by default on posts, pms and memberlist
PHPBB3-12251
2014-03-06 12:08:46 +01:00
98542547e2 [ticket/9871] Typehint and comment on var types
PHPBB3-9871
2014-03-05 19:18:54 -06:00
43074a1b69 [ticket/9871] Restore phpbb_version_compare
PHPBB3-9871
2014-03-05 19:09:47 -06:00
8748032866 [ticket/9871] Restore get_remote_file
PHPBB3-9871
2014-03-05 19:07:39 -06:00
4b6f3f8b0f Merge pull request #2088 from nickvergessen/ticket/12236
Ticket/12236 Convert AOL and Yahoo to custom profile fields
2014-03-05 18:44:39 -06:00
c1ca74ee6d Merge pull request #2058 from nickvergessen/ticket/12216
[ticket/12216] Undefined index: lang_options when creating date profile field
2014-03-05 18:36:15 -06:00
ad46fe62d8 Merge pull request #2075 from Elsensee/ticket/11693
[ticket/11693] Change sql_build_array to support DELETE
2014-03-05 18:31:36 -06:00
e88c61f85e [ticket/12249] Fix "Undefined variable: row" when editing profile
PHPBB3-12249
2014-03-05 22:32:03 +01:00
f2059f52f3 [ticket/12236] Move AOL Instant Messanger field to custom profile field
PHPBB3-12236
2014-03-05 22:13:22 +01:00
2e5106aae1 [ticket/12237] Convert yahoo messanger to custom profile field
PHPBB3-12237
2014-03-05 21:38:57 +01:00
0e35a85155 Merge remote-tracking branch 'github-nickvergessen/ticket/12235' into develop
* github-nickvergessen/ticket/12235:
  [ticket/12235] Convert WLM to custom profile field
  [ticket/12187] Do not make clickable when using as contact field
  [ticket/12187] Split generate_profile_fields_template() into 2 methods
  [ticket/12187] Remove user_website field
  [ticket/12187] Remove user_website functionality
  [ticket/12187] Convert website field data to custom profile field
  [ticket/12187] Add URL type for profile fields
  [ticket/12234] Replace ICQ with custom profile field
  [ticket/12233] Update schema file
  [ticket/12233] Add images back to subsilver2
  [ticket/12233] Allow profile fields to be contact fields

Conflicts:
	phpBB/adm/style/acp_prune_users.html
2014-03-05 11:49:11 +01:00
83a7e632b9 [ticket/12235] Convert WLM to custom profile field
PHPBB3-12235
2014-03-04 10:19:08 +01:00
03ef39c1f1 [ticket/12187] Do not make clickable when using as contact field
PHPBB3-12187
2014-03-04 09:10:57 +01:00
c650078904 [ticket/12187] Split generate_profile_fields_template() into 2 methods
Removing the mode switch that wraps the content of the method

PHPBB3-12187
2014-03-04 08:47:47 +01:00
a3627a9ff7 [ticket/12187] Remove user_website field
PHPBB3-12187
2014-03-04 08:25:36 +01:00
e750d71f84 [ticket/12187] Convert website field data to custom profile field
PHPBB3-12187
2014-03-03 12:38:55 +01:00
a2f2629e2a [ticket/12187] Add URL type for profile fields
PHPBB3-12187
2014-03-03 12:30:07 +01:00
a88366f4b6 [ticket/11693] Change sql_build_array to support DELETE
PHPBB3-11693
2014-03-02 20:51:00 +01:00
76409388af [ticket/12234] Replace ICQ with custom profile field
PHPBB3-12234
2014-02-28 15:24:35 +01:00
a823205403 [ticket/12233] Allow profile fields to be contact fields
Contact fields are displayed with in the contact section of the user profile
and are displayed differently in the mini profile next to posts and private
messages

PHPBB3-12233
2014-02-28 14:38:03 +01:00
99db2d9199 [ticket/12232] Fix a similar excessive pattern in the method.
PHPBB3-12232
2014-02-27 22:28:43 -08:00
5c3fc4840c [ticket/12232] Remove excessive calls to sizeof() in assign_block_vars() method
The size of the template block array is calculated within a foreach loop
iterating through the array, which is unnecessary. It only needs to be done
once. In a block of 1000 rows, this results in
500,500 calls to sizeof() in this location. With this change, that's reduced to
1000.

PHPBB3-12232
2014-02-27 19:29:02 -08:00
de0b7ddce9 [ticket/12194] Ensure that field_show_novalue is present
The field was not created on boards that were 3.1-dev before 3.0.11 was relesed

PHPBB3-12194
2014-02-27 10:00:36 +01:00
ae98810ddc Merge remote-tracking branch 'nickvergessen/ticket/12205' into ticket/12205-develop
* nickvergessen/ticket/12205:
  [ticket/12205] Do not display 0 for empty integers when show_novalue is off

Conflicts:
	phpBB/includes/functions_profile_fields.php
2014-02-25 18:35:03 +01:00
3930978e64 [ticket/12216] Undefined index: lang_options when creating date profile field
PHPBB3-12216
2014-02-24 10:00:45 +01:00
rxu
dda775c418 [ticket/12224] Add template wrapper method to assign block arrays
Add one more wrapper template method for the function assign_block_vars() which
takes a 2-dimensional array as a parameter
and calls assign_block_vars() in a loop to assign the whole block loop at once.
This can make the core a little bit more expendable from the point of
developing extensions as it allows to pass the data to events before
it's being assigned to template.

PHPBB3-12224
2014-02-23 22:04:35 +08:00
2df2032b48 Merge pull request #2025 from marc1706/ticket/12183
[ticket/12183] Update user_newpasswd column in users table for passwords manager
2014-02-20 20:54:30 -06:00
6c8589775b [ticket/9871] Update version check file to use json format
PHPBB3-9871
2014-02-19 16:13:23 -06:00
eaf9a41ed8 Merge pull request #1994 from prototech/ticket/12158
[ticket/12158] The pagination start value should be 0 when there are no items.
2014-02-18 14:25:46 -06:00
7015fc8a00 Merge pull request #2002 from prototech/ticket/12153
[ticket/12153] Assign PAGE_NUMBER in pagination.generate_template_pagination()
2014-02-18 14:11:48 -06:00
c7efadc26d [ticket/12153] Remove duplicate assignment of $u_previous_page & $u_next_page.
PHPBB3-12153
2014-02-18 12:04:31 -08:00
7a21d99b9b Merge branch 'develop-olympus' into develop
* develop-olympus:
  [ticket/12210] dbtools::sql_create_table incorrectly throws error related to auto-increment length on non auto-increment fields
2014-02-18 19:34:08 +01:00
5fc29e0d2b Merge pull request #2008 from marc1706/ticket/12167
[ticket/12167] Allow users to change style via style parameter by default
2014-02-18 12:26:49 -06:00
d4affedaab [ticket/12192] Fix call to undefined method get_user_avatar().
PHPBB3-12192
2014-02-14 19:19:53 -08:00
75fa467b7b Merge remote-tracking branch 'bantu/ticket/12180' into develop
* bantu/ticket/12180:
  [ticket/12180] Add "Each file MUST end with exactly one newline character" rule
2014-02-12 22:12:30 +01:00
30fbaab8de [ticket/12184] Fix undefined variable tpl_fields in profile field manager
PHPBB3-12184
2014-02-11 19:17:24 +01:00
c864d06ac6 [ticket/12183] Add migration file for updating user_newpasswd column
PHPBB3-12183
2014-02-10 22:10:31 +01:00
5550f0fa87 [ticket/12169] Split mode==headline into it's own function
PHPBB3-12169
2014-02-10 19:04:10 +01:00
995019a992 [ticket/12169] Add new option to display profile fields on memberlist
PHPBB3-12169
2014-02-10 16:28:21 +01:00
3c46aeb005 [ticket/12169] Allow displaying profile fields on memberlist
We can not sort by profile field values atm. And also I'm not sure
whether this is possible at all.

PHPBB3-12169
2014-02-10 15:58:55 +01:00
1e86f71133 [ticket/12180] Add "Each file MUST end with exactly one newline character" rule
PHPBB3-12180
2014-02-10 15:01:50 +01:00
6bee91c429 [ticket/12169] Convert user_from to profile field location
Missing changes on memberlist view due to missing functionality

PHPBB3-12169
2014-02-10 14:38:43 +01:00
b088bf864b Merge remote-tracking branch 'Marc/ticket/12170' into develop
* Marc/ticket/12170:
  [ticket/12170] Test for 12170
  [ticket/12170] Assign schema keys in migration helper with data_depth 1
2014-02-10 14:23:09 +01:00
e8f8dcf0ea [ticket/12170] Assign schema keys in migration helper with data_depth 1
The migration helper currently drops any keys with schema changes that have
the data_depth 1. This change will correctly assign the keys to the steps
array without dropping the keys that might contain important info like the
actual table that should be created.

PHPBB3-12170
2014-02-07 21:13:50 +01:00
4663ea7c82 [ticket/12115] Remove space from line ending
PHPBB3-12115
2014-02-06 14:18:30 +01:00