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

8467 Commits

Author SHA1 Message Date
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
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
Joas Schilling
6af942740c Merge remote-tracking branch 'geetakshi/ticket/11360' into develop-ascraeus
* geetakshi/ticket/11360:
  [ticket/11360] Updating default value of $display_online_list
  [ticket/11360] Avoiding online list where not required
  [ticket/11360] Change second parameter in page_header function
2014-03-28 17:07:16 +01:00
geetakshi
76f7ef5c83 [ticket/11360] Updating default value of $display_online_list
PHPBB3-11360
2014-03-24 00:12:40 +05:30
Joas Schilling
13eb0ec5b9 Merge branch 'develop-olympus' into develop-ascraeus
* develop-olympus:
  [ticket/12035] Correcting the condition
  [ticket/12035] Adding necessary conditions
  [ticket/12035] Adding link to user posts to ACP page

Conflicts:
	phpBB/adm/style/acp_users_overview.html
2014-03-22 15:13:41 +01:00
Matt Friedman
e4f6d9bc90 [ticket/12292] Improve style details page
http://tracker.phpbb.com/browse/PHPBB3-12292
Gave style details page a proper heading and back button.
Also removed a few obsolete code leftovers in the style
and CSS.

PHPBB3-12292
2014-03-20 18:11:45 -07:00
geetakshi
663eb74cf3 [ticket/12035] Correcting the condition
PHPBB3-12035
2014-03-20 14:17:03 +05:30
Dhruv Goel
7f5d8becad Merge pull request #2137 from geetakshi/ticket/8309
[ticket/8309] Rename "Last visited" to "Last activity" on memberlist/viewprofile
2014-03-20 03:44:39 +05:30
geetakshi
5316c32b10 [ticket/12035] Adding necessary conditions
PHPBB3-12035
2014-03-20 03:36:53 +05:30
Joas Schilling
997ad65062 Merge remote-tracking branch 'Elsensee/ticket/11169' into develop
* Elsensee/ticket/11169:
  [ticket/11169] Skip migration if "Users" category has been deleted
  [ticket/11169] Move module 'prune users' to users category
2014-03-19 21:35:08 +01:00
geetakshi
9a3011c2dd [ticket/8309] Changing $last_activity to $last_active
PHPBB3-8309
2014-03-20 01:48:52 +05:30
geetakshi
18bed2ea47 [ticket/11360] Change second parameter in page_header function
PHPBB3-11360
2014-03-19 19:55:55 +05:30
Cesar G
7c1ab5f79d [ticket/11959] Remove use of plurals and make it possible to use Oxford comma.
PHPBB3-11959
2014-03-19 03:08:34 -07:00
Cesar G
3da1f6d989 [ticket/11959] Rename phpbb_gen_string_list() & fix incorrect var name.
PHPBB3-11959
2014-03-19 03:08:33 -07:00
Cesar G
f0a85a90cc [ticket/11959] Add function to create a string list.
PHPBB3-11959
2014-03-19 03:08:33 -07:00
Joas Schilling
1af7697143 Merge remote-tracking branch 'prototech/ticket/12160' into develop
* prototech/ticket/12160:
  [ticket/12160] Use phpbb_check_installation_exists() in the other modules.
  [ticket/12160] Move phpbb_check_installation_exists() to functions_install.php
  [ticket/12160] Check if phpBB is installed before creating phpBB container.
  [ticket/12160] Add function to check if phpBB is installed.
2014-03-18 11:00:43 +01:00
geetakshi
66ed9881df [ticket/8309] Removing key with similar function to avoid redundancy
PHPBB3-8309
2014-03-17 21:08:03 +05:30
Joas Schilling
f9438bcbf7 Merge branch 'ticket/11239' of github.com:geetakshi/phpbb into develop
# By geetakshi
# Via geetakshi
* 'ticket/11239' of github.com:geetakshi/phpbb:
  [ticket/11239] Removing hard-coded, language specific possessive
  [ticket/11239] Including username before Overview title
2014-03-16 23:30:54 +01:00
geetakshi
418034af0e [ticket/12035] Adding link to user posts to ACP page
Adding link of posts behind displayed number of posts of the user

