Commit graph

8499 commits

Author SHA1 Message Date
Joas Schilling
3315702b5f [ticket/12370] Do not delete topic notifications when the topic is visible
We should only delete the topic notifications, when the topic is not approved
anymore. This happens, when the post was the last approved but is now
unapproved because the user is on queue, or when it has been softdeleted while
editing.

PHPBB3-12370
2014-04-07 19:13:32 +02:00
Joas Schilling
f0176b5393 Merge remote-tracking branch 'Marc/ticket/12150' into develop-ascraeus
* Marc/ticket/12150:
  [ticket/12150] Use correct license URL in prune shadow migrations file
  [ticket/12150] Remove 'after' for columns from migrations file
  [ticket/12150] Update schema files for prune shadow topics
  [ticket/12150] Use log service instead of add_log() function
  [ticket/12150] Use shorter column names for prune settings
  [ticket/12150] Add functional tests for pruning shadow topics
  [ticket/12150] Add missing space to query for shadow topics
  [ticket/12150] Add missing prune settings variables in acp_forums
  [ticket/12150] Add file and caller for pruning shadow topics
  [ticket/12150] Add prune columns to schema files and migration file
  [ticket/12150] Add options to acp
2014-04-06 22:26:27 +02:00
Joas Schilling
1b16b8cd42 Merge remote-tracking branch 'Marc/ticket/10851-ascraeus' into develop-ascraeus
* Marc/ticket/10851-ascraeus:
  [ticket/10851] Request index instead of logging in and out in tests
  [ticket/10851] Add unit and functional tests for checking attachments
  [ticket/10851] Set disallowed content to empty array if checking is disabled
2014-04-05 10:00:40 +02:00
Joas Schilling
ced48a51a4 Merge remote-tracking branch 'Elsensee/ticket/7707' into develop-ascraeus
* Elsensee/ticket/7707:
  [ticket/7707] Fix undefined variable: perm_from
  [ticket/7707] Add comma to last entry of arrays
  [ticket/7707] Remove unnecessary variables
  [ticket/7707] Add get_username_string() once more
  [ticket/7707] Remove unnecessary variables
  [ticket/7707] Add get_username_string() where possible
2014-04-05 09:54:14 +02:00
Oliver Schramm
8f525e1ef5 [ticket/7707] Fix undefined variable: perm_from
PHPBB3-7707
2014-04-04 23:48:14 +02:00
Joas Schilling
1a3a296558 Merge remote-tracking branch 'paybas/ticket/12339' into develop-ascraeus
* paybas/ticket/12339:
  [ticket/12339] removed return var
  [ticket/12339] more complete params and updated _since version
  [ticket/12339] Add Event core.page_header_after
2014-04-04 23:21:18 +02:00
PayBas
084e6725f7 [ticket/12339] removed return var
need to learn more about events... evidently

PHPBB3-12339
2014-04-04 18:26:20 +02:00
Joas Schilling
82fa935d5d Merge remote-tracking branch 'vsephpbb/ticket/11962' into develop-ascraeus
* vsephpbb/ticket/11962:
  [ticket/11962] Resize posted images to fit and give them a class
2014-04-04 18:25:01 +02:00
Joas Schilling
9bfada03f3 Merge branch 'develop-olympus' into develop-ascraeus
* develop-olympus:
  [ticket/12353] Fix displayed attachments in ACP
2014-04-04 17:40:18 +02:00
Oliver Schramm
744b39e6c4 [ticket/12353] Fix displayed attachments in ACP
PHPBB3-12353
2014-04-04 17:07:54 +02:00
PayBas
c6c5f7c874 [ticket/12339] more complete params and updated _since version
PHPBB3-12339
2014-04-04 13:45:57 +02:00
Marc Alexander
e4e3df0b37 Merge branch 'ticket/10851' into ticket/10851-ascraeus 2014-04-04 11:48:17 +02:00
Marc Alexander
519adb5060 [ticket/10851] Set disallowed content to empty array if checking is disabled
The disallowed content defaults to a standard set of mimetype triggers by
default. If one doesn't want to check the attachments mimetype triggers then
we need to set the disallowed content to an empty array.

PHPBB3-10851
2014-04-03 16:06:46 +02:00
Joas Schilling
b567c0a9e2 Merge remote-tracking branch 'vsephpbb/ticket/12043' into develop-ascraeus
* vsephpbb/ticket/12043:
  [ticket/12043] Fix order of disabled extensions in unit tests
  [ticket/12043] Correct try/catch exceptions for invalid extensions
  [ticket/12043] Sort Extensions by Display Name in ACP Extension mananger
