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

13345 Commits

Author SHA1 Message Date
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
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
Nils Adermann
ef297ec63e Merge remote-tracking branch 'github-bantu/ticket/10774' into develop-olympus
* github-bantu/ticket/10774:
  [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:04 +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
Andreas Fischer
41ef41ac63 [ticket/10774] Add unit tests for UNIQUE index existence and creation.
PHPBB3-10774
2012-04-10 00:46:24 +02:00
Shibu Lijack
fa04c3712b [ticket/10734] Moved style elements and fixed minor bugs
Moved color related style elements to colours.css and other elements to
common.css
Also added an empty display for corners span.
Removed unwanted space in mcp_topic
Removed DS_Store

PHPBB-10734
2012-04-09 18:43:54 +05:30
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
Rahul R
6661c92dd3 [ticket/10650] Added apostrophe in explanation in language file
A missing apostrophe was added to the language file entry
of DISPLAY_LAST_SUBJECT_EXPLAIN

PHPBB3-10650
2012-04-09 03:22:35 +05:30
Rahul R
db275d0a90 [ticket/10650] Inserted correct utf ELLIPSIS character
Inserted the correct utf-8 ellipsis to the language file.

PHPBB3-10650
2012-04-09 02:51:18 +05:30
Rahul R
303748b02d [ticket/10650] Added space after if and comment
Added space in proper places in database_update.php. Also
corrected language entry of ELLIPSIS to utf8

PHPBB3-10650
2012-04-09 01:43:44 +05:30
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
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
dd3b8e74b3 [ticket/10650] Added href title to subject link
Added title attribute to anchor tag which displays
last_post_subject so that the full subject can be
seen by hovering over the truncated subject displayed
in forumlist.

PHPBB3-10650
2012-04-08 12:45:51 +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
b6957aa525 [ticket/10650]Removed incorrect newline
Deleted additional line in the end of database_update.php

PHPBB3-10650
2012-04-08 10:34:54 +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
Rahul
492c27a693 [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-08 10:32:59 +05:30
Rahul
668e47721c [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-08 10:32:40 +05:30
Rahul
9b30bd6392 [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-08 10:32:19 +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
Oleg Pudeyev
a14d00b8e9 Merge PR #718 branch 'NeoAdonis/ticket/10764' into develop-olympus
* NeoAdonis/ticket/10764:
  [ticket/10764] FAQ now mentions Area51 instead of SourceForge
  [ticket/10764] FAQ now mentions GitHub instead of SourceForge
2012-04-07 22:14:48 -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
Oleg Pudeyev
2b2286a46c [ticket/10605] Fix left join usage.
Previously this produced broken SQL:

SELECT p.msg_id FROM phpbb_privmsgs p
LEFT JOIN 0 phpbb_privmsgs_to ON (p.msg_id = t.msg_id)
WHERE t.user_id IS NULL LIMIT 500 OFFSET 0

PHPBB3-10605
2012-04-05 17:35:27 -04:00
Oleg Pudeyev
de1e343c5b [ticket/10605] Add a section for updating from 3.0.10 to schema updates.
Without it data updates do not appear to be run.

PHPBB3-10605
2012-04-05 17:34:54 -04:00
Oleg Pudeyev
03e382f99c [ticket/10605] Fix syntax error in database updater.
PHPBB3-10605
2012-04-05 17:34:37 -04: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