1
0
mirror of https://github.com/phpbb/phpbb.git synced 2025-02-24 20:13:22 +01:00

757 Commits

Author SHA1 Message Date
Joas Schilling
c2dace762e [ticket/12273] Fix long $vars lines for existing events
PHPBB3-12273
2014-04-24 17:26:27 +02:00
Joas Schilling
b0a9acd8ff [ticket/12273] Use array_merge instead of +=
PHPBB3-12273
2014-04-24 17:14:12 +02:00
Joas Schilling
a2c3b2534a [ticket/12273] Fix method name of test and fix undefined index
PHPBB3-12273
2014-04-24 16:51:41 +02:00
Joas Schilling
7dc32a45e5 [ticket/12273] Verify the result of the .md file to the source
PHPBB3-12273
2014-04-24 16:51:40 +02:00
Joas Schilling
f676f50c22 [ticket/12273] Only check selected files
PHPBB3-12273
2014-04-24 16:51:39 +02:00
Joas Schilling
c7dcc6d700 [ticket/12273] Verify that the events are still in the named files
PHPBB3-12273
2014-04-24 16:51:37 +02:00
Joas Schilling
bc1ab3dc79 [ticket/12273] Fix missing space in some Exceptions
PHPBB3-12273
2014-04-20 15:11:23 +02:00
Joas Schilling
08cce5fba5 [ticket/12273] Remove duplicated code
PHPBB3-12273
2014-04-20 14:58:24 +02:00
Joas Schilling
6849e8b36f [ticket/12273] Add file line to exception message
PHPBB3-12273
2014-04-20 14:57:18 +02:00
Joas Schilling
b83a555da5 [ticket/12273] Move phpBB test to new file and use a data provider
PHPBB3-12273
2014-04-20 14:28:09 +02:00
Joas Schilling
8ddc9ff185 [ticket/12273] Allow multiple $vars lines
PHPBB3-12273
2014-04-20 14:15:54 +02:00
Joas Schilling
1a913d6e0f [ticket/12273] Do not use Inline control structures
PHPBB3-12273
2014-04-18 14:05:38 +02:00
Joas Schilling
9ba9a024d6 [ticket/12273] Make event exporter compatible with php 5.3.3
PHPBB3-12273
2014-04-18 13:07:39 +02:00
Joas Schilling
17a1ed6fb5 [ticket/12273] Move MD Exporter to separate file
PHPBB3-12273
2014-04-18 12:57:30 +02:00
Joas Schilling
6da52acb3c [ticket/12273] Rename exporter to php_exporter
PHPBB3-12273
2014-04-18 12:57:23 +02:00
Joas Schilling
3352d9fd34 [ticket/12273] Move event exporter to namespace
PHPBB3-12273
2014-04-18 12:57:13 +02:00
Cesar G
3d1a07f8f0 [ticket/12121] Preserve link redirect counts when updating from 3.0.x.
PHPBB3-12121
2014-04-15 21:15:54 -07:00
Andreas Fischer
41db97ad3a Merge branch 'develop-olympus' into develop-ascraeus
* develop-olympus:
  [ticket/12397] Fix sql_unique_index_exists doc block
2014-04-15 23:59:56 +02:00
Andreas Fischer
7d4be1fe19 Merge pull request #2286 from nickvergessen/ticket/12388
[ticket/12388] Fix translation of log entries without additional log data

* nickvergessen/ticket/12388:
  [ticket/12388] Add tests for lang() use on log actions without data
  [ticket/12388] Fix translation of log entries without additional log data
2014-04-15 11:38:21 +02:00
Marc Alexander
5dc3651290 [ticket/12004] Support empty routes to app.php/ in path_helper
The symfony routing component allows us to use the path "/" for routes.
Therefore, we should be able to use example.com/app.php/ for controllers.
However, this currently does not properly work. The method get_web_root_path
incorrectly returns phpbb_root_path. Therefore, paths to images or files are
broken.

PHPBB3-12004
2014-04-11 17:21:30 +02:00
Joas Schilling
d3f378d1d6 [ticket/12388] Fix translation of log entries without additional log data
PHPBB3-12388
2014-04-11 09:08:46 +02:00
Nils Adermann
497d81af68 Merge remote-tracking branch 'github-nickvergessen/ticket/12113' into develop-ascraeus
* github-nickvergessen/ticket/12113:
  [ticket/12113] Fix view_log() tests
  [ticket/12113] Correctly use plurals when deleting user warnings
  [ticket/12113] Allow log entries to use plurals
2014-04-10 14:22:36 -07:00
Nils Adermann
0ad9833668 Merge remote-tracking branch 'github-nickvergessen/ticket/12331' into develop-ascraeus
* github-nickvergessen/ticket/12331:
  [ticket/12331] Add functional test for saving custom profile fields
  [ticket/12331] Fix SQL error when inserting a new entry to profile field data
