1
0
mirror of https://github.com/phpbb/phpbb.git synced 2025-05-31 03:29:23 +02:00

20606 Commits

Author SHA1 Message Date
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
be48d12583 [ticket/12273] Fix Markdown layout
PHPBB3-12273
2014-04-18 13:07:41 +02:00
Joas Schilling
8f57880edb [ticket/12273] Fix missing $vars line
PHPBB3-12273
2014-04-18 13:07:41 +02:00
Joas Schilling
7b53210926 [ticket/12273] Fix invalid @event and @since tags
PHPBB3-12273
2014-04-18 13:07:40 +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
3566325874 [ticket/12273] Fix export script
PHPBB3-12273
2014-04-18 12:57: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
Joas Schilling
d213e09a40 [ticket/12273] Crawl the phpBB directory for events
PHPBB3-12273
2014-04-18 12:57:06 +02:00
Joas Schilling
b831e96aaf [ticket/12273] Use class properties instead of parameters
PHPBB3-12273
2014-04-18 12:56:59 +02:00
Joas Schilling
91deb4419b [ticket/12273] Add more tests for the event exporter
PHPBB3-12273
2014-04-18 12:56:51 +02:00
Joas Schilling
4a3756741c [ticket/12273] Move grabbing the $vars array line to a method
PHPBB3-12273
2014-04-18 12:56:43 +02:00
Joas Schilling
5387511f89 [ticket/12273] Grab name of events with a function
PHPBB3-12273
2014-04-18 12:56:34 +02:00
Joas Schilling
6c57edf3a3 [ticket/12273] Use the new class
PHPBB3-12273
2014-04-18 12:56:24 +02:00
Joas Schilling
22de4a5927 [ticket/12273] Add a basic set of tests for the exporter
PHPBB3-12273
2014-04-18 12:55:12 +02:00
Joas Schilling
0da5e3bee9 Merge pull request #2318 from prototech/ticket/12121
[ticket/12121] Preserve link redirect counts when updating from 3.0.x.

* prototech/ticket/12121:
  [ticket/12121] Preserve link redirect counts when updating from 3.0.x.
2014-04-16 23:33:03 +02:00
Joas Schilling
659c2e14b8 Merge pull request #2243 from n-aleha/ticket/12345
[ticket/12345] Improve search flood interval message for ascraeus

* n-aleha/ticket/12345:
  [ticket/12345] Improve search flood interval message for ascraeus
2014-04-16 23:26:09 +02:00
Joas Schilling
7f3aebd495 Merge branch 'develop-olympus' into develop-ascraeus
* develop-olympus:
  [ticket/12417] Revert "No longer allow Travis CI HHVM environment to fail."
2014-04-16 22:47:27 +02:00
Joas Schilling
d735129d6e Merge pull request #2324 from bantu/ticket/12417
[ticket/12417] Revert "No longer allow Travis CI HHVM environment to fai...

* bantu/ticket/12417:
  [ticket/12417] Revert "No longer allow Travis CI HHVM environment to fail."
2014-04-16 22:46:41 +02:00
Andreas Fischer
04893e3f98 [ticket/12417] Revert "No longer allow Travis CI HHVM environment to fail."
hhvm-nightly 2014.04.16~precise introduced "Attempted to serialize
unserializable builtin class DOMElement" errors when running functional tests.

This reverts commit ff7cc77f9db66b7fddacd77f215d85cf0243b2fa.

PHPBB3-12417
2014-04-16 22:16:52 +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
n-aleha
1f44b4da18 [ticket/12345] Improve search flood interval message for ascraeus
Show to guests and users the remaining seconds until their next allowed
search, if a search flood limit is enabled for them.

PHPBB3-12345
2014-04-16 02:14:36 +03:00
Joas Schilling
b305364b27 Merge pull request #2305 from n-aleha/ticket/12391
[ticket/12391] Assign variables to core.posting_modify_template_vars

* n-aleha/ticket/12391:
  [ticket/12391] Assign variables to core.posting_modify_template_vars
2014-04-16 00:57:07 +02:00
Joas Schilling
e50b6b5889 Merge pull request #2304 from n-aleha/ticket/12191
[ticket/12191] Move notification options to bottom while installing

* n-aleha/ticket/12191:
  [ticket/12191] Move notification options to bottom while installing
2014-04-16 00:49:59 +02:00
Joas Schilling
c4e3cc0850 Merge pull request #2301 from rxu/ticket/12401
[ticket/12401] Add $topic_data array to core.viewtopic_modify_post_row event

* rxu/ticket/12401:
  [ticket/12401] Pass more data to core.viewtopic_modify_post_row event
2014-04-16 00:17:31 +02:00
Joas Schilling
07442211b9 Merge pull request #2300 from rxu/ticket/12400
[ticket/12400] Add viewforum event to modify topics data

