1
0
mirror of https://github.com/phpbb/phpbb.git synced 2025-02-25 20:44:01 +01:00

19892 Commits

Author SHA1 Message Date
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
Nathan Guse
7880a87c5e Merge pull request #2094 from dhruvgoel92/ticket/11938
[ticket/11938] remove deprecated sql_attr_str2ordinal and use sql_attr_string
2014-03-08 19:17:46 -06:00
Dhruv
8290dd6b1c [ticket/11938] Fix whitespace characters
PHPBB3-11938
2014-03-09 01:17:36 +05:30
Dhruv
1207767bb3 [ticket/11938] use sql_attr_string instead of sql_attr_str2ordinal
PHPBB3-11938
2014-03-09 01:16:13 +05:30
Andreas Fischer
4fb19c8541 Merge pull request #2093 from nickvergessen/ticket/11764
[ticket/11764] Create separate packages for subsilver2 on releases.

* nickvergessen/ticket/11764:
  [ticket/11764] Create separate packages for subsilver2 on releases.
2014-03-08 18:48:40 +01:00
Joas Schilling
40e76c090e [ticket/11764] Create separate packages for subsilver2 on releases.
PHPBB3-11764
2014-03-08 17:37:29 +01:00
Dhruv
9100f4ebbf Merge remote-tracking branch 'VarunAgw/ticket/12250' into develop
# By Varun Agrawal
# Via Varun Agrawal
* VarunAgw/ticket/12250:
  [ticket/12250] Remove deprecated phpbb_clean_path function
  [ticket/12250] Remove deprecated phpbb_clean_path function
2014-03-08 18:14:05 +05:30
Andreas Fischer
19d0c2abd5 Merge remote-tracking branch 'VSEphpbb/ticket/12248' into develop
* VSEphpbb/ticket/12248:
  [ticket/12248] Restore id attributes to extension details (used by tests)
2014-03-06 23:50:07 +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
Matt Friedman
aae22d699e [ticket/12248] Restore id attributes to extension details (used by tests)
PHPBB3-12248
2014-03-06 12:02:27 -08:00
Varun Agrawal
1cf8554d0e [ticket/12250] Remove deprecated phpbb_clean_path function
The function phpbb_clean_path() in functions.php is deprecated as is not
used used 3.0/3.1 core

PHPBB3-12250
2014-03-06 23:51:49 +05:30
Nathan Guse
c40b15ae19 Merge pull request #2087 from marc1706/ticket/12239
[ticket/12239] Move deprecated passwords functions to compatibility file
2014-03-06 07:00:30 -06:00
Marc Alexander
6251ca1459 [ticket/12239] Move deprecated passwords functions to compatibility file
The deprecated passwords functions are no longer used in the core and have
been replaced with the passwords manager. Therefore, the functions are
moved to the functions_compatibility file.

PHPBB3-12239
2014-03-06 09:43:52 +01:00
Nathan Guse
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
Joas Schilling
d380cdec02 [ticket/12236] Fix language key name for Yahoo Messanger
PHPBB3-12236
2014-03-06 01:41:38 +01:00
Nathan Guse
40c582688b Merge pull request #2054 from rxu/ticket/12213-1
[ticket/12213] Add MCP events for custom quick moderation options
2014-03-05 18:37:26 -06:00
Nathan Guse
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
Nathan Guse
9d25485b32 Merge pull request #2061 from rxu/ticket/12231
[ticket/12231] Add template events to forumlist_body.html
2014-03-05 18:33:27 -06:00
Nathan Guse
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
Nathan Guse
9b1b57c649 Merge pull request #2080 from nickvergessen/ticket/12243
[Ticket/12243] subsilver2 is missing profile field files
2014-03-05 18:29:07 -06:00
Nathan Guse
3ece3223e4 Merge pull request #2086 from VSEphpbb/ticket/12248
[ticket/12248] Make extension details homepage a clickable link
2014-03-05 18:27:29 -06:00
Matt Friedman
898976f8a1 [ticket/12248] Remove unused label for attributes and related id tags
PHPBB3-12248
2014-03-05 15:05:40 -08:00
Matt Friedman
2e49efc12d [ticket/12248] Use id instead of name attribute in a tags
PHPBB3-12248
2014-03-05 14:54:04 -08:00
Matt Friedman
4e770c2b42 [ticket/12248] Fix meta_author tags (IDs must be unique)
PHPBB3-12248
2014-03-05 14:53:31 -08:00
Matt Friedman
d0b07503ad [ticket/12248] Remove p tag in favor of strong tag
PHPBB3-12248
2014-03-05 14:45:45 -08:00
Joas Schilling
240eeec71d [ticket/12236] Change order of profile fields for new installs
PHPBB3-12236
2014-03-05 22:40:54 +01:00
Joas Schilling
e88c61f85e [ticket/12249] Fix "Undefined variable: row" when editing profile
PHPBB3-12249
2014-03-05 22:32:03 +01:00
Joas Schilling
fed3e7c2de [ticket/12236] Fix layout of memberlist search
PHPBB3-12236
2014-03-05 22:28:22 +01:00
Joas Schilling
f2059f52f3 [ticket/12236] Move AOL Instant Messanger field to custom profile field
PHPBB3-12236
2014-03-05 22:13:22 +01:00
Joas Schilling
a1dab58f6d [ticket/12237] Regenerate db schema files
PHPBB3-12237
2014-03-05 21:47:11 +01:00
Joas Schilling
2e5106aae1 [ticket/12237] Convert yahoo messanger to custom profile field
PHPBB3-12237
2014-03-05 21:38:57 +01:00
Nils Adermann
71354ef185 [develop] Fix incorrect merge conflict resolution from PR #2085
PHPBB3-12235
2014-03-05 11:51:38 +01:00
Nils Adermann
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
Nils Adermann
4e144005f0 Merge pull request #2057 from nickvergessen/ticket/12226
Ticket/12226 Split language strings to correctly allow multiple plural rules
2014-03-05 11:31:38 +01:00
Matt Friedman
03492e6211 [ticket/12248] Make extension details homepage a clickable link
http://tracker.phpbb.com/browse/PHPBB3-12248

