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

12439 Commits

Author SHA1 Message Date
Dhruv Goel
90fc8fe59f [ticket/10797] language key rank moved to common
Language key RANK moved from memberlist to common.
Removed from mcp language.

PHPBB3-10797
2012-04-20 04:30:42 +05:30
riadhchtara
00172afa53 [ticket/10813] Installer now checks json extension
Installer now checks json extension and cannot continue without it.
Changes are made in phpBB/install/install_install.php where the
checking for json is added and to phpBB/language/en/install.php where
2 new keys for the messages that would be displayed are also added.

PHPBB3-10813
2012-04-19 17:09:56 -04:00
Oleg Pudeyev
a650da79cb Merge PR #761 branch 'naderman/ticket/10756' into develop
* naderman/ticket/10756:
  [ticket/10756] Fixing variable declarations in style and template classes
  [ticket/10756] Renaming phpbb_style_template to phpbb_template
  [ticket/10756] Removing path provider from template class
  [ticket/10756] Creating locator interface
  [ticket/10756] Renaming template classes
  [ticket/10756] Moving template classes
2012-04-18 22:36:20 -04:00
Vjacheslav Trushkin
ed9a58a6cc [ticket/10756] Fixing variable declarations in style and template classes
Fixing variable declaration, removing function from template locator that does not belong there

PHPBB3-10756
2012-04-19 04:25:25 +02:00
Vjacheslav Trushkin
d91abbb146 [ticket/10756] Renaming phpbb_style_template to phpbb_template
Renaming phpbb_style_template to phpbb_template

PHPBB3-10756
2012-04-19 04:25:25 +02:00
Vjacheslav Trushkin
6cecc91326 [ticket/10756] Removing path provider from template class
Removing path provider from template class because it is not used by template class

PHPBB3-10756
2012-04-19 04:21:56 +02:00
Vjacheslav Trushkin
ea3a2ef223 [ticket/10756] Creating locator interface
Creating locator interface to be used in template class

PHPBB3-10756
2012-04-19 04:15:11 +02:00
Vjacheslav Trushkin
ef295a2860 [ticket/10756] Renaming template classes
Renaming template classes from phpbb_style_template_ to phpbb_template_

PHPBB3-10756
2012-04-19 04:15:11 +02:00
Vjacheslav Trushkin
733018f99a [ticket/10756] Moving template classes
Moving template class files from includes/style/ to includes/template/ and removing template_ file prefix

PHPBB3-10756
2012-04-19 04:15:11 +02:00
Nils Adermann
439ade4ee2 [ticket/10759] Make sure style ids are integers
PHPBB3-10759
2012-04-19 03:51:38 +02:00
Nils Adermann
1870421521 [ticket/10759] Don't select imageset_id, it's not needed
PHPBB3-10759
2012-04-19 03:51:37 +02:00
Nils Adermann
0b7a0fa2d1 [ticket/10759] Clarify comments a bit
PHPBB3-10759
2012-04-19 03:27:42 +02:00
Nils Adermann
c433730686 [ticket/10759] Retrieve style_id after INSERT since we cannot set it
PHPBB3-10759
2012-04-19 03:18:20 +02:00
Nils Adermann
ea8f83de6f [ticket/10759] Fix whitespace in database_update.php
PHPBB3-10759
2012-04-19 03:06:40 +02:00
Vjacheslav Trushkin
b3e42635ca [ticket/10759] Fixing style in database updater
Fixing error in database updater caused by style components merge

PHPBB3-10759
2012-04-19 03:03:44 +02: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
Patrick Webster
00c54f8a7c [ticket/10819] Remove support for older browsers
PHPBB3-10819
2012-04-17 22:59:10 -05:00
Oleg Pudeyev
6564180a15 Merge PR #727 branch 'rahulr92/ticket/10777' into develop
* rahulr92/ticket/10777:
  [ticket/10777] Split the comment into 2 lines
  [ticket/10777] Corrected typo in comment
2012-04-17 06:16:17 -04:00
Patrick Webster
09621342a5 [ticket/10819] Forgot this causes vertical scrollbars on IE
PHPBB3-10819
2012-04-15 23:38:12 -05:00
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