PHPBB3-12035
2014-03-17 00:52:11 +05:30
geetakshi
4d191f254d [ticket/11239] Removing hard-coded, language specific possessive
PHPBB3-11239
2014-03-16 15:36:47 +05:30
Oliver Schramm
fac814f8e7 [ticket/11169] Move module 'prune users' to users category
PHPBB3-11169
2014-03-16 02:53:01 +01:00
geetakshi
0bf758f00f [ticket/8309] Rename $last_visit to $last_activity
PHPBB3-8309
2014-03-16 03:37:21 +05:30
geetakshi
8c4604a78e [ticket/8309] Renaming "Last visit" to "Last activity"
PHPBB3-8309
2014-03-16 03:32:08 +05:30
geetakshi
7647b51d5d [ticket/11239] Including username before Overview title
Adding username to the page title to avoid confusion while managing
multiple users in ACP

PHPBB3-11239
2014-03-16 02:12:50 +05:30
Joas Schilling
9be5405e5b [prep-release-3.1.0-b1] Update build version to 3.1.0-b2-dev 2014-03-15 17:32:07 +01:00
Joas Schilling
407e0dbd8b [prep-release-3.1.0-b1] Update version to 3.1.0-b1 2014-03-15 15:37:21 +01:00
Maël Soucaze
e1278320a2 [ticket/12272] Fix hardcoded colons in subforums.
In subforums list, under the parent forum description, there are two
harcoded colons instead of {L_COLON}.

PHPBB3-12272
2014-03-15 14:25:11 +01:00
Joas Schilling
0aa23d203e Merge remote-tracking branch 'EXreaction/ticket/9871-2' into develop
* EXreaction/ticket/9871-2:
  [ticket/9871] Can set current version to use instead of the phpBB version
  [ticket/9871] Fix indentation on comment
  [ticket/9871] Fix test name
  [ticket/9871] Split fast and slow version tests
  [ticket/9871] Option to force the stability when checking for updates
  [ticket/9871] Allow setting the host/file to load for the version class
  [ticket/9871] Restore get_remote_file_test
  [ticket/9871] Fix tests
  [ticket/9871] Typehint and comment on var types
  [ticket/9871] Mark test as slow
  [ticket/9871] Restore phpbb_version_compare
  [ticket/9871] Restore get_remote_file
  [ticket/9871] Use $request->variable instead of request_var
  [ticket/9871] Update version check file to use json format
2014-03-14 14:04:30 +01:00
Joas Schilling
bdce7abc84 Merge remote-tracking branch 'marcosbc/ticket/12247' into develop-olympus
* marcosbc/ticket/12247:
  [ticket/12247] Makes static usernames work
  [ticket/12247] Add ['username'] to mcp_queue.php's user_notification()
2014-03-14 13:58:17 +01:00
Joas Schilling
7b08a483fd Merge branch 'develop-olympus' into develop
* develop-olympus:
  [ticket/12202] Use an array in the data provider instead of exploding manually
  [ticket/12202] Can't call htmlspecialchars before checking for quotes
  [ticket/12202] Fix tests
  [ticket/12202] Test for parse_cfg_file
  [ticket/12202] Use copyright symbol in style.cfg files
  [ticket/12202] Apply htmlspecialchars to style.cfg data

Conflicts:
	phpBB/styles/prosilver/style.cfg
	phpBB/styles/subsilver2/style.cfg
2014-03-14 13:55:53 +01:00
Joas Schilling
943e4e35ee Merge remote-tracking branch 'exreaction/ticket/12202' into develop-olympus
* exreaction/ticket/12202:
  [ticket/12202] Use an array in the data provider instead of exploding manually
  [ticket/12202] Can't call htmlspecialchars before checking for quotes
  [ticket/12202] Fix tests
  [ticket/12202] Test for parse_cfg_file
  [ticket/12202] Use copyright symbol in style.cfg files
  [ticket/12202] Apply htmlspecialchars to style.cfg data
2014-03-14 13:53:55 +01:00
Dhruv Goel
287c2b95ee Merge pull request #2126 from nickvergessen/ticket/forumhulp/12241
[ticket/12241] Event to add and/or modify acp_board configurations
2014-03-14 18:00:14 +05:30