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
13,687 Commits 17 Branches 190 Tags
Commit Graph

1590 Commits

Author SHA1 Message Date
Dhruv Goel
bdf66b27ab [feature/delete-auto-logins] using loop for errors 
instead of hardcoding html code into ERROR variable, we use errors array
and use loop in template file.

PHPBB3-9647
 2012-05-17 14:02:25 +05:30
Dhruv Goel
d5b1e108f9 [feature/delete-auto-logins] fixes css corners 
PHPBB3-9647
 2012-05-17 14:02:22 +05:30
Dhruv Goel
5ce46cc960 [feature/delete-auto-logins] User can view/delete auto logins. 
User has an extra option in UCP->Profile to view the auto logins and
clear them.

PHPBB3-9647
 2012-05-17 14:02:12 +05:30
Joas Schilling
fc3a19567f [ticket/10811] Make it easier for MODs/Extensions to define the alt-text 
PHPBB3-10811
 2012-05-16 13:44:40 +02:00
Oleg Pudeyev
03d3f9adb5 Merge PR #785 branch 'develop-olympus' into develop 
* develop-olympus:
  [ticket/10835] changing "e-mail" to "email"
  [ticket/10835] changing CURRENT_CHANGE_PASSWORD_EXPLAIN language entry
  [ticket/10835] fixing misleading message in UCP

Conflicts:
	phpBB/language/en/ucp.php
 2012-05-11 02:37:25 -04:00
Oleg Pudeyev
1fcb269616 Merge PR #785 branch 'Senky/ticket/10835' into develop-olympus 
* Senky/ticket/10835:
  [ticket/10835] changing "e-mail" to "email"
  [ticket/10835] changing CURRENT_CHANGE_PASSWORD_EXPLAIN language entry
  [ticket/10835] fixing misleading message in UCP
 2012-05-11 02:32:58 -04:00
Andreas Fischer
9d827f491f Merge branch 'develop-olympus' into develop 
* develop-olympus:
  [ticket/10849] Added missing helptext for listitem
 2012-05-05 22:50:08 +02:00
Vinny
7294c71431 [ticket/10778] Remove extra space from close link in prosilver smilies window 
PHPBB3-10778
 2012-05-01 14:41:02 -03:00
Senky
2dd71f6520 [ticket/10835] fixing misleading message in UCP 
PHPBB3-10835
 2012-05-01 09:52:48 +02:00
Joas Schilling
53a47fdcc3 [ticket/10811] Make subscribe/unsubscribe repeatable with AJAX 
PHPBB3-10811
 2012-04-29 12:33:55 +02:00
galaxyAbstractor
8d45901657 [ticket/10849] Added missing helptext for listitem 
Added the missing helptext for list item in subsilver2.

PHPBB3-10849
 2012-04-27 22:19:41 +02:00
Oleg Pudeyev
248559d7d1 Merge PR #734 branch 'shibulijack/ticket/10688' into develop 
* shibulijack/ticket/10688:
  [ticket/10688] Update install.html for 3.1 and current practices.
  [ticket/10688] Update readme for 3.1 and current practices.
  [ticket/10688] Changed version 3.0 to 3.1
  [ticket/10688] Updated version to 3.1
  [ticket/10688] Changed 3.0 to 3.1 in docs

Conflicts:
	phpBB/docs/INSTALL.html
	phpBB/docs/README.html
 2012-04-19 21:43:23 -04:00
Oleg Pudeyev
7fc4a184c2 Merge PR #592 branch 'develop-olympus' into develop 
* develop-olympus:
  [ticket/9089] Add tabindex to pm/topic/post icon-options aswell
  [ticket/9089] Add tabindex to PM recipient box, to allow tabbing to the subject
 2012-04-19 21:03:15 -04:00
Oleg Pudeyev
6e77ca7c99 Merge PR #592 branch 'nickvergessen/ticket/9089' into develop-olympus 
* nickvergessen/ticket/9089:
  [ticket/9089] Add tabindex to pm/topic/post icon-options aswell
  [ticket/9089] Add tabindex to PM recipient box, to allow tabbing to the subject
 2012-04-19 21:02:48 -04:00
Nils Adermann
3d87ab79ca Merge remote-tracking branch 'github-cyberalien/ticket/10762' into develop 
* github-cyberalien/ticket/10762:
  [ticket/10762] Check for phpbb_version when installing style
  [ticket/10762] Changing version format in style.cfg
 2012-04-19 02:39:54 +02:00
