1
0
mirror of https://github.com/phpbb/phpbb.git synced 2025-02-24 12:03:21 +01:00

12161 Commits

Author SHA1 Message Date
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
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
Oleg Pudeyev
ce4eb62b14 Merge PR #716 branch 'develop-olympus' into develop
* develop-olympus:
  [ticket/10455] Removed NOTE from prosilver overall_header.html.
2012-04-07 22:33:53 -04:00
Oleg Pudeyev
3ec941937a Merge PR #716 branch 'callumacrae/ticket/10455' into develop-olympus
* callumacrae/ticket/10455:
  [ticket/10455] Removed NOTE from prosilver overall_header.html.
2012-04-07 22:32:14 -04:00
Oleg Pudeyev
e5ed5e033a Merge PR #718 branch 'develop-olympus' into develop
* develop-olympus:
  [ticket/10764] FAQ now mentions Area51 instead of SourceForge
  [ticket/10764] FAQ now mentions GitHub instead of SourceForge
2012-04-07 22:24:24 -04:00
Hari Sankar R
03a35581c4 [ticket/10561] Reverted to phpbb_style_is_active()
Changes made to function name, reverted to old.

PHPBB3-10561
2012-04-07 23:15:12 +05:30
Hari Sankar R
1808a61fe3 [ticket/10561] Added to database_update:database_update_info()
Updates made to database_update.php

PHPBB3-10561
2012-04-07 19:42:42 +05:30
Hari Sankar R
ea5ae09c7d [ticket/10561] Added section in database_update.php
Added section to check for existing users using a
deactivated style, and revert it to default style.

PHPBB3-10561
2012-04-06 14:09:56 +05:30
Adonais Romero González
04bb44ce33 [ticket/10764] FAQ now mentions Area51 instead of SourceForge
The answer of the question "Why isn't X feature available?" in
the FAQ now mentions Area51 instead of SourceForge and GitHub
as the way to handle feature requests.

PHPBB3-10764
2012-04-05 20:22:00 -05:00
Adonais Romero González
293f66d4ed [ticket/10764] FAQ now mentions GitHub instead of SourceForge
The answer of the question "Why isn't X feature available?" in the
FAQ now mentions GitHub instead of SourceForge as the way to handle
feature requests.

PHPBB3-10764
2012-04-05 19:03:08 -05:00
Callum Macrae
be9eb57785 [ticket/10455] Removed NOTE from prosilver overall_header.html.
PHPBB3-10455
2012-04-05 22:22:11 +01:00
Oleg Pudeyev
713e7129e2 Merge branch 'develop-olympus' into develop
* develop-olympus:
  [ticket/10508] Marked as read message now less specific.
2012-04-05 15:35:19 -04:00
Oleg Pudeyev
30093d6e86 Merge remote-tracking branch 'Fyorl/ticket/10508' into develop-olympus
* Fyorl/ticket/10508:
  [ticket/10508] Marked as read message now less specific.
2012-04-05 15:35:12 -04:00
Andreas Fischer
8bc5e2ca5a Merge remote-tracking branch 'brunoais/ticket/10575' into develop
* brunoais/ticket/10575:
  [ticket/10575] Adding public visibility to the methods.
  [ticket/10575] Fixing non-static access to static functions get_instance
2012-04-05 17:22:41 +02:00
Hari Sankar R
018419b36c [ticket/10561] Moved and renamed the funtion validate_style().
Fixed minor changes as suggested by @bantu.

PHPBB3-10561
2012-04-05 19:31:18 +05:30
Bruno Ais
2bf1c4eb32 [ticket/10575] Adding public visibility to the methods.
Added public visibility to the methods

PHPBB3-10575
2012-04-05 14:16:56 +01:00
Bruno Ais
c8da69d9c2 [ticket/10575] Fixing non-static access to static functions get_instance
These changes should solve the strict standards error about accessing
the non-static get_instance() in a non-static way.
For that, I changed the get_instance methods to static methods.

PHPBB3-10575
2012-04-05 14:14:40 +01:00
Gabriel Anca
1c9993055a [ticket/10547] User is not logged in as admin after installation
After installing, when user clicks Login button (final installation step),
he is not logged in because there's a missing var ($data)

