1
0
mirror of https://github.com/phpbb/phpbb.git synced 2025-02-24 20:13:22 +01:00

12493 Commits

Author SHA1 Message Date
Patrick Webster
7a6d3ec61b [ticket/10819] Improve side-by-side diff styling
Used transparent background for unchanged lines
Shortened the table headers and make the background grey
Added a border between the columns
Increased the font size on pre blocks
Added Consolas as the first pre font, for Windows users
Added wordwrapping for pre blocks

PHPBB3-10819
2012-04-15 23:33:34 -05:00
Dhruv Goel
249d8ede12 [ticket/10797] user rank is displayed in mcp_warn.php
When warning a user in MCP, the user's rank title and image are displayed.
language key user rank also added.

PHPBB3-10797
2012-04-16 01:24:10 +05:30
Senky
3741e99aab [ticket/10161] all "e-mail" strings in language files changed to "email"
according to Oleg's comment:
email is preferred by RFCs and probably the way of the future

PHPBB3-10161
2012-04-15 20:10:51 +02:00
Andreas Fischer
7a4b4c7599 [ticket/10094] Purge acm_file cache before phpBB installation.
PHPBB3-10094
2012-04-13 16:31:49 +02:00
Joas Schilling
4b6b41a1e5 [ticket/10605] Add parameter documentation to phpbb_delete_user_pms
PHPBB3-10605
2012-04-13 16:26:41 +02:00
Rahul R
f8a5a16d0b [ticket/10777] Split the comment into 2 lines
Split the comment into 2 lines each having
less than 79 characters.

PHPBB3-10777
2012-04-13 18:34:28 +05:30
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
8a1d084d6d [ticket/10783] Correctly add assets_version config var to includejs urls
PHPBB3-10783
2012-04-13 04:08:21 +02: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
Igor Wiedler
1828d74502 Merge remote-tracking branch 'marc1706/ticket/10784' into develop
* marc1706/ticket/10784:
  [ticket/10784] Do not show ajax overlay unless needed
2012-04-12 21:07:18 +02:00
Marc Alexander
7a9d9f97ef [ticket/10784] Do not show ajax overlay unless needed
PHPBB3-10784
2012-04-12 21:03:47 +02:00
Andreas Fischer
3ece096a1e Merge branch 'develop-olympus' into develop
* develop-olympus:
  [ticket/10788] Move ckwalsh and kellanved to the Former Contributors section.
  [ticket/10788] Add imkingdavid to the list of developers in docs/AUTHORS.
2012-04-12 14:37:55 +02:00
Oleg Pudeyev
8bb083eed9 [ticket/10688] Update install.html for 3.1 and current practices.
PHPBB3-10688
2012-04-12 00:24:09 -04:00
Oleg Pudeyev
8382e44942 [ticket/10688] Update readme for 3.1 and current practices.
PHPBB3-10688
2012-04-11 23:59:11 -04:00
Andreas Fischer
f394fd250e [ticket/10788] Move ckwalsh and kellanved to the Former Contributors section.
PHPBB3-10788
2012-04-11 22:08:36 +02:00
Andreas Fischer
534d966957 [ticket/10788] Add imkingdavid to the list of developers in docs/AUTHORS.
PHPBB3-10788
2012-04-11 21:39:27 +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
Andreas Fischer
45695c2632 Merge remote-tracking branch 'callumacrae/ticket/10785' into develop
* callumacrae/ticket/10785:
  [ticket/10785] Fixed illegal use of $_REQUEST in develop/fill.php.
2012-04-11 14:34:03 +02: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
394a95b5c5 [ticket/10688] Updated version to 3.1
Replace phpBB 3.0.x to phpBB 3.1.x

PHPBB-10688
2012-04-11 17:54:50 +05:30
Shibu Lijack
3da5166703 [ticket/10688] Changed 3.0 to 3.1 in docs
Replaced all the occurrences of phpBB 3.0 with phpBB 3.1 in all the doc
files

PHPBB-10688
2012-04-11 17:46:47 +05:30
Callum Macrae
e0df7d17f9 [ticket/10785] Fixed illegal use of $_REQUEST in develop/fill.php.
PHPBB3-10785
2012-04-11 13:00:02 +01:00
Rahul R
bab32bd56a [ticket/10650] Changed apostrophe to utf8 single quote
The apostrophe in language entry DISPLAY_LAST_SUBJECT_EXPLAIN
was changed to utf8 single quote character.

PHPBB3-10650
2012-04-11 06:23:56 +05:30
Matt Friedman
4176ee1c95 [ticket/10779] Move jQuery CDN option to Load Settings
http://tracker.phpbb.com/browse/PHPBB3-10779

PHPBB3-10779
2012-04-10 15:19:26 -07:00
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
Rahul R
779b16041c [ticket/10777] Corrected typo in comment
savely was corrected to safely

PHPBB3-10777
2012-04-10 21:27:09 +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
Rahul R
1e4710b194 [ticket/10650] Moving censoring to before truncation
The censor_text function is now being applied to the
last_post_subject before being truncated.