* rxu/ticket/12400:
  [ticket/12400] Add viewforum event to modify topics data
2014-04-16 00:03:20 +02: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
e9807e1741 Merge pull request #2310 from n-aleha/ticket/12397
[ticket/12397] Fix sql_unique_index_exists doc block

* n-aleha/ticket/12397:
  [ticket/12397] Fix sql_unique_index_exists doc block
2014-04-15 23:59:39 +02:00
n-aleha
bff63be512 [ticket/12397] Fix sql_unique_index_exists doc block
db_tools::sql_unique_index_exists() searches for unique indexes but not
primary key indexes.

PHPBB3-12397
2014-04-16 00:55:05 +03:00
Joas Schilling
d1f96aa036 Merge branch 'develop-olympus' into develop-ascraeus
* develop-olympus:
  [ticket/10423] Replace foreach with function in viewtopic.php
  [ticket/10423] Remove unnecessary include in test
  [ticket/10423] Match multiple wildcards
  [ticket/10423] Move code into a function and add tests for it
  [ticket/10423] Remove * from search or highlight string
2014-04-15 23:23:44 +02:00
Joas Schilling
675cef9c2e Merge pull request #2195 from Elsensee/ticket/10423
[ticket/10423] Remove * from search or highlight string

* Elsensee/ticket/10423:
  [ticket/10423] Replace foreach with function in viewtopic.php
  [ticket/10423] Remove unnecessary include in test
  [ticket/10423] Match multiple wildcards
  [ticket/10423] Move code into a function and add tests for it
  [ticket/10423] Remove * from search or highlight string
2014-04-15 23:23:26 +02:00
Joas Schilling
c63b5275d8 Merge branch 'ticket/lucifer4o/12344' into develop-ascraeus
* ticket/lucifer4o/12344:
  [ticket/12344] Add core.pm_submit_before to function submit_pm
2014-04-15 22:25:43 +02:00
lucifer4o
84c8c61eb2 [ticket/12344] Add core.pm_submit_before to function submit_pm
PHPBB3-12344
2014-04-15 22:19:47 +02:00
Oliver Schramm
f3cd7f73e1 [ticket/10423] Replace foreach with function in viewtopic.php
PHPBB3-10423
2014-04-15 20:43:16 +02:00
Oliver Schramm
601ecd3da1 [ticket/10423] Remove unnecessary include in test
PHPBB3-10423
2014-04-15 20:43:01 +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
n-aleha
11c4d14a9b [ticket/12391] Assign variables to core.posting_modify_template_vars
Assign variables to event "core.posting_modify_template_vars".
Also, fix a couple of typos.

PHPBB3-12391
2014-04-14 14:37:21 +03:00
Joas Schilling
b487da7c05 Merge remote-tracking branch 'marc/ticket/12004' into develop-ascraeus
* marc/ticket/12004:
  [ticket/12004] Support empty routes to app.php/ in path_helper
2014-04-14 12:40:47 +02:00
Joas Schilling
aebf2cc5cd Merge remote-tracking branch 'marc/ticket/12372' into develop-ascraeus
* marc/ticket/12372:
  [ticket/12372] Use $() instead of jQuery() in core.js for toggleDisplay
  [ticket/12372] Use admin.js $(document).ready for hiding questionnaire details
  [ticket/12372] Rename JS function dE() to phpbb.toggleDisplay()
  [ticket/12372] Move dE() function core.js
  [ticket/12372] Unify definition of function dE() across all files
  [ticket/12372] Use jQuery in javascript dE() function
2014-04-14 12:33:33 +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
3ce479f061 Merge remote-tracking branch 'marc/ticket/12398' into develop-ascraeus
* marc/ticket/12398:
  [ticket/12398] Select correct post to restore during softdelete tests
2014-04-13 22:42:45 +02:00
Marc Alexander
ad1513cde9 [ticket/12398] Select correct post to restore during softdelete tests
PHPBB3-12398
2014-04-13 22:22:55 +02:00
Oliver Schramm
dde7ac3b2b [ticket/10423] Match multiple wildcards
Multiple wildcards are removed from the string if there is
no word before or after them. If there is a word before or
after them, they are just replaced with a single one.

PHPBB3-10423
2014-04-13 21:36:09 +02:00
Oliver Schramm
face175471 [ticket/10423] Move code into a function and add tests for it
PHPBB3-10423
2014-04-13 21:15:14 +02:00
rxu
62a729e85e [ticket/12401] Pass more data to core.viewtopic_modify_post_row event
$topic_data array is used in viewtopic.php to populate $post_row template
block array data. Although $topic_data is not being passed
to core.viewtopic_modify_post_row event for modifying/adding
$post_row data in it. So, pass this array to the event.
Also, total_posts is added.

PHPBB3-12401
2014-04-13 23:13:55 +08:00