2014-04-10 14:14:30 -07:00
Nils Adermann
7a947b247d Merge remote-tracking branch 'github-nickvergessen/ticket/12282' into develop-ascraeus
* github-nickvergessen/ticket/12282:
  [ticket/12282] Update new references
  [ticket/12282] Update container db mock
  [ticket/12282] Add new line at EOF of the interface
  [ticket/12282] Use interface for type hinting
  [ticket/12282] Use {@inheritDoc} for inherited methods
  [ticket/12282] Add Interface for DBAL drivers
2014-04-10 14:04:43 -07:00
Cesar G
a8ec1905e1 [ticket/12356] Assign vars preventing Plupload from loading in PM editor.
PHPBB3-12356
2014-04-09 11:38:14 -07:00
Dhruv
634e5cae0f Merge remote-tracking branch 'nickvergessen/ticket/12349' into develop-ascraeus
# By Joas Schilling
# Via Joas Schilling
* nickvergessen/ticket/12349:
  [ticket/12349] Fix Sniffer for @license tag
  [ticket/12349] Update license header in several new files
2014-04-08 02:27:32 +05:30
Joas Schilling
6c6916dc7d Merge remote-tracking branch 'Marc/ticket/12362' into develop-ascraeus
* Marc/ticket/12362:
  [ticket/12362] Do not use database test case as it's not needed
  [ticket/12362] Add tests for schema generator
  [ticket/12362] Throw exception in schema generator on unresolvable dependency
2014-04-07 22:42:42 +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
904de5b39a [ticket/12362] Throw exception in schema generator on unresolvable dependency
Make sure we throw an exception in the schema generator if we come across an
unresolvable dependency. Otherwise we'll get stuck in a infinite loop that
needs to be cancelled by the user or the maximum execution time.

PHPBB3-12362
2014-04-06 14:50:22 +02:00
Marc Alexander
e83c6cb61d [ticket/12150] Use correct license URL in prune shadow migrations file
PHPBB3-12150
2014-04-05 11:14:41 +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
Joas Schilling
0a586258a2 [ticket/12349] Update license header in several new files
PHPBB3-12349
2014-04-03 15:42:36 +02:00
Marc Alexander
808c5277a9 [ticket/12150] Remove 'after' for columns from migrations file
PHPBB3-12150
2014-04-03 11:07:58 +02:00
Joas Schilling
668f248c4d [ticket/12113] Allow log entries to use plurals
PHPBB3-12113
2014-04-01 22:43:07 +02:00
Joas Schilling
3656fa3026 [ticket/12282] Update new references
PHPBB3-12282
2014-04-01 19:19:52 +02:00
Joas Schilling
94a0331603 [ticket/12282] Add new line at EOF of the interface
PHPBB3-12282
2014-04-01 19:17:41 +02:00
Joas Schilling
11a9104b8a [ticket/12282] Use interface for type hinting
PHPBB3-12282
2014-04-01 19:17:41 +02:00
Joas Schilling
1f28451d58 [ticket/12282] Use {@inheritDoc} for inherited methods
PHPBB3-12282
2014-04-01 19:17:40 +02:00
Joas Schilling
7b131119e6 [ticket/12282] Add Interface for DBAL drivers
PHPBB3-12282
2014-04-01 19:17:39 +02:00
Matt Friedman
025779ac62 [ticket/12337] Fix jQuery update migration file
PHPBB3-12337
2014-04-01 06:50:00 -07: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
fdbe5e2f42 [prep-release-3.1.0-b2] Add migration for 3.1.0-b2 2014-03-30 22:08:11 +02:00
Joas Schilling
86c4d24a8a [ticket/12331] Fix SQL error when inserting a new entry to profile field data
There was a "Field 'pf_phpbb_interests' doesn't have a default value" error,
because we didn't specify values for the disabled fields.
We can not disable the sql_return_on_error() thou, because it otherwise we run
into "Duplicate entry '2' for key 'PRIMARY'" errors when the user submits the
form again but didn't change any values.

PHPBB3-12331
2014-03-30 15:59:51 +02:00
Oliver Schramm
55c1b49bed [ticket/12330] Fix create index in db tools on mssql
PHPBB3-12330
2014-03-30 15:42:04 +02:00
Marc Alexander
a7c037520b Merge branch 'develop-ascraeus' of https://github.com/phpbb/phpbb into ticket/12150 2014-03-30 12:35:40 +02:00
Marc Alexander
494dd4110b [ticket/12150] Use log service instead of add_log() function
PHPBB3-12150
2014-03-29 22:16:25 +01: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
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
a7abf8218d [ticket/12150] Add prune columns to schema files and migration file
PHPBB3-12150
2014-03-29 21:56:14 +01:00