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

725 Commits

Author SHA1 Message Date
Joas Schilling
254b7739a8 [prep-release-3.1.0-b2] Update version to 3.1.0-b2 2014-03-30 22:08:10 +02:00
Joas Schilling
01697ab2f5 Merge remote-tracking branch 'prosk8er/ticket/12298' into develop-ascraeus
* prosk8er/ticket/12298:
  [ticket/12298] Template Event memberlist_view_contact_before/after
2014-03-29 17:43:03 +01:00
Prosk8er
255fab038d [ticket/12298] Template Event memberlist_view_contact_before/after
add template event memberlist_view_contact_before
and memberlist_view_contact_after

PHPBB3-12298
2014-03-29 12:13:17 -04:00
Joas Schilling
f879714d35 Merge remote-tracking branch 'prosk8er/ticket/12301' into develop-ascraeus
* prosk8er/ticket/12301:
  [ticket/12301] Template Event overall_header_body_before
2014-03-29 16:42:10 +01:00
Prosk8er
fb25917fa9 [ticket/12301] Template Event overall_header_body_before
add template event overall_header_body_before

PHPBB3-12301
2014-03-29 09:57:11 -04:00
PayBas
e8b43a1bb8 [ticket/12308] Template Event forumlist_body_last_row_after
PHPBB3-12308
2014-03-29 12:50:23 +01:00
Joas Schilling
1e0af0d252 Merge remote-tracking branch 'paybas/ticket/12304' into develop-ascraeus
* paybas/ticket/12304:
  [ticket/12304] Add CSS class to rules-link container
2014-03-29 12:36:05 +01:00
PayBas
0d84a42cd4 [ticket/12309] Template Event quickreply_editor_panel_before/after
PHPBB3-12309
2014-03-29 12:17:11 +01:00
PayBas
7a5639816a [ticket/12304] Add CSS class to rules-link container
When a forum has a forum-rules link instead of forum-rules text, there
is no way to distinguish in the styling of the container (or the button)
it will have.

It should be possible to style the <div class="rules"> container
differently if there is only a link (no text).

PHPBB3-12304
2014-03-29 11:20:03 +01:00
Crizzo
76558fbce5 [ticket/11336] Changes "leaders"-mode to "team"-mode and so in test-file
PHPBB3-11336
2014-03-28 19:36:08 +01:00
Joas Schilling
84b91beed1 Merge remote-tracking branch 'rxu/ticket/12289' into develop-ascraeus
* rxu/ticket/12289:
  [ticket/12289] Add viewtopic template events for posts specific custom notices
2014-03-22 21:35:38 +01:00
rxu
4bb898a061 [ticket/12289] Add viewtopic template events for posts specific custom notices
These events allow extensions to add own posts specific notices-alike info.

PHPBB3-12289
2014-03-22 22:45:05 +08:00
Dhruv Goel
7f5d8becad Merge pull request #2137 from geetakshi/ticket/8309
[ticket/8309] Rename "Last visited" to "Last activity" on memberlist/viewprofile
2014-03-20 03:44:39 +05:30
geetakshi
66ed9881df [ticket/8309] Removing key with similar function to avoid redundancy
PHPBB3-8309
2014-03-17 21:08:03 +05:30
rxu
1e1a54882c [ticket/12279] Add memberlist_view.html template event to add custom info
Template event to ddd custom content
to the user profile view after the main content.

PHPBB3-12279
2014-03-17 21:01:16 +08:00
geetakshi
8c4604a78e [ticket/8309] Renaming "Last visit" to "Last activity"
PHPBB3-8309
2014-03-16 03:32:08 +05:30
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
23b7671617 [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:32:26 +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
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
Nathan Guse
224e3f139f [ticket/12202] Use copyright symbol in style.cfg files
PHPBB3-12202
2014-03-09 15:20:18 -05: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
Joas Schilling
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
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
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
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
Crizzo
4970934475 [ticket/12240] Added template changes for subsilver2, too
PHPBB3-12240
2014-03-02 20:45:05 +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
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
823dca737f Merge remote-tracking branch 'remotes/prototech/ticket/12093' into develop-olympus
* remotes/prototech/ticket/12093:
  [ticket/12093] Check that document.selection is supported.
2014-02-19 09:06:57 -06: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
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
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