PHPBB3-12248
2014-03-04 15:49:33 -08:00
Joas Schilling
83a7e632b9 [ticket/12235] Convert WLM to custom profile field
PHPBB3-12235
2014-03-04 10:19:08 +01:00
Joas Schilling
03ef39c1f1 [ticket/12187] Do not make clickable when using as contact field
PHPBB3-12187
2014-03-04 09:10:57 +01:00
Joas Schilling
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
Joas Schilling
a3627a9ff7 [ticket/12187] Remove user_website field
PHPBB3-12187
2014-03-04 08:25:36 +01:00
Andreas Fischer
9c11f4a3cf Merge pull request #2083 from hjpotter92/ticket/12245
[ticket/12245] Fix id attributes in acp_prune_users.html

* hjpotter92/ticket/12245:
  [ticket/12245] Fix id attributes in acp_prune_users.html
2014-03-03 23:43:06 +01:00
hjpotter92
c82f59b5ab [ticket/12245] Fix id attributes in acp_prune_users.html
The following labels had invalid id references:
1. joined (renamed to link to joined_after)
2. group_id (create teh id attribute on select box)

PHPBB3-12245
2014-03-04 03:41:45 +05:30
Joas Schilling
5b1fbfb2f2 [ticket/12187] Remove user_website functionality
PHPBB3-12187
2014-03-03 20:01:19 +01:00
Crizzo
19fbd1699a [ticket/12240] fontsize => size; fontcolor => color and added bbcode- in96
PHPBB3-12240
2014-03-03 18:34:53 +01:00
rxu
efe4393c91 [ticket/12231] Add template events to forumlist_body.html
Add events before/after category header, before/after subforums list
to allow add/modify content in respective places.

PHPBB3-12231
2014-03-03 20:51:06 +08:00
Joas Schilling
e750d71f84 [ticket/12187] Convert website field data to custom profile field
PHPBB3-12187
2014-03-03 12:38:55 +01:00
Joas Schilling
a2f2629e2a [ticket/12187] Add URL type for profile fields
PHPBB3-12187
2014-03-03 12:30:07 +01:00
Joas Schilling
3e52d780ba [ticket/12243] Remove outdated adm/style/custom_profile_fields.html
PHPBB3-12243
2014-03-03 12:16:22 +01:00
Joas Schilling
a506e21fa7 [ticket/12243] Split custom_profile_fields.html into 1 file for each type
PHPBB3-12243
2014-03-03 12:15:09 +01:00
Joas Schilling
b01a0fe7c5 Merge remote-tracking branch 'vsephpbb/ticket/11645' into develop
* vsephpbb/ticket/11645:
  [ticket/11645] Rename .MODs tab in ACP to Extensions
2014-03-02 23:56:29 +01:00
Cesar G
9dee0647bf Merge remote-tracking branch 'Crizz0/ticket/9255' into develop
* Crizz0/ticket/9255:
  [ticket/9255] Changed overflow-x to overflow-y
  [ticket/9255] Added max-height and overflow-x to cp-mini in cp.css
2014-03-02 14:24:07 -08:00