Commit graph

6380 commits

Author SHA1 Message Date
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
Bruno Ais
593ef78859 [ticket/10845] Remove censor from text
In order to remove the censor, I added a new parameter to
generate_text_for_display(), that new parameter is used to tell if the text
should be censored or not. Defaults to true.

PHPBB3-10845
2012-05-02 17:13:39 +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
Bruno Ais
06f4ef8852 [ticket/10845] Now it shows the preview post parsed
With this addition, the preview post in the report details now shows with the
BBCode parsed.

Note: Tested with all BBCodes I have including one personalised to write the <s>
BBCode.

PHPBB3-10845
2012-05-01 12:44:34 +01: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
5b48df4168 [feature/prune-users] Move quote to the correct line.
PHPBB3-9622
2012-04-25 19:41:50 -04: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
Oleg Pudeyev
0f36e15f86 [feature/prune-users] Split one line into two lines for readability.
PHPBB3-9622
2012-04-19 20:37:21 -04:00
Oleg Pudeyev
b76454dd83 [feature/prune-users] Use empty for checking array size.
PHPBB3-9622
2012-04-19 20:35:14 -04:00
Oleg Pudeyev
6151f46abe [feature/prune-users] Fix issues with queries pointed out by bantu.
PHPBB3-9622
2012-04-19 20:35:13 -04:00
Oleg Pudeyev
7c752aa3de [feature/prune-users] Use a map instead of performing array scans.
PHPBB3-9622
2012-04-19 20:35:13 -04:00
Oleg Pudeyev
138d2e2a4c [feature/prune-users] Fix incorrect condition when deleting log entries.
The original commit incorrectly replaced reportee_id with user_id.

Change it back to reportee_id. The comment was correct.

PHPBB3-9622
2012-04-19 20:35:13 -04:00
Oleg Pudeyev
953e829b52 [feature/prune-users] Non-cosmetic changes per bantu's review.
PHPBB3-9622
2012-04-19 20:35:13 -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
Senky
807eccc976 [ticket/9918] default values in request_var changed to one string
As per marc1706's note, all request_var functions now have only one string in default value

PHPBB3-9918
2012-04-15 19:13:08 +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
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
Senky
e6a1d37634 [ticket/9918] $redirect variable used from now
According to comment marc1706 added to tracker
http://tracker.phpbb.com/browse/PHPBB3-9918?focusedCommentId=35120&page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel#comment-35120
I changed files to fit his second advice - redirect is kept in hidden_fields and other code changed.

PHPBB3-9918
2012-04-09 16:23:42 +02:00
Igor Wiedler
3ebe89cb7e [feature/dic] Fix test suite for dic-powered cron
PHPBB3-10739
2012-04-09 15:05:28 +02:00
Igor Wiedler
3896ee953f [feature/dic] Give all cron tasks a name, change some manager usage
PHPBB3-10739
2012-04-09 14:34:35 +02:00
Igor Wiedler
2e76620c88 [feature/dic] Rewrite cron system to use DIC
PHPBB3-10739
2012-04-09 12:42:31 +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
Igor Wiedler
9165a045c5 Merge remote-tracking branch 'upstream/develop' into feature/dic
* upstream/develop: (76 commits)
  [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/10764] FAQ now mentions Area51 instead of SourceForge
  [ticket/10764] FAQ now mentions GitHub instead of SourceForge
  [ticket/10455] Removed NOTE from prosilver overall_header.html.
  [ticket/10561] Moved and renamed the funtion validate_style().
  [ticket/10575] Adding public visibility to the methods.
  [ticket/10575] Fixing non-static access to static functions get_instance
  [ticket/10547] User is not logged in as admin after installation
  [ticket/10650] Revert merge of 'rahulr92/ticket/10650' into develop
  [ticket/10650] Added checking for empty subjects
  [ticket/10650] Corrected intendation
  [ticket/10650]Added permission checking and utf8 functions
  [ticket/10650] Cropped subject and inserted newline
  [ticket/10650] Corrected space before true
  ...
2012-04-08 23:03:17 +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