Andreas Fischer
de7a166a59 Merge remote-tracking branch 'callumacrae/ticket/10783' into develop 
* callumacrae/ticket/10783:
  [ticket/10783] Fixed an HTML error with assets_version.
 2012-04-13 13:35:37 +02:00
Callum Macrae
875958573c [ticket/10783] Fixed an HTML error with assets_version. 
PHPBB3-10783
 2012-04-13 12:10:49 +01:00
Nils Adermann
790cc0c54f Merge remote-tracking branch 'github-callumacrae/ticket/10783' into develop 
* github-callumacrae/ticket/10783:
  [ticket/10783] Added assets_version to ACP and simple_*.html.
  [ticket/10783] Added assets_version to subsilver2.
  [ticket/10783] Added ?assets_version to assets.
 2012-04-13 03:32:01 +02:00
Callum Macrae
6ad58c7e04 [ticket/10783] Added assets_version to ACP and simple_*.html. 
PHPBB3-10783
 2012-04-11 14:37:15 +01:00
Callum Macrae
4771af0833 [ticket/10783] Added assets_version to subsilver2. 
PHPBB3-10783
 2012-04-11 14:33:09 +01:00
Callum Macrae
5665e82616 [ticket/10783] Added ?assets_version to assets. 
PHPBB3-10783
 2012-04-11 14:30:11 +01:00
Shibu Lijack
7fa2be51ce [ticket/10688] Changed version 3.0 to 3.1 
Replaced phpBB 3.0 to 3.1 in the stylesheets

PHPBB-10688
 2012-04-11 18:01:58 +05:30
Shibu Lijack
fd55c8664a Merge remote-tracking branch 'upstream/develop' into ticket/10734 
Conflicts:
	phpBB/styles/prosilver/theme/tweaks.css
 2012-04-10 21:46:14 +05:30
Shibu Lijack
daee253403 [ticket/10734] Fixed minor bug 
Removed an extra empty line in colors.css

PHPBB-10734
 2012-04-10 20:51:24 +05:30
Shibu Lijack
c1c71c26b4 [ticket/10734] Removed unwanted color elements 
Deleted all the color elements from the common.css

PHPBB-10734
 2012-04-10 19:48:00 +05:30
Shibu Lijack
fa04c3712b [ticket/10734] Moved style elements and fixed minor bugs 
Moved color related style elements to colours.css and other elements to
common.css
Also added an empty display for corners span.
Removed unwanted space in mcp_topic
Removed DS_Store

PHPBB-10734
 2012-04-09 18:43:54 +05:30
Rahul R
dd3b8e74b3 [ticket/10650] Added href title to subject link 
Added title attribute to anchor tag which displays
last_post_subject so that the full subject can be
seen by hovering over the truncated subject displayed
in forumlist.

PHPBB3-10650
 2012-04-08 12:45:51 +05:30
Rahul R
094dbe7ccc [ticket/10650] Made use of truncate_string() function 
Removed manual cropping and used truncate_string function.
Also made a new variable  so
that  is preserved.

PHPBB3-10650
 2012-04-08 12:25:25 +05:30
Rahul R
c524236ef6 [ticket/10650] Changed acp option from per forum to global 
Changed the display last subject acp toggle option from
per forum to global. Modified associated database entries.
New option is available in ACP General->Board Features.
Also corrected <br /> in forumlist_body.html.

PHPBB3-10650
 2012-04-08 10:34:44 +05:30
Rahul R
720fc46807 [ticket/10650] Cropped subject and inserted newline 
The subject being displayed in the forum list have been
shortened to 30 characters. Also it is now being shown
in a separate line.

PHPBB3-10650
 2012-04-08 10:33:30 +05:30
Rahul
492c27a693 [ticket/10650] Changed language files and forumlist 
The entry in languages have been changed from
title to subject. Also the IF condition in forumlist_body.html
has been properly intented.

PHPBB3-10650
 2012-04-08 10:32:59 +05:30
Rahul
9b30bd6392 [ticket/10650] Displaying last topic on forum list 
The most recent topic title of the forum can now
be displayed on the board index. An option is provided
in the ACP under the 'General Forum Setting' which
allows the admin to enable or disable this feature.

PHPBB3-10650
 2012-04-08 10:32:19 +05:30
Oleg Pudeyev
ce4eb62b14 Merge PR #716 branch 'develop-olympus' into develop 
* develop-olympus:
  [ticket/10455] Removed NOTE from prosilver overall_header.html.
 2012-04-07 22:33:53 -04:00
