mirror/php-phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-02-25 04:23:38 +01:00
Code Issues Releases Wiki Activity
19,876 Commits 17 Branches 190 Tags
Commit Graph

2429 Commits

Author SHA1 Message Date
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
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
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
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
2e5106aae1 [ticket/12237] Convert yahoo messanger to custom profile field 
PHPBB3-12237
 2014-03-05 21:38:57 +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
Joas Schilling
83a7e632b9 [ticket/12235] Convert WLM to custom profile field 
PHPBB3-12235
 2014-03-04 10:19:08 +01:00
Joas Schilling
5b1fbfb2f2 [ticket/12187] Remove user_website functionality 
PHPBB3-12187
 2014-03-03 20:01:19 +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
a2f2629e2a [ticket/12187] Add URL type for profile fields 
PHPBB3-12187
 2014-03-03 12:30:07 +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
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
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
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
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
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
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
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
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
Nathan Guse
74d2d6c66a Merge pull request #2027 from lucifer4o/ticket/12177 
[ticket/12177] Add ucp_friend_list_before/after
 2014-02-18 12:36:55 -06:00
Nathan Guse
061d9fba5a Merge pull request #2038 from prototech/ticket/12206 
[ticket/12206] Fix mismatched Plupload language vars preventing localization.
 2014-02-18 12:29:17 -06:00
Nathan Guse
69c119485a Merge pull request #2007 from rxu/ticket/12166 
Add template events before/after the textbox in quickreply_editor.html.
 2014-02-18 12:27:43 -06:00
rxu
cab8181af1 [ticket/12166] Add template events to quickreply_editor.html. 
Add template event pair - quickreply_editor_message_before
and quickreply_editor_message_before to
quickreply_editor.html for both of prosilver and subsilver2 styles.
This allows extensions to modify quick reply
postform. For example, to add BBCode buttons and/or smilies
and so on.

PHPBB3-12166
 2014-02-18 10:51:34 +08:00
Cesar G
233bdfa5f6 Merge remote-tracking branch 'Zoddo/ticket/12207' into develop 
* Zoddo/ticket/12207:
  [ticket/12207] Forum broken when error thrown
 2014-02-17 17:30:44 -08:00
Zoddo
fb662ebf50 [ticket/12207] Forum broken when error thrown 
Fix display of forum when error is outputted before <html> tag.

PHPBB3-12207
 2014-02-17 21:58:39 +01:00
Cesar G
a589c88d25 [ticket/12206] Fix mismatched Plupload language vars preventing localization. 
PHPBB3-12206
 2014-02-17 12:33:19 -08:00
Cesar G
bfbf0fefbf [ticket/12080] Reduce the palette options in all locations when responsive. 
PHPBB3-12080
 2014-02-16 13:27:01 -08:00
lucifer4o
89007db505 [ticket/12177] Add ucp_friend_list_before/after 
Add events before and after list of friends in UCP template

PHPBB3-12177
 2014-02-13 14:51:53 +02:00
Cesar G
13e7bd76a5 Merge remote-tracking branch 'vinny/ticket/12134' into develop 
* vinny/ticket/12134:
  [ticket/12134] Add ucp_pm_viewmessage_print_head_append event to subsilver2
 2014-02-12 18:39:39 -08:00
Cesar G
965b3365fe Merge remote-tracking branch 'vinny/ticket/12132' into develop 
* vinny/ticket/12132:
  [ticket/12132] Add the event to events.md doc
  [ticket/12132] Add viewtopic_print_head_append event to subsilver2
 2014-02-12 18:38:40 -08:00
Joas Schilling
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
Joas Schilling
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
Joas Schilling
bbada27ee9 [ticket/12115] Also port user interests to profile fields 
PHPBB3-12115
 2014-02-06 11:32:11 +01:00
Joas Schilling
38608bfa62 [ticket/12115] Remove occupation field from html files 
PHPBB3-12115
 2014-02-06 11:32:07 +01:00
Joas Schilling
127c0c4493 [prep-release-3.1.0-a3] Update version to 3.1.0-a3 2014-02-05 16:55:21 +01:00
Cesar G
1251b68668 [ticket/12153] Remove redundant calls to pagination.on_page(). 
PHPBB3-12153
 2014-02-03 23:00:39 -08:00
Cesar G
f22e51c8a1 [ticket/12153] Remove vars already assigned in generate_template_pagination(). 
PHPBB3-12153
 2014-02-03 23:00:34 -08:00
Andreas Fischer
bc98118f92 Merge branch 'develop-olympus' into develop 
* develop-olympus:
  [ticket/12146] Added a missing # to inline css-style of <span>

Conflicts:
	phpBB/styles/prosilver/template/ucp_groups_manage.html
 2014-02-02 17:20:07 +01:00
Crizz0
88fad5856a [ticket/12146] Added a missing # to inline css-style of <span> 
PHPBB3-12146
 2014-02-02 16:44:52 +01:00
Nils Adermann
38af79dd30 Merge remote-tracking branch 'github-nickvergessen/ticket/11201' into develop 
* github-nickvergessen/ticket/11201: (50 commits)
  [ticket/11201] Remove empty calls section from .yml
  [ticket/11201] Split template file into multiple files
  [ticket/11201] Remove dependency from types on the manager
  [ticket/11201] Rename profilefields class to manager
  [ticket/11201] Fix parameter description
  [ticket/11201] Use !== null, its faster
  [ticket/11201] Also translate profile fields in UCP and ACP
  [ticket/11201] Add parameters and variables to profile field class
  [ticket/11201] Add commas on last array entry
  [ticket/11201] Allow translation of profile field name and explanation
  [ticket/11201] Fix some variable names
  [ticket/11201] Add tables to constructor in tests
  [ticket/11201] Add a method to return the translated full name of the type
  [ticket/11201] Remove db depending code from field class
  [ticket/11201] Add variables to classes and add constructor doc blocks
  [ticket/11201] Update copyright in class file
  [ticket/11201] Add visibility and remove unused variable
  [ticket/11201] Add some commas at the last array entry
  [ticket/11201] Cast some variables to integer
  [ticket/11201] Inject table names rather then using constants
  ...

Conflicts:
	phpBB/config/services.yml
 2014-02-02 16:34:55 +01:00
Joas Schilling
cbad102f88 [ticket/11201] Split template file into multiple files 
PHPBB3-11201
 2014-02-02 16:20:02 +01:00