2014-04-03 15:06:28 +02:00
Oliver Schramm
908057301c [ticket/7707] Add comma to last entry of arrays
PHPBB3-7707
2014-04-01 22:03:59 +02:00
PayBas
205e098b38 [ticket/12339] Add Event core.page_header_after
PHPBB3-12339
2014-04-01 14:25:40 +02:00
Joas Schilling
ba84268d4e Merge remote-tracking branch 'crizz0/ticket/9758' into develop-ascraeus
* crizz0/ticket/9758:
  [ticket/9758] Clickable avatar in header and renamed class for avatar-img
  [ticket/9758] Remove unnessary if-question for include functions_display
  [ticket/9758] Slims the line 4775 in includes/functions.php
  [ticket/9758] Adds id and changes filter to fix travis CI test
  [ticket/9758] Removed the needless space after first ENDIF
  [ticket/9758] Adding impr. for overall_header display of avatar and username
  [ticket/9758] Fixed bug in mcp_warn.php
  [ticket/9758] Optimises the html code of avatar image in header
  [ticket/9758] Error because of missing functions_display.php fixed
  [ticket/9758] Removed useless if-conditions to include functions.php
  [ticket/9758] Changes class name of new "span" in overall_header.html
  [ticket/9758] Adds global template variable CURRENT_USER_AVATAR
2014-03-31 20:29:45 +02:00
Matt Friedman
8ee37def81 [ticket/11962] Resize posted images to fit and give them a class
PHPBB3-11962
2014-03-30 14:19:16 -07:00
Joas Schilling
45f2efea19 [prep-release-3.1.0-b2] Prepare development of 3.1.0-b3 2014-03-30 22:53:09 +02:00
Joas Schilling
254b7739a8 [prep-release-3.1.0-b2] Update version to 3.1.0-b2 2014-03-30 22:08:10 +02:00
Crizzo
fa6c1044b8 [ticket/9758] Clickable avatar in header and renamed class for avatar-img
PHPBB3-9758
2014-03-30 19:13:14 +02:00
Marc Alexander
d83d819827 [ticket/12150] Use shorter column names for prune settings
All columns were renamed from having prune_shadow_topics as namebase to just
prune_shadow.
A missing column was also added to the migration file's remove_schema() method.

PHPBB3-12150
2014-03-29 22:14:58 +01:00
Marc Alexander
76b7355b87 [ticket/12150] Add missing space to query for shadow topics
PHPBB3-12150
2014-03-29 21:57:09 +01:00
Marc Alexander
d97c58aeea [ticket/12150] Add missing prune settings variables in acp_forums
PHPBB3-12150
2014-03-29 21:57:00 +01:00
Marc Alexander
02fdae4e88 [ticket/12150] Add file and caller for pruning shadow topics
PHPBB3-12150
2014-03-29 21:56:53 +01:00
Marc Alexander
3c7ff1c417 [ticket/12150] Add options to acp
PHPBB3-12150
2014-03-29 21:49:31 +01:00
Nils Adermann
308e8b0c96 Merge remote-tracking branch 'github-nickvergessen/ticket/11459' into develop-ascraeus
* github-nickvergessen/ticket/11459: (21 commits)
  [ticket/11459] Make 3.1.0-dev migration depend on migrations_table
  [ticket/11459] Move $supported_dbms to beginning of create schema file
  [ticket/11459] Fix missing constant CONFIG_TABLE for sql_create_index()
  [ticket/11459] Fix auth provider test
  [ticket/11459] Correctly set up the database from schema in unit tests
  [ticket/11459] Install DB schema from json file
  [ticket/11459] Clean up a little more
  [ticket/11459] Do not add table schema to database schema files
  [ticket/11459] Create schema.json from migration files
  [ticket/11459] Do not take files of extensions into account
  [ticket/11459] Pass array with migration class names to schema generator
  [ticket/11459] Refresh schema files
  [ticket/11459] Remove spaces from the end of lines in MSSQL
  [ticket/11459] Correctly handle index column length
  [ticket/11459] Add migration for migrations table
  [ticket/11459] Update doc blocks
  [ticket/11459] Remove old schema file
  [ticket/11459] Update schema files with new script
  [ticket/11459] Use new migration/schema_generator to create schema files
  [ticket/11459] Add Schema from 3.0.0
  ...
2014-03-29 16:29:33 -04:00
Joas Schilling
f426fa0295 Merge remote-tracking branch 'prototech/ticket/11959' into develop-ascraeus
* prototech/ticket/11959:
  [ticket/11959] Move phpbb_generate_string_list() to functions_content.php.
  [ticket/11959] Add unit tests.
  [ticket/11959] Remove use of plurals and make it possible to use Oxford comma.
  [ticket/11959] Rename phpbb_gen_string_list() & fix incorrect var name.
  [ticket/11959] Simplify how the users are trimmed.
  [ticket/11959] Add function to create a string list.
  [ticket/11959] Add samples for the untrimmed strings.
  [ticket/11959] List the last user with "and" instead of a comma.
  [ticket/11959] Use the plurals system for the untrimmed language strings.
  [ticket/11959] Fix the NOTIFICATION_QUOTE_TRIMMED text.
  [ticket/11959] Use plurals for the language strings.
