makary/phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-06-20 18:28:55 +00:00
Code Issues Projects Releases Packages Wiki Activity
14084 commits 18 branches 192 tags 207 MiB
Commit graph

6057 commits

Author SHA1 Message Date
Dhruv Goel
23ea588880 [ticket/10308] makes variable boolean 
makes user_row['user_has_posts'] boolean instead of 1 or 0.

PHPBB3-10308
 2012-05-10 22:53:43 +05:30
Dhruv Goel
164054f067 [ticket/10308] fixes sql query, limit it to 1 
instead of fetching all posts by user we limit the query to 1 to check if
a user has posts or not

PHPBB3-10308
 2012-05-10 22:53:04 +05:30
Dhruv Goel
59177a86c4 [ticket/10308] fix language and user's total posts 
language modified to be clear and select box disappears in case no
posts by user. user's total posts are fetched using a new query.

PHPBB3-10308
 2012-05-10 22:50:13 +05:30
Andreas Fischer
1a9b30b871 Merge branch 'develop-olympus' into develop 
* develop-olympus:
  [ticket/10858] Move generic row seeking to DBAL
  [ticket/10858] Tests for row seeking with fetchfield()
  [ticket/10858] Fix MSSQL Native's row seeking behavior

Conflicts:
	tests/dbal/select_test.php
 2012-05-09 12:55:58 +02:00
Patrick Webster
09d49fb7b2 [ticket/10858] Move generic row seeking to DBAL 
Removed from: firebird, mssql_odbc, and mssqlnative

PHPBB3-10858
 2012-05-08 19:41:22 -05:00
Patrick Webster
e52d23848a [ticket/10858] Fix MSSQL Native's row seeking behavior 
The result_mssqlnative class remains in case someone wants to use it

PHPBB3-10858
 2012-05-08 18:44:43 -05:00
Andreas Fischer
cb02dfda96 Merge remote-tracking branch 'brunoais/ticket/10871' into develop 
* brunoais/ticket/10871:
  [ticket/10871] Delete the unwanted implode
 2012-05-04 21:28:16 +02:00
Bruno Ais
fce0c5d436 [ticket/10871] Delete the unwanted implode 
Deleted the implode that had no reason to be there

PHPBB3-10871
 2012-05-04 20:08:42 +01:00
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
Andreas Fischer
81af5c95ed Merge remote-tracking branch 'Senky/ticket/10847' into develop 
* Senky/ticket/10847:
  [ticket/10847] fixing all misspelled "dependant" to "dependent"
 2012-05-01 13:47:31 +02:00
Andreas Fischer
52c7193ad0 Merge branch 'develop-olympus' into develop 
* develop-olympus:
  [ticket/10846] fixing SQL query bug in acp_main.php
 2012-05-01 13:38:25 +02:00
Senky
665f38d42f [ticket/10846] fixing SQL query bug in acp_main.php 
PHPBB3-10846
 2012-04-30 22:01:53 +02:00
Senky
b83fa0349a [ticket/10847] fixing all misspelled "dependant" to "dependent" 
PHPBB3-10847
 2012-04-30 21:55:24 +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
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
Patrick Webster
de70b17b1d [ticket/10492] Separate config generation from the installer 
PHPBB3-10492
 2012-04-20 23:50:49 -05: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
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
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
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
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
Joas Schilling
4b6b41a1e5 [ticket/10605] Add parameter documentation to phpbb_delete_user_pms 
PHPBB3-10605
 2012-04-13 16:26:41 +02: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
Callum Macrae
5665e82616 [ticket/10783] Added ?assets_version to assets. 
PHPBB3-10783
 2012-04-11 14:30:11 +01:00
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
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
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
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
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
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
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
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
2a8481d681 [ticket/10650] Added checking for empty subjects 
Now empty subjects will not be displayed in a
new line on the forum list.

PHPBB3-10650
 2012-04-08 10:34:29 +05:30
Rahul R
630c0397b9 [ticket/10650] Corrected intendation 
Corrected the intendation of if condition.

PHPBB3-10650
 2012-04-08 10:34:17 +05:30
Rahul R
4bb20d7cea [ticket/10650]Added permission checking and utf8 functions 
Passworded forums and ones in which user doesn't have
read access will be excluded. Also uft8 based string functions and
html encode/decode functions have been used to sanitise subject.

PHPBB3-10650
 2012-04-08 10:34:00 +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
bc21dec9c0 [ticket/10650] Corrected space before true 
Inserted a space before 'true' as per coding
guidelines.

PHPBB3-10650
 2012-04-08 10:33:16 +05:30