mirror/php-phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-06-06 06:25:04 +02:00
Code Issues Releases Wiki Activity
19,853 Commits 18 Branches 192 Tags
Commit Graph

17347 Commits

Author SHA1 Message Date
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
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
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
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
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
Crizzo
8db5db64c9 [ticket/12126] deleted left:0 and right:0 in responsive.css .phpbb_alert 
PHPBB3-12126
 2014-03-02 23:13:45 +01:00
Crizzo
50e4cac5de [ticket/12126] left:0 and right: 0; admin.css --> width: auto 
PHPBB3-12126
 2014-03-02 22:41:38 +01:00
Crizzo
2f31e79445 [ticket/9255] Changed overflow-x to overflow-y 
PHPBB3-9255
 2014-03-02 21:31:08 +01:00
Crizzo
8e3b13d5c5 [ticket/9255] Added max-height and overflow-x to cp-mini in cp.css 
PHPBB3-9255
 2014-03-02 20:59:59 +01:00
Matt Friedman
87fa7b98cc [ticket/11645] Rename .MODs tab in ACP to Extensions 
http://tracker.phpbb.com/browse/PHPBB3-11645

PHPBB3-11645
 2014-03-02 11:58:26 -08:00
Crizzo
f997d98a2a [ticket/12126] Changed .phpbb_alert "max-width: 640px" to "width: 620px" 
PHPBB3-12126
 2014-03-02 18:43:31 +01:00
Crizz0
e97b0e16e0 [ticket/12126] Fixed position of alert box in IE 
PHPBB3-12126
 2014-03-02 18:10:48 +01:00
Nathan Guse
6152d6c41e Merge pull request #2065 from prototech/ticket/12232 
[ticket/12232] Remove excessive calls to sizeof() in assign_block_vars() method.
 2014-03-01 15:20:21 -06:00
Joas Schilling
08ed4d2c67 Merge remote-tracking branch 'rxu3/ticket/12222' into develop 
* rxu3/ticket/12222:
  [ticket/12222] Replace hardoded comma with translatable separator
 2014-03-01 21:42:23 +01:00
Cesar G
6d1b0d41f1 [ticket/12238] Remove defunct confirmation box template code. 
Confirmation boxes are handled by confirm_body.html.

PHPBB3-12238
 2014-03-01 10:15:26 -08:00
Joas Schilling
76409388af [ticket/12234] Replace ICQ with custom profile field 
PHPBB3-12234
 2014-02-28 15:24:35 +01:00
Joas Schilling
f2c208fa7f [ticket/12233] Update schema file 
PHPBB3-12233
 2014-02-28 15:13:46 +01:00
Joas Schilling
43040dd6a4 [ticket/12233] Add images back to subsilver2 
PHPBB3-12233
 2014-02-28 15:08:15 +01:00
Joas Schilling
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
Cesar G
99db2d9199 [ticket/12232] Fix a similar excessive pattern in the method. 
PHPBB3-12232
 2014-02-27 22:28:43 -08:00
Cesar G
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
Joas Schilling
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
Joas Schilling
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
Joas Schilling
ffbc7ccb64 [ticket/12205] Do not display 0 for empty integers when show_novalue is off 
PHPBB3-12205
 2014-02-25 18:24:45 +01:00
Joas Schilling
bd00b8e9bf [ticket/12227] "X from Y messages" should be "X out of Y messages" 
PHPBB3-12227
 2014-02-24 09:48:36 +01:00
Joas Schilling
87dfd76100 [ticket/12226] Split language strings to correctly allow multiple plural rules 
PHPBB3-12226
 2014-02-24 09:46:31 +01:00
rxu
aa8f43b356 [ticket/12222] Replace hardoded comma with translatable separator 
Replace hardoded comma with translatable separator
in forumlist_body.html.

PHPBB3-12222
 2014-02-23 21:04:35 +08:00
Andreas Fischer
4b7932e8b3 Merge pull request #2053 from prototech/ticket/12220 
[ticket/12220] Fix division by zero in search page with no results.

* prototech/ticket/12220:
  [ticket/12220] Fix division by zero in search page with no results.
 2014-02-21 22:12:51 +01:00
Cesar G
888a059994 [ticket/12220] Fix division by zero in search page with no results. 
The page url parameter no longer exists in the pagination.on_page() method,
therefore the page url passed is being divided by 0 - the total number of
items. Since PAGE_NUMBER is assigned in generate_template_pagination(), this
separate assignment is no longer needed.

PHPBB3-12220
 2014-02-21 12:36:26 -08:00
Nathan Guse
c0c19fbb29 Merge pull request #2035 from prototech/ticket/12138 
[ticket/12138] Include file time limit when generating attachment management pagination and stats.
 2014-02-20 21:13:06 -06:00
Nathan Guse
736d11225c Merge pull request #1939 from prototech/ticket/12078 
[ticket/12078] Check for f_delete when a user attempts to permanently delete a post.
 2014-02-20 21:04:52 -06:00
Nathan Guse
4f6b9080e8 Merge pull request #2037 from prototech/ticket/12080 
[ticket/12080] Fix color palettes when responsive.
 2014-02-20 20:59:14 -06:00
Nathan Guse
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
Nathan Guse
b8d30bfc80 Merge pull request #2021 from nickvergessen/ticket/12171 
Ticket/12171 Attachments from soft-deleted posts are still downloadable
 2014-02-20 20:51:58 -06:00
karan
20625e896b [ticket/12139] Spaces $ show_guests viewonline.php 
PHPBB3-12139
 2014-02-20 17:02:50 -06:00
Nathan Guse
cadf0dd3fd Merge pull request #2050 from rxu/ticket/12217 
[ticket/12217] Add more template events to viewtopic_body.html
 2014-02-20 10:32:45 -06:00
rxu
6d9afcd077 [ticket/12217] Add more template events to viewtopic_body.html 
Add viewtopic template events before/after the posts,
after the sorting options to allow adding contents to
respective places (like advertisement and so on).

PHPBB3-12217
 2014-02-21 00:27:47 +08:00
Nathan Guse
2ffca79c0e Merge pull request #2044 from prototech/ticket/12212 
[ticket/12212] Encode the attachment file name before presenting to user.
 2014-02-20 10:18:22 -06:00
Cesar G
55b38e8003 [ticket/12200] Add missing profile field template files to adm/style/ directory 
PHPBB3-12200
 2014-02-19 22:08:36 -08:00