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

13110 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Vjacheslav Trushkin
63b41913a4 [ticket/10799] Removing global variable from includejs 
Removing global $phpbb_root_path from includejs implementation

PHPBB3-10799
 2012-05-01 18:25:11 +03:00
Oleg Pudeyev
2a92fee06d Merge PR #753 branch 'Senky/ticket/10161' into develop 
* Senky/ticket/10161:
  [ticket/10161] added fullstop to the end of sentence
  [ticket/10161] coding-guidelines.html updated
  [ticket/10161] all "e-mail" strings in language files changed to "email"
 2012-04-26 22:57:30 -04:00
Oleg Pudeyev
cd6f6d2813 Merge PR #771 branch 'develop-olympus' into develop 
* develop-olympus:
  [ticket/10836] Check if avatar directory is writable after install
  [ticket/10836] Enable avatars by default at install
 2012-04-26 22:25:26 -04:00
Oleg Pudeyev
3a67604900 Merge PR #771 branch 'galaxyAbstractor/ticket/10836' into develop-olympus 
* galaxyAbstractor/ticket/10836:
  [ticket/10836] Check if avatar directory is writable after install
  [ticket/10836] Enable avatars by default at install
 2012-04-26 22:08:42 -04:00
Senky
0858a8023b [ticket/10161] added fullstop to the end of sentence 
PHPBB3-10161
 2012-04-26 09:20:33 +02:00
Senky
02cc32b901 [ticket/10161] coding-guidelines.html updated 
PHPBB3-10161
 2012-04-26 09:19:51 +02:00
Oleg Pudeyev
7d92cccf74 Merge PR #731 branch 'VSEphpbb/ticket/10779' into develop 
* VSEphpbb/ticket/10779:
  [ticket/10779] Move jQuery CDN option to Load Settings
 2012-04-25 17:52:24 -04:00
galaxyAbstractor
1a8db76a20 [ticket/10836] Check if avatar directory is writable after install 
Check if the avatar directory is writeable after the installation is complete.
If it isn't, disable avatars and avatar uploading by default.

PHPBB3-10836
 2012-04-25 11:49:06 +02:00
galaxyAbstractor
a21b367b21 [ticket/10836] Enable avatars by default at install 
Enables avatars and local avatar upload by default.

PHPBB3-10836
 2012-04-21 14:16:55 +02:00
Nils Adermann
417caa649a Merge branch 'develop-olympus' into develop 
* develop-olympus:
  [ticket/10492] Fix line endings
  [ticket/10492] Backporting functional tests
  [ticket/10492] Separate config generation from the installer

Conflicts:
	phpBB/includes/functions_install.php
	phpunit.xml.functional
	tests/bootstrap.php
	tests/test_framework/phpbb_functional_test_case.php
	tests/test_framework/phpbb_test_case_helpers.php
 2012-04-21 12:36:40 +02:00
Nils Adermann
cdf7ff1797 Merge remote-tracking branch 'github-noxwizard/ticket/10492' into develop-olympus 
* github-noxwizard/ticket/10492:
  [ticket/10492] Fix line endings
  [ticket/10492] Backporting functional tests
  [ticket/10492] Separate config generation from the installer
 2012-04-21 12:31:43 +02:00
Patrick Webster
6293bbf099 [ticket/10492] Fix line endings 
PHPBB3-10492
 2012-04-21 05:24:57 -05:00
Patrick Webster
2aa994b5ad [ticket/10492] Backporting functional tests 
PHPBB3-10492
 2012-04-21 04:37:57 -05:00
Patrick Webster
de70b17b1d [ticket/10492] Separate config generation from the installer 
PHPBB3-10492
 2012-04-20 23:50:49 -05:00
Nils Adermann
13a00ee8cb Merge branch 'develop-olympus' into develop 
* develop-olympus:
  [ticket/10815] enables feed feature by default for a fresh install
 2012-04-20 20:13:17 +02:00
Nils Adermann
29a6aec9ad Merge remote-tracking branch 'github-dhruv/ticket/10815' into develop-olympus 
* github-dhruv/ticket/10815:
  [ticket/10815] enables feed feature by default for a fresh install
 2012-04-20 20:13:00 +02:00