2014-03-29 20:39:22 +01:00
Matt Friedman
2024c5adc2 [ticket/12043] Correct try/catch exceptions for invalid extensions
PHPBB3-12043
2014-03-29 11:09:27 -07:00
Matt Friedman
bf2aca6f8b [ticket/12043] Sort Extensions by Display Name in ACP Extension mananger
PHPBB3-12043
2014-03-29 10:47:09 -07:00
Cesar G
b893dae105 [ticket/11959] Move phpbb_generate_string_list() to functions_content.php.
PHPBB3-11959
2014-03-29 09:32:04 -07:00
Joas Schilling
fd16a50baf Merge remote-tracking branch 'vsephpbb/ticket/12300' into develop-ascraeus
* vsephpbb/ticket/12300:
  [ticket/12300] Make only red topic/forum row icons clickable to unread posts
  [ticket/12300] Fix broken link to last post in topic subscriptions list
  [ticket/12300] Fix alignment of clickable icons
  [ticket/12300] Make all topic row icons clickable
  [ticket/12300] Rename new class for row icon links
  [ticket/12300] Make topic icon links clickable to newest unread posts
  [ticket/12300] Revert topic title links back to default behavior
2014-03-29 11:09:33 +01:00
Joas Schilling
5e8341c395 [ticket/11459] Remove old schema file
PHPBB3-11459
2014-03-29 10:58:15 +01:00
Joas Schilling
70a2110223 Merge branch 'develop-olympus' into develop-ascraeus
* develop-olympus:
  [ticket/9725] Code sniffer fixes
  [ticket/9725] Do not use deprecated views to remove default constraints
  [ticket/9725] Move primary key creation to the correct location
  [ticket/9725] Remove trailing spaces from MSSQL schema
  [ticket/9725] Create MSSQL primary keys if none exist
  [ticket/9725] Remove explicit filegroup designations
  [ticket/9725] Fetch Azure db stats from proper table
  [ticket/9725] Add dummy indexes for Azure
  [ticket/9725] Create an Azure SQL compatible Schema

Conflicts:
	phpBB/install/schemas/mssql_schema.sql
2014-03-29 10:50:18 +01:00
Joas Schilling
4e8aef7cd6 Merge remote-tracking branch 'noxwizard/ticket/naderman/9725' into develop-olympus
* noxwizard/ticket/naderman/9725:
  [ticket/9725] Code sniffer fixes
  [ticket/9725] Do not use deprecated views to remove default constraints
  [ticket/9725] Move primary key creation to the correct location
  [ticket/9725] Remove trailing spaces from MSSQL schema
  [ticket/9725] Create MSSQL primary keys if none exist
  [ticket/9725] Remove explicit filegroup designations
  [ticket/9725] Fetch Azure db stats from proper table
  [ticket/9725] Add dummy indexes for Azure
  [ticket/9725] Create an Azure SQL compatible Schema
2014-03-29 10:43:09 +01:00
Matt Friedman
96ac2790fc [ticket/12300] Make only red topic/forum row icons clickable to unread posts
PHPBB3-12300
2014-03-28 20:54:49 -07:00
Patrick Webster
79492d4110 [ticket/9725] Code sniffer fixes
PHPBB3-9725
2014-03-28 17:07:50 -05:00
Patrick Webster
aaa846cb3a [ticket/9725] Do not use deprecated views to remove default constraints
PHPBB3-9725
2014-03-28 17:05:37 -05:00
Patrick Webster
31e610f0b1 [ticket/9725] Move primary key creation to the correct location
PHPBB3-9725
2014-03-28 17:05:25 -05:00
Patrick Webster
83be990701 [ticket/9725] Create MSSQL primary keys if none exist
PHPBB3-9725
2014-03-28 17:04:56 -05:00
Patrick Webster
68ae8dfa97 [ticket/9725] Remove explicit filegroup designations
PHPBB3-9725
2014-03-28 17:04:41 -05:00
Patrick Webster
80a844d38c [ticket/9725] Fetch Azure db stats from proper table
PHPBB3-9725
2014-03-28 17:04:29 -05:00
Crizzo
76558fbce5 [ticket/11336] Changes "leaders"-mode to "team"-mode and so in test-file
PHPBB3-11336
2014-03-28 19:36:08 +01:00
Crizzo
cde4070b19 [ticket/9758] Remove unnessary if-question for include functions_display
PHPBB3-9758
2014-03-28 19:26:56 +01:00
Crizzo
4f2a512052 [ticket/9758] Slims the line 4775 in includes/functions.php
PHPBB3-9758
2014-03-28 19:26:53 +01:00
Crizzo
175d83146e [ticket/9758] Adding impr. for overall_header display of avatar and username
PHPBB3-9758
2014-03-28 19:12:36 +01:00
Crizzo
aa6077c150 [ticket/9758] Fixed bug in mcp_warn.php
PHPBB3-9758
2014-03-28 19:12:35 +01:00
Crizzo
9d568986ad [ticket/9758] Error because of missing functions_display.php fixed
PHPBB3-9758
2014-03-28 19:12:32 +01:00
Crizzo
0d4968f735 [ticket/9758] Removed useless if-conditions to include functions.php
PHPBB3-9758
2014-03-28 19:12:31 +01:00
Crizzo
ddbdde53ab [ticket/9758] Adds global template variable CURRENT_USER_AVATAR
PHPBB3-9758
2014-03-28 19:12:28 +01:00