n-aleha
edeeaa03c1
Merge branch 'ticket/12186' into ticket/12186a
2014-04-27 22:29:37 +03:00
Joas Schilling
9c689ef8dd
[ticket/11917] Replace space with tabs
...
PHPBB3-11917
2014-04-25 12:45:48 +02:00
Nils Adermann
6e85b2acc7
Merge remote-tracking branch 'github-nickvergessen/ticket/11917' into develop-ascraeus
...
* github-nickvergessen/ticket/11917:
[ticket/11917] Move OAuth Module to the bottom while installing
[ticket/11917] Hide OAuth UCP Module when OAuth is not the selected backend
Conflicts:
phpBB/install/install_install.php
2014-04-24 11:33:00 +02:00
n-aleha
5a91399dac
[ticket/12186] Move PM reports below post reports while installing
...
In mcp, move PM reports below post reports while installing.
PHPBB3-12186
2014-04-23 22:43:20 +03:00
Cesar G
607698c884
[ticket/10737] Add config setting to disable live searches.
...
PHPBB3-10737
2014-04-23 09:11:40 -07:00
Joas Schilling
ed07f1b85e
Merge pull request #2248 from Elsensee/ticket/12193
...
[ticket/12193] Fix broken HTML if SQL error occurs during migration
* Elsensee/ticket/12193:
[ticket/12193] Fix broken HTML if SQL error occurs during migration
2014-04-22 18:25:33 +02:00
Oliver Schramm
7cccd59cdc
[ticket/12193] Fix broken HTML if SQL error occurs during migration
...
PHPBB3-12193
2014-04-19 16:58:38 +02:00
Oliver Schramm
809054abfd
[ticket/8558] Add config in migrations and schema_data
...
PHPBB3-8558
2014-04-17 15:17:54 +02:00
n-aleha
6584f5eba6
[ticket/12191] Move notification options to bottom while installing
...
Move "ucp>board preferences>edit notification options" to bottom while
installing.
PHPBB3-12191
2014-04-14 00:02:28 +03:00
Joas Schilling
3d9b5aed46
[ticket/11917] Move OAuth Module to the bottom while installing
...
PHPBB3-11917
2014-04-12 11:50:55 +02:00
Andreas Fischer
2284e2897f
Merge branch 'develop-olympus' into develop-ascraeus
...
* develop-olympus:
[ticket/12381] Fix broken error message when selecting invalid DB driver
2014-04-10 15:44:47 +02:00
Oliver Schramm
87cfcda638
[ticket/12381] Fix broken error message when selecting invalid DB driver
...
PHPBB3-12381
2014-04-10 15:05:16 +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
Marc Alexander
808c5277a9
[ticket/12150] Remove 'after' for columns from migrations file
...
PHPBB3-12150
2014-04-03 11:07:58 +02:00
Matt Friedman
2b77dcfca6
[ticket/12337] Update jQuery to version 1.11.0
...
PHPBB3-12337
2014-03-31 21:09:47 -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
Marc Alexander
1812d3ce99
[ticket/12150] Update schema files for prune shadow topics
...
PHPBB3-12150
2014-03-30 13:06:18 +02:00
Oliver Schramm
df5761b370
[ticket/12324] Correctly create di container if config/ is missing from update/
...
PHPBB3-12324
2014-03-29 23:02:37 +01:00
Joas Schilling
47825a78ef
[ticket/11459] Move $supported_dbms to beginning of create schema file
...
PHPBB3-11459
2014-03-29 11:03:45 +01:00
Joas Schilling
f30b9dbfba
[ticket/11459] Fix missing constant CONFIG_TABLE for sql_create_index()
...
PHPBB3-11459
2014-03-29 11:03:44 +01:00
Joas Schilling
67737345f6
[ticket/11459] Install DB schema from json file
...
PHPBB3-11459
2014-03-29 11:03:42 +01:00
Joas Schilling
a63b229bec
[ticket/11459] Do not add table schema to database schema files
...
PHPBB3-11459
2014-03-29 11:03:40 +01:00
Joas Schilling
ac6f0c94bf
[ticket/11459] Refresh schema files
...
PHPBB3-11459
2014-03-29 11:00:19 +01:00
Joas Schilling
a20d2faa56
[ticket/11459] Update schema files with new script
...
The order of some tables and columns was changed
PHPBB3-11459
2014-03-29 10:58:14 +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
Patrick Webster
a2580687ee
[ticket/9725] Remove trailing spaces from MSSQL schema
...
PHPBB3-9725
2014-03-28 17:05:13 -05:00
Nils Adermann
02c4d4ee7e
Merge branch 'develop-olympus' into develop-ascraeus
...
* develop-olympus:
[ticket/12310] Don't autocomplete SMTP user/pass on install
2014-03-26 23:35:57 -04:00
Yuriy Rusko
dc9ae231e5
[ticket/12310] Don't autocomplete SMTP user/pass on install
...
PHPBB3-12310
2014-03-26 23:16:39 -04: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
Joas Schilling
cdbc1e8a5c
Merge remote-tracking branch 'vsephpbb/ticket/12274' into develop
...
* vsephpbb/ticket/12274:
[ticket/12274] Add core.js to the install footer
[ticket/12274] Fix broke/missing jQuery asset paths in update script
[ticket/12274] Load correct T_TEMPLATE_PATH during update
2014-03-16 23:05:24 +01:00
Matt Friedman
81ceefd889
[ticket/12274] Fix broke/missing jQuery asset paths in update script
...
PHPBB3-12274
2014-03-16 07:22:24 -07:00
Matt Friedman
fd6836ca8a
[ticket/12274] Load correct T_TEMPLATE_PATH during update
...
PHPBB3-12274
2014-03-15 20:44:56 -07:00
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
Joas Schilling
f852630ef3
Merge branch 'develop-olympus' into develop
...
* develop-olympus:
[ticket/12072] Fix comment about NEW MEMBERS permission
2014-03-14 14:36:29 +01:00
Oliver Schramm
647f976c30
[ticket/12072] Fix comment about NEW MEMBERS permission
...
PHPBB3-12072
2014-03-14 14:33:56 +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
e6f492c7ac
[ticket/12251] Enable displaying profile fields on memberlist, posts and pms
...
PHPBB3-12251
2014-03-06 12:02:11 +01:00
Joas Schilling
f0ac25f3c5
[ticket/12251] Deactivate outdated profile fields by default
...
PHPBB3-12251
2014-03-06 12:00:40 +01:00
Joas Schilling
d9c93337cc
[ticket/12251] Sort IM profile fields alphabetically
...
PHPBB3-12251
2014-03-06 12:00:01 +01:00
Joas Schilling
240eeec71d
[ticket/12236] Change order of profile fields for new installs
...
PHPBB3-12236
2014-03-05 22:40:54 +01:00
Joas Schilling
f2059f52f3
[ticket/12236] Move AOL Instant Messanger field to custom profile field
...
PHPBB3-12236
2014-03-05 22:13:22 +01:00
Joas Schilling
a1dab58f6d
[ticket/12237] Regenerate db schema files
...
PHPBB3-12237
2014-03-05 21:47:11 +01:00
Joas Schilling
2e5106aae1
[ticket/12237] Convert yahoo messanger to custom profile field
...
PHPBB3-12237
2014-03-05 21:38:57 +01:00
Joas Schilling
83a7e632b9
[ticket/12235] Convert WLM to custom profile field
...
PHPBB3-12235
2014-03-04 10:19:08 +01:00
Joas Schilling
a3627a9ff7
[ticket/12187] Remove user_website field
...
PHPBB3-12187
2014-03-04 08:25:36 +01:00
Joas Schilling
5b1fbfb2f2
[ticket/12187] Remove user_website functionality
...
PHPBB3-12187
2014-03-03 20:01:19 +01:00
Joas Schilling
e750d71f84
[ticket/12187] Convert website field data to custom profile field
...
PHPBB3-12187
2014-03-03 12:38:55 +01:00