mirror/php-phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-02-24 20:13:22 +01:00
Code Issues Releases Wiki Activity
20,989 Commits 17 Branches 190 Tags
Commit Graph

2612 Commits

Author SHA1 Message Date
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
Maël Soucaze
e1278320a2 [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:25:11 +01:00
Joas Schilling
d9037965c8 [ticket/12271] Decouple dropdown header and footer from #notifications_list 
PHPBB3-12271
 2014-03-14 17:10:20 +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
Matt Friedman
21bec33e0b [ticket/11111] Prosilver posting textarea may only be resized vertically 
The resize element displays a mechanism for allowing the
user to resize the element. Setting this to vertical means it
may only be resized vertically.

PHPBB3-11111
 2014-03-13 12:47:28 -07:00
Joas Schilling
8a61e4b4c0 Merge remote-tracking branch 'crizz0/ticket/8785' into develop 
* crizz0/ticket/8785:
  [ticket/8785] Deletes additional add and add_bcc buttons
  [ticket/8785] Fixed problem with add empty.png and travis will now pass
  [ticket/8785] and again a fresh line
  [ticket/8785] Just one blank line
  [ticket/8785] pm_layout.html back to more standard code
  [ticket/8785] <hr /> will only displayed when needed
  [ticket/8785] Adds blank lines at file end
  [ticket/8785] Adds a new optical improvement, new file and fixes html bugs
  [ticket/8785] Adds two <hr /> to seperate recipients and BCC
  [ticket/8785] Scrollbar to Reciepients and BCC with max-height: 200px
  [ticket/8785] Little spaces mistake
  [ticket/8785] Rebuilding posting_editor pm head + new language vars
 2014-03-13 11:28:21 +01:00
Andreas Fischer
bd33855e7b Merge pull request #2110 from nickvergessen/ticket/12168 
[ticket/12168] Move padding-top to ul.linklist li

* nickvergessen/ticket/12168:
  [ticket/12168] Move padding-top to ul.linklist li
 2014-03-13 11:10:08 +01:00
Joas Schilling
9419edd686 [ticket/8041] Merge item name into "Return to" string for better translations 
PHPBB3-8041
 2014-03-12 01:05:05 +01:00
Crizzo
21961a25ba [ticket/8785] Deletes additional add and add_bcc buttons 
PHPBB3-8785
 2014-03-11 22:02:43 +01:00
Joas Schilling
8eb15de406 [ticket/12168] Move padding-top to ul.linklist li 
PHPBB3-12168
 2014-03-11 11:26:13 +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
Crizzo
47ad92ae31 [ticket/8785] Fixed problem with add empty.png and travis will now pass 
PHPBB3-8785
 2014-03-09 22:14:40 +01:00
Crizzo
0fd172aaa4 [ticket/8785] and again a fresh line 
PHPBB3-8785
 2014-03-09 21:50:44 +01:00
Nathan Guse
224e3f139f [ticket/12202] Use copyright symbol in style.cfg files 
PHPBB3-12202
 2014-03-09 15:20:18 -05:00
Crizzo
cc59b5e44b [ticket/8785] Just one blank line 
PHPBB3-8785
 2014-03-09 21:16:40 +01:00
Crizzo
b4a65da2ed [ticket/8785] pm_layout.html back to more standard code 
PHPBB3-8785
 2014-03-09 19:37:45 +01:00
Crizzo
cace4a50d0 [ticket/8785] <hr /> will only displayed when needed 
PHPBB3-8785
 2014-03-09 17:59:49 +01:00
Crizzo
f2321af9ed [ticket/8785] Adds blank lines at file end 
PHPBB3-8785
 2014-03-09 14:21:17 +01:00
Crizzo
9ef79776a9 [ticket/8785] Adds a new optical improvement, new file and fixes html bugs 
PHPBB3-8785
 2014-03-09 13:20:49 +01: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
Crizzo
60ca7f91e2 [ticket/8785] Adds two <hr /> to seperate recipients and BCC 
PHPBB3-8785
 2014-03-04 10:26:22 +01:00
Joas Schilling
83a7e632b9 [ticket/12235] Convert WLM to custom profile field 
PHPBB3-12235
 2014-03-04 10:19:08 +01:00
Crizzo
837a909f8c [ticket/8785] Scrollbar to Reciepients and BCC with max-height: 200px 
PHPBB3-8785
 2014-03-03 21:23:58 +01:00
Crizzo
2d7e76013f [ticket/8785] Little spaces mistake 
PHPBB3-8785
 2014-03-03 21:15:56 +01:00
Crizzo
d40fb32dcd [ticket/8785] Rebuilding posting_editor pm head + new language vars 
PHPBB3-8785
 2014-03-03 21:11:06 +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
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
4970934475 [ticket/12240] Added template changes for subsilver2, too 
PHPBB3-12240
 2014-03-02 20:45:05 +01:00
Crizzo
281df15a53 [ticket/12240] Added class code for custom bbcodes based on bbcode_tag 
PHPBB3-12240
 2014-03-02 20:30:09 +01:00
Crizzo
046b1b9d98 [ticket/12240] Added specific class name to posting buttons 
PHPBB3-12240
 2014-03-02 19:52:44 +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