PHPBB3-10547
2012-04-04 23:43:10 -04:00
Oleg Pudeyev
98964a913c [ticket/10650] Revert merge of 'rahulr92/ticket/10650' into develop
The pull request (#654) was merged a little too quickly.

In particular, display_last_subject per-forum option needs consensus.

This reverts commit b1fb34a4d7e446768b9f66ba6dd359173cd2a5fb, reversing
changes made to 7d6b289671c51694f17dd5f9849abf2534b55e59.

PHPBB3-10650
2012-04-04 19:23:05 -04:00
David King
b1fb34a4d7 Merge remote-tracking branch 'rahulr92/ticket/10650' into develop 2012-04-04 16:41:28 -04:00
Rahul R
3e9711d6a4 [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-05 02:06:04 +05:30
Rahul R
7bb9e30199 [ticket/10650] Corrected intendation
Corrected the intendation of if condition.

PHPBB3-10650
2012-04-05 01:19:46 +05:30
Oleg Pudeyev
7d6b289671 Merge branch 'develop-olympus' into develop
* develop-olympus:
  [ticket/10607] Added 'Powered by' translation string.

Conflicts:
	phpBB/adm/index.php
	phpBB/language/en/common.php
2012-04-04 15:33:51 -04:00
Oleg Pudeyev
21639d5d54 Merge remote-tracking branch 'Fyorl/ticket/10607' into develop-olympus
* Fyorl/ticket/10607:
  [ticket/10607] Added 'Powered by' translation string.
2012-04-04 15:22:00 -04:00
Rahul R
08bee4c522 [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-05 00:46:23 +05:30
Rahul R
663b5f6542 [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-05 00:46:14 +05:30
Rahul
1dd5b48434 [ticket/10650] Corrected space before true
Inserted a space before 'true' as per coding
guidelines.

PHPBB3-10650
2012-04-05 00:46:01 +05:30
Rahul
01e6254ccc [ticket/10650] Changed language files and forumlist
The entry in languages have been changed from
title to subject. Also the IF condition in forumlist_body.html
has been properly intented.

PHPBB3-10650
2012-04-05 00:45:50 +05:30
Rahul
fd409c49a5 [ticket/10650] Added static sql files
Ran create_schema_files.php and added
the generated static sql files to the commit.

PHPBB3-10650
2012-04-05 00:45:39 +05:30
Rahul
f32547c215 [ticket/10650] Displaying last topic on forum list
The most recent topic title of the forum can now
be displayed on the board index. An option is provided
in the ACP under the 'General Forum Setting' which
allows the admin to enable or disable this feature.

PHPBB3-10650
2012-04-05 00:45:26 +05:30
Fyorl
0ceb77fb99 [ticket/10607] Added 'Powered by' translation string.
Added POWERED_BY line to common.php and modified the templates
to use it.

PHPBB3-10607
2012-04-04 11:38:15 +08:00
Oleg Pudeyev
714fafe106 Merge branch 'develop-olympus' into develop
* develop-olympus:
  [ticket/10658] Do not fetch ranks into the $ranks array, it is no longer used.
  [ticket/10658] Use get_user_rank() for group ranks on group view.
2012-04-03 20:57:31 -04:00
Oleg Pudeyev
14e727b834 Merge remote-tracking branch 'bantu/ticket/10658' into develop-olympus
* bantu/ticket/10658:
  [ticket/10658] Do not fetch ranks into the $ranks array, it is no longer used.
  [ticket/10658] Use get_user_rank() for group ranks on group view.
2012-04-03 20:57:24 -04:00
Fyorl
0df3f1c5d0 [ticket/10508] Marked as read message now less specific.
Changed 'The selected forums have been marked read' to 'Forums
have been marked read'

PHPBB3-10508
2012-04-04 02:51:28 +08:00
Hari Sankar R
a84b97f58e [ticket/10561] Fixed syntax error and renamed return variables.
Renamed $style_verified to $style_is_active and fixed extra ';'.

PHPBB3-10561
2012-04-03 23:15:16 +05:30
Hari Sankar R
c5481371b9 [ticket/10561] Changes made to $db->sql_fetchrow().
Changed $db->sql_fetchrow() to $db->sql_fetchfield().

PHPBB3-10561
2012-04-03 23:04:56 +05:30
Hari Sankar R
b81a5afc25 [ticket/10561] Changes made to function phpbb_style_is_active().
Fixed return type, documented function and, removed
style_id from fetch.

PHPBB3-10561
2012-04-03 22:56:06 +05:30
Hari Sankar R
084e1ae560 [ticket/10561] All users can choose deactivated styles (fixed).
A form exploit enabled the users to select a deactivated
style. Fixed with extra check on submit, with a new function
styles_verify to check if the selected style is activated or not.

PHPBB3-10561
2012-04-03 22:15:59 +05:30
Vjacheslav Trushkin
e27326a57b [ticket/10752] Fixes for acp_styles
Adding form token, changing functions to public/protected, fixing few more errors

PHPBB3-10752
2012-04-03 14:26:38 +03:00
Vjacheslav Trushkin
f739d7acce [ticket/10752] Changing private to protected variables in acp_styles
Changing private to protected variables in acp_styles

PHPBB3-10752
2012-04-03 01:14:14 +03:00
Vjacheslav Trushkin
57065095d5 [ticket/10754] Changing $style to $phpbb_style
Renaming global variable $style to $phpbb_style

PHPBB3-10754
2012-04-03 00:41:56 +03:00
Vjacheslav Trushkin
a46b5480e1 [ticket/10752] More fixes for acp_styles
Fixing return doc blocks, spacing, incorrect sorting function and other minor fixes

PHPBB3-10752
2012-04-03 00:19:16 +03:00
Vjacheslav Trushkin
e558a3cb05 [ticket/10752] Pass-by-reference fix for acp_styles
Fixing pass-by-reference bug in acp_styles

PHPBB3-10752
2012-04-03 00:18:52 +03:00