Dhruv Goel
4788705a9a [ticket/10815] enables feed feature by default for a fresh install 
PHPBB3-10815
 2012-04-20 23:30:01 +05:30
Andreas Fischer
70cba47871 Merge branch 'develop-olympus' into develop 
* develop-olympus:
  [ticket/10767] Clarify what happens at the end of the hook.
  [ticket/10767] Use warning/error language as appropriate.
  [ticket/10767] Default to non-fatal behavior.
  [ticket/10767] Revert unconditional unfatality in commit-msg hook.
 2012-04-20 14:55:03 +02:00
Andreas Fischer
31fbc40a09 Merge remote-tracking branch 'p/ticket/10767' into develop-olympus 
* p/ticket/10767:
  [ticket/10767] Clarify what happens at the end of the hook.
  [ticket/10767] Use warning/error language as appropriate.
  [ticket/10767] Default to non-fatal behavior.
  [ticket/10767] Revert unconditional unfatality in commit-msg hook.
 2012-04-20 14:54:55 +02:00
Andreas Fischer
4df8afd27e Merge branch 'develop-olympus' into develop 
* develop-olympus:
  [ticket/10812] Disabled register_globals check in PHP 5.4
 2012-04-20 14:41:20 +02:00
Andreas Fischer
bc0453c93a Merge remote-tracking branch 'galaxyAbstractor/ticket/10812' into develop-olympus 
* galaxyAbstractor/ticket/10812:
  [ticket/10812] Disabled register_globals check in PHP 5.4
 2012-04-20 14:39:16 +02:00
galaxyAbstractor
edf60bcd55 [ticket/10812] Disabled register_globals check in PHP 5.4 
Disabled the check for register_globals if PHP version is 5.4+

PHPBB3-10812
 2012-04-20 14:19:38 +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
dbbc57382a Merge branch 'develop-olympus' into develop 
* develop-olympus:
 2012-04-20 01:11:13 +02:00
Nils Adermann
57547c7e20 Merge remote-tracking branch 'github-dhruv/ticket/10797' into develop-olympus 
* github-dhruv/ticket/10797:
  [ticket/10797] language key rank moved to common
  [ticket/10797] user rank is displayed in mcp_warn.php
 2012-04-20 01:11:00 +02:00
Nils Adermann
6ae68a3eb5 Merge remote-tracking branch 'github-dhruv/ticket/10797' into develop 
* github-dhruv/ticket/10797:
  [ticket/10797] language key rank moved to common
  [ticket/10797] user rank is displayed in mcp_warn.php
 2012-04-20 01:08:21 +02:00
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
Nils Adermann
41b23542d3 Merge remote-tracking branch 'github-p/ticket/10813' into develop 
* github-p/ticket/10813:
  [ticket/10813] Installer now checks json extension
 2012-04-19 23:20:36 +02:00
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
Oleg Pudeyev
d4b89a13b1 Merge PR #760 branch 'naderman/ticket/10759' into develop 
* naderman/ticket/10759:
  [ticket/10759] Make sure style ids are integers
  [ticket/10759] Don't select imageset_id, it's not needed
  [ticket/10759] Clarify comments a bit
  [ticket/10759] Retrieve style_id after INSERT since we cannot set it
  [ticket/10759] Fix whitespace in database_update.php
  [ticket/10759] Fixing style in database updater
 2012-04-18 21:56:51 -04: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
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
Oleg Pudeyev
aceca2566b [ticket/10767] Clarify what happens at the end of the hook. 
If there are problems and fatal is true, print that the commit
is aborted.

If there are problems and fatal is false, print instructions
for fixing the commit.

PHPBB3-10767
 2012-04-17 06:05:33 -04:00
Oleg Pudeyev
45b910f9b4 [ticket/10767] Use warning/error language as appropriate. 
When commit-msg hook is fatal, label the message as an error.

When it is not fatal, label the message as a warning.

"Syntax error" is still always an error, not sure if this
should be changed.

PHPBB3-10767
 2012-04-17 06:05:32 -04:00
Oleg Pudeyev
1ce8a1d7ee [ticket/10767] Default to non-fatal behavior. 
PHPBB3-10767
 2012-04-17 06:05:32 -04:00