PHPBB3-10650
2012-04-10 08:22:52 +05:30
Nils Adermann
41e03164c1 Merge branch 'develop-olympus' into develop
* develop-olympus:
  [ticket/10774] Correctly specify index name when creating unique index on MySQL.
  [ticket/10774] Add unit tests for UNIQUE index existence and creation.
2012-04-10 01:14:42 +02:00
Andreas Fischer
ef8160e8a2 [ticket/10774] Correctly specify index name when creating unique index on MySQL.
PHPBB3-10774
2012-04-10 00:53:27 +02:00
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
Nils Adermann
e57e82d478 Merge remote-tracking branch 'github-cyberalien/ticket/10754' into develop
* github-cyberalien/ticket/10754:
  [ticket/10754] Changing $style to $phpbb_style
2012-04-09 00:35:51 +02:00
Rahul R
6661c92dd3 [ticket/10650] Added apostrophe in explanation in language file
A missing apostrophe was added to the language file entry
of DISPLAY_LAST_SUBJECT_EXPLAIN

PHPBB3-10650
2012-04-09 03:22:35 +05:30
Rahul R
db275d0a90 [ticket/10650] Inserted correct utf ELLIPSIS character
Inserted the correct utf-8 ellipsis to the language file.

PHPBB3-10650
2012-04-09 02:51:18 +05:30
Rahul R
303748b02d [ticket/10650] Added space after if and comment
Added space in proper places in database_update.php. Also
corrected language entry of ELLIPSIS to utf8

PHPBB3-10650
2012-04-09 01:43:44 +05:30
Andreas Fischer
26e7dd98b7 Merge branch 'develop-olympus' into develop
* develop-olympus:
  [ticket/10561] Removed extra tabs, changes made to $db->sql_query()
  [ticket/10561] Changed $temp_style_id to $style_id
  [ticket/10561] Added function desc for phpbb_style_is_active()
  [ticket/10561] Casted $config['default_style'] to int
  [ticket/10561] Reverted to phpbb_style_is_active()
  [ticket/10561] Added to database_update:database_update_info()
  [ticket/10561] Added section in database_update.php
  [ticket/10561] Moved and renamed the funtion validate_style().
  [ticket/10561] Fixed syntax error and renamed return variables.
  [ticket/10561] Changes made to $db->sql_fetchrow().
  [ticket/10561] Changes made to function phpbb_style_is_active().
  [ticket/10561] All users can choose deactivated styles (fixed).

Conflicts:
	phpBB/install/database_update.php
2012-04-08 22:04:33 +02:00
Andreas Fischer
156ae40d6f Merge remote-tracking branch 'sadu/ticket/10561' into develop-olympus
* sadu/ticket/10561:
  [ticket/10561] Removed extra tabs, changes made to $db->sql_query()
  [ticket/10561] Changed $temp_style_id to $style_id
  [ticket/10561] Added function desc for phpbb_style_is_active()
  [ticket/10561] Casted $config['default_style'] to int
  [ticket/10561] Reverted to phpbb_style_is_active()
  [ticket/10561] Added to database_update:database_update_info()
  [ticket/10561] Added section in database_update.php
  [ticket/10561] Moved and renamed the funtion validate_style().
  [ticket/10561] Fixed syntax error and renamed return variables.
  [ticket/10561] Changes made to $db->sql_fetchrow().
  [ticket/10561] Changes made to function phpbb_style_is_active().
  [ticket/10561] All users can choose deactivated styles (fixed).
2012-04-08 21:59:06 +02:00
Hari Sankar R
2a48284fc9 [ticket/10561] Removed extra tabs, changes made to $db->sql_query()
Substituted $db->sql_query() with _sql()

PHPBB3-10561
2012-04-09 01:25:17 +05:30
Hari Sankar R
8442b19e59 [ticket/10561] Changed $temp_style_id to $style_id
PHPBB3-10561
2012-04-09 01:04:17 +05:30
Hari Sankar R
9bce716081 [ticket/10561] Added function desc for phpbb_style_is_active()
PHPBB3-10561
2012-04-09 00:57:29 +05:30
Hari Sankar R
4e630ef160 [ticket/10561] Casted $config['default_style'] to int
PHPBB3-10561
2012-04-09 00:33:55 +05:30
Rahul R
2dec700aab [ticket/10650] Added ellipsis to language file
Added ELLIPSIS to language file common.php and also corrected
language explanation of ACP option.

PHPBB3-10650
2012-04-08 22:52:49 +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
b0f5db152f [ticket/10650] Removed changes from acp_forums.php
Removed unneccesary changes from acp_forums.php

PHPBB3-10650
2012-04-08 11:12:29 +05:30
Rahul R
b6957aa525 [ticket/10650]Removed incorrect newline
Deleted additional line in the end of database_update.php

PHPBB3-10650
2012-04-08 10:34:54 +05:30