Oleg Pudeyev
3ec941937a Merge PR #716 branch 'callumacrae/ticket/10455' into develop-olympus 
* callumacrae/ticket/10455:
  [ticket/10455] Removed NOTE from prosilver overall_header.html.
 2012-04-07 22:32:14 -04:00
Callum Macrae
be9eb57785 [ticket/10455] Removed NOTE from prosilver overall_header.html. 
PHPBB3-10455
 2012-04-05 22:22:11 +01:00
Oleg Pudeyev
98964a913c [ticket/10650] Revert merge of 'rahulr92/ticket/10650' into develop 
The pull request (#654) was merged a little too quickly.

In particular, display_last_subject per-forum option needs consensus.

This reverts commit b1fb34a4d7e446768b9f66ba6dd359173cd2a5fb, reversing
changes made to 7d6b289671c51694f17dd5f9849abf2534b55e59.

PHPBB3-10650
 2012-04-04 19:23:05 -04:00
David King
b1fb34a4d7 Merge remote-tracking branch 'rahulr92/ticket/10650' into develop 2012-04-04 16:41:28 -04:00
Oleg Pudeyev
7d6b289671 Merge branch 'develop-olympus' into develop 
* develop-olympus:
  [ticket/10607] Added 'Powered by' translation string.

Conflicts:
	phpBB/adm/index.php
	phpBB/language/en/common.php
 2012-04-04 15:33:51 -04:00
Rahul R
663b5f6542 [ticket/10650] Cropped subject and inserted newline 
The subject being displayed in the forum list have been
shortened to 30 characters. Also it is now being shown
in a separate line.

PHPBB3-10650
 2012-04-05 00:46:14 +05:30
Rahul
01e6254ccc [ticket/10650] Changed language files and forumlist 
The entry in languages have been changed from
title to subject. Also the IF condition in forumlist_body.html
has been properly intented.

PHPBB3-10650
 2012-04-05 00:45:50 +05:30
Rahul
f32547c215 [ticket/10650] Displaying last topic on forum list 
The most recent topic title of the forum can now
be displayed on the board index. An option is provided
in the ACP under the 'General Forum Setting' which
allows the admin to enable or disable this feature.

PHPBB3-10650
 2012-04-05 00:45:26 +05:30
Vjacheslav Trushkin
e769e0f723 [ticket/10762] Changing version format in style.cfg 
Splitting version into style_version and phpbb_version in style.cfg

PHPBB3-10762
 2012-04-04 13:07:24 +03:00
Fyorl
0ceb77fb99 [ticket/10607] Added 'Powered by' translation string. 
Added POWERED_BY line to common.php and modified the templates
to use it.

PHPBB3-10607
 2012-04-04 11:38:15 +08:00
Vjacheslav Trushkin
8363d32765 Merge branch 'develop-olympus' into develop 
* develop-olympus:
  [ticket/10699] Long h2 title breaks div.minitabs in MCP
  [ticket/10699] Long h2 title breaks div.minitabs in MCP

Conflicts:
	phpBB/styles/prosilver/theme/tweaks.css
 2012-04-02 16:20:21 +03:00
Vjacheslav Trushkin
51bc9540cf Merge remote-tracking branch 'sadu/ticket/10699' into develop-olympus 
* sadu/ticket/10699:
  [ticket/10699] Long h2 title breaks div.minitabs in MCP
  [ticket/10699] Long h2 title breaks div.minitabs in MCP
 2012-04-02 16:18:56 +03:00
Hari Sankar R
17e050e109 [ticket/10699] Long h2 title breaks div.minitabs in MCP 
Fixed minor issues in formatting.

PHPBB3-10699
 2012-04-02 16:59:05 +05:30
Shibu Lijack
d8c67937d6 [ticket/10734] Fixed cp css 
Fixed border radius and padding of the ucp and mcp.

PHPBB-10734
 2012-04-02 16:53:09 +05:30
Hari Sankar R
42101fe8d4 [ticket/10699] Long h2 title breaks div.minitabs in MCP 
Fixed overlapping of Subject title over the minitabs.
Added css property to cp.css under MCP Specific tweaks.
Wrapped h2 and #minitabs under .tabs-container with
clear: both

PHPBB3-10699
 2012-04-02 16:26:23 +05:30
Shibu Lijack
3ced1d2bfc [ticket/10734] Removed all the unnecessary corner classes 
Removed the corner span classes from all the template and theme files.

PHPBB-10734
 2012-04-02 16:15:55 +05:30
Shibu Lijack
97ff7ee9d8 [ticket/10734] Fixed padding issues 
Fixed padding for post and panel.

PHPBB-10734
 2012-04-02 02:04:11 +05:30