1
0
mirror of https://github.com/phpbb/phpbb.git synced 2025-02-24 03:54:10 +01:00

21200 Commits

Author SHA1 Message Date
Cesar G
c1b817466c [ticket/12544] Update Plupload to 2.1.2.
PHPBB3-12544
2014-05-13 17:23:48 -07:00
Joas Schilling
bec9b7c34e Merge pull request #2452 from n-aleha/ticket/12519
[ticket/12519] Restore m_approve language description

* n-aleha/ticket/12519:
  [ticket/12519] Restore m_approve language description
2014-05-13 12:21:28 +02:00
n-aleha
9c8e228236 [ticket/12519] Restore m_approve language description
Restore acl_m_approve language description to:
"Can approve and restore posts"

PHPBB3-12519
2014-05-12 22:15:39 +03:00
Marc Alexander
b62c39c36e Merge remote-tracking branch 'nickvergessen/ticket/12534' into develop-ascraeus
* nickvergessen/ticket/12534:
  [ticket/12534] Fix filter for functional tests
  [ticket/12534] Do not use errorbox for multi steps
  [ticket/12534] Do not abuse errorbox for en/disable confirmation of extensions
2014-05-12 13:09:44 +02:00
Joas Schilling
b3eb38ecaf [ticket/12534] Fix filter for functional tests
PHPBB3-12534
2014-05-12 11:38:14 +02:00
Joas Schilling
0c6ef9aabf [ticket/12534] Do not use errorbox for multi steps
PHPBB3-12534
2014-05-12 11:35:59 +02:00
Joas Schilling
1d4c20b3d2 [ticket/12534] Do not abuse errorbox for en/disable confirmation of extensions
PHPBB3-12534
2014-05-12 10:49:52 +02:00
Andreas Fischer
bfacf2d6eb Merge pull request #2446 from nickvergessen/ticket/12518
[ticket/12518] Apply De Morgan to make the conditions easier reasable

* nickvergessen/ticket/12518:
  [ticket/12518] Apply De Morgan to make the conditions easier to read
2014-05-12 01:10:30 +02:00
Joas Schilling
8d20f095aa [ticket/12518] Apply De Morgan to make the conditions easier to read
PHPBB3-12518
2014-05-11 22:52:09 +02:00
Marc Alexander
92e25398c7 Merge remote-tracking branch 'nickvergessen/ticket/12518' into develop-ascraeus
* nickvergessen/ticket/12518:
  [ticket/12518] Add event to overwrite the cannot edit condition in posting.php
  [ticket/12518] Add event to overwrite the allow edit and delete conditions
2014-05-11 22:36:45 +02:00
Joas Schilling
b430979f60 [ticket/12518] Add event to overwrite the cannot edit condition in posting.php
PHPBB3-12518
2014-05-11 21:27:21 +02:00
Joas Schilling
aeb5189be0 [ticket/12518] Add event to overwrite the allow edit and delete conditions
PHPBB3-12518
2014-05-11 21:27:21 +02:00
Joas Schilling
34e93b0e15 Merge pull request #2442 from Elsensee/ticket/12451-2
[ticket/12451] Fix whitespace in posting.php lang file

* Elsensee/ticket/12451-2:
  [ticket/12451] Fix whitespace in posting.php lang file
2014-05-11 18:57:34 +02:00
Oliver Schramm
cce6f7d4a6 [ticket/12451] Fix whitespace in posting.php lang file
PHPBB3-12451
2014-05-11 18:20:56 +02:00
Joas Schilling
8cdc6632ee Merge pull request #2438 from marc1706/ticket/12517
[ticket/12517] Correctly call $log->add in prune shadow topics

* marc1706/ticket/12517:
  [ticket/12517] Correctly call $log->add in prune shadow topics
2014-05-11 18:11:44 +02:00
Joas Schilling
e28b1a8389 Merge pull request #2439 from prototech/ticket/12526
[ticket/12526] Fix undefined index: filesize when editing PM with attachments.

* prototech/ticket/12526:
  [ticket/12526] Fix undefined index: filesize when editing PM with attachments.
2014-05-11 18:09:12 +02:00
Joas Schilling
f37ff48e2c Merge pull request #2441 from Nicofuma/ticket/12529
[ticket/12529] Use root_path in controller\resolver to check the template dir

* Nicofuma/ticket/12529:
  [ticket/12529] Move $phpbb_root_path to the end of the constructor
  [ticket/12529] Use root_path in controller\resolver to check the template dir
2014-05-11 15:47:13 +02:00
Tristan Darricau
16cd1db59a [ticket/12529] Move $phpbb_root_path to the end of the constructor
PHPBB3-12529
2014-05-11 15:10:14 +02:00
Tristan Darricau
197c801746 [ticket/12529] Use root_path in controller\resolver to check the template dir
PHPBB3-12529
2014-05-11 14:10:19 +02:00
Cesar G
a7d1fd44ee [ticket/12526] Fix undefined index: filesize when editing PM with attachments.
PHPBB3-12526
2014-05-11 02:36:48 -07:00
Joas Schilling
f2fc18b4b7 Merge pull request #2412 from prototech/ticket/12501
[ticket/12501] Fix improper display of inline attachments in post report page

* prototech/ticket/12501:
  [ticket/12501] Only select attachments uploaded before the post was reported.
  [ticket/12501] Parse the reported post message before its attachments.
2014-05-11 11:00:27 +02:00
Joas Schilling
6cd7abe255 Merge pull request #2420 from prototech/ticket/9388
[ticket/9388] Only display the settings for the selected method in the auth and search ACP pages.

* prototech/ticket/9388:
  [ticket/9388] Use "togglable" instead of "toggable"
  [ticket/9388] Do not nest the <fieldset> tags in the OAuth settings.
  [ticket/9388] Reopen <fieldset> after auth templates.
  [ticket/9388] Fix unit tests.
  [ticket/9388] Use the new toggle function for the avatar type <select>.
  [ticket/9388] Display only the settings for the selected search backend.
  [ticket/9388] Display only the settings for the auth method that's selected.
  [ticket/9388] Add support for making <select> options able to toggle settings.
2014-05-11 10:48:10 +02:00
Joas Schilling
9aee2ed039 Merge pull request #2437 from rxu/ticket/12524
[ticket/12524] Add search.php core event to modify search results rowset

* rxu/ticket/12524:
  [ticket/12524] Add search.php core event to modify search results rowset
2014-05-11 10:42:46 +02:00
Marc Alexander
9a295e4845 [ticket/12517] Correctly call $log->add in prune shadow topics
PHPBB3-12517
2014-05-11 10:31:28 +02:00
Joas Schilling
135b76b643 Merge pull request #2340 from PayBas/ticket/12431
[ticket/12431] Add has_poll icon to topiclists

* PayBas/ticket/12431:
  [ticket/12431] Lang full sentence
  [ticket/12431] Add topic poll icon.
  [ticket/12431] Add has_poll icon to topiclists
2014-05-11 10:24:03 +02:00
Joas Schilling
61c92c07ee Merge pull request #2436 from rxu/ticket/12523
[ticket/12523] Add template events search_results_topic_(before/after)

* rxu/ticket/12523:
  [ticket/12523] Add template events search_results_topic_(before/after)
2014-05-11 10:19:49 +02:00
Joas Schilling
491d50a994 Merge pull request #2306 from marc1706/ticket/12407
[ticket/12407] Allow changing of post_data, etc. at end of posting.php

* marc1706/ticket/12407:
  [ticket/12407] Remove merge marker from posting.php
  [ticket/12407] Fix incorrect @since line in event
  [ticket/12407] Merge @change in doc block of event
  [ticket/12407] Assign template variables again after merging develop-ascraeus
  [ticket/12407] Add message_parser as passed variable to event
  [ticket/12407] Allow changing of post_data, etc. at end of posting.php
2014-05-11 10:16:44 +02:00
rxu
1b24d68971 [ticket/12524] Add search.php core event to modify search results rowset
Currently it is possible to change search results within the search row scope,
but it should be possible to modify/unset every individual row
within the rowset.

PHPBB3-12524
2014-05-11 16:10:54 +08:00
Joas Schilling
4147681640 Merge pull request #2435 from n-aleha/ticket/12522
[ticket/12522] Add function parameter description in guesser interface

* n-aleha/ticket/12522:
  [ticket/12522] Add function parameter description in guesser interface
2014-05-11 10:10:31 +02:00
Marc Alexander
e7923336fb [ticket/12407] Remove merge marker from posting.php
PHPBB3-12407
2014-05-11 10:10:26 +02:00
Joas Schilling
0871e649f6 Merge pull request #2428 from n-aleha/ticket/12476
[ticket/12476] Increase assets version on cache purge

* n-aleha/ticket/12476:
  [ticket/12476] Label the constructor as public
  [ticket/12476] Increase assets also from acp_styles and phpbbcli
  [ticket/12476] Increase asset version on cache purge
2014-05-11 10:03:30 +02:00
rxu
2d989acd0c [ticket/12523] Add template events search_results_topic_(before/after)
Add template events search_results_topic_(before/after)
to search_results.html.

PHPBB3-12523
2014-05-11 15:57:21 +08:00
Marc Alexander
0bc5e95198 [ticket/12407] Fix incorrect @since line in event
PHPBB3-12407
2014-05-11 09:40:26 +02:00
n-aleha
ca1ed19e45 [ticket/12522] Add function parameter description in guesser interface
Add parameter description for $file_name of the function guess in
guesser_interface

PHPBB3-12522
2014-05-11 02:27:14 +03:00
Andreas Fischer
d340d2fe25 Merge branch 'develop-olympus' into develop-ascraeus
* develop-olympus:
2014-05-10 17:14:21 +02:00
Andreas Fischer
007f041a4a Merge pull request #2415 from nickvergessen/ticket/10839
Ticket/10839 Remove phpunit configuration files

* nickvergessen/ticket/10839:
  [ticket/10839] Remove version compare as the php minimum requirement is 5.3.3
  [ticket/10839] Fix note about running slow tests and build task
  [ticket/10839] Removing phpunit.xml.all
  [ticket/10839] Always run functional tests by default
2014-05-10 17:14:14 +02:00
Andreas Fischer
cc0446dc17 Merge pull request #2430 from nickvergessen/ticket/10839-olympus
[Ticket/10839] olympus - Remove phpunit configuration files

* nickvergessen/ticket/10839-olympus:
  [ticket/10839] Fix note about running slow tests and build task
  [ticket/10839] Removing phpunit.xml.all
  [ticket/10839] Always run functional tests by default
2014-05-10 17:14:00 +02:00
Cesar G
e233f0af36 [ticket/9388] Use "togglable" instead of "toggable"
PHPBB3-9388
2014-05-09 13:49:41 -07:00
Joas Schilling
f8fb65db63 [ticket/10839] Remove version compare as the php minimum requirement is 5.3.3
PHPBB3-10839
2014-05-09 11:22:58 +02:00
Joas Schilling
3b3f941f5f Merge branch 'ticket/10839-olympus' into ticket/10839
* ticket/10839-olympus:
  [ticket/10839] Fix note about running slow tests and build task
  [ticket/10839] Removing phpunit.xml.all
  [ticket/10839] Always run functional tests by default

Conflicts:
	phpunit.xml.dist
2014-05-09 11:22:30 +02:00
Joas Schilling
333120a992 [ticket/10839] Fix note about running slow tests and build task
PHPBB3-10839
2014-05-09 11:19:49 +02:00
Joas Schilling
8a9b1a8fed [ticket/10839] Removing phpunit.xml.all
To run all tests, just append
    --group slow
to your call

PHPBB3-10839
2014-05-09 11:19:48 +02:00
Joas Schilling
d6ac4a1130 [ticket/10839] Always run functional tests by default
They are skipped anyway, if $phpbb_functional_url is not configured.
If you want to run tests without functional tests, just append
    --exclude-group functional
to your call

PHPBB3-10839
2014-05-09 11:19:48 +02:00
n-aleha
5dacd7ff5b [ticket/12476] Label the constructor as public
Label the the constructor as public.

PHPBB3-12476
2014-05-09 01:50:52 +03:00
n-aleha
f2471878a6 [ticket/12476] Increase assets also from acp_styles and phpbbcli
Increase assets also from "ACP > Styles > Purge Cache" and phpbbcli

PHPBB3-12476
2014-05-09 01:50:51 +03:00
n-aleha
cfc0c9bcf9 [ticket/12476] Increase asset version on cache purge
Increace the asset version when purging the cache from "ACP > General"

PHPBB3-12476
2014-05-09 01:49:41 +03:00
Cesar G
2ca01bdcbe [ticket/9388] Do not nest the <fieldset> tags in the OAuth settings.
PHPBB3-9388
2014-05-08 13:39:31 -07:00
Marc Alexander
8121f87f08 Merge branch 'develop-ascraeus' of github.com:phpbb/phpbb into ticket/12407
* 'develop-ascraeus' of github.com:phpbb/phpbb: (424 commits)
  [ticket/12428] Use the database to store the original version number
  [ticket/12493] Add functional test
  [ticket/12493] Fix sql query for selection of users that have disabled PM
  [ticket/12513] Add asset include support to simple header/footer in ACP
  [ticket/12513] Add simple_header head event with support for CSS assets calls
  [ticket/12511] Add missing titles for profile fields in members group view
  [ticket/12428] Incorrect from version in database update log entry
  [ticket/12510] Convert & to &amp; in build_url() when no params are stripped.
  [ticket/12402] CAPTCHA plugin migration fails to detect missing plugins
  [ticket/12440] Use a more generic approach for replacing the URL.
  [ticket/12507] Move the 'require' statement
  [ticket/12507] Add console command to purge the cache
  [ticket/12421] Rebase and enable tests
  [ticket/12421] Don't parse [attachment] tags if user can't view them
  [ticket/12325] Use \RecursiveDirectoryIterator
  [ticket/12325] Doc blocks
  [ticket/12440] Set browser URL to point to specific post when using view=unread
  [ticket/12357] Support routes in generate_smilies() function.
  [ticket/12459] Change language strings
  [ticket/12504] Use local variables where possible
  ...

Conflicts:
	phpBB/posting.php
2014-05-08 18:43:46 +02:00
Cesar G
f95a7b0222 [ticket/9388] Reopen <fieldset> after auth templates.
PHPBB3-9388
2014-05-08 08:35:38 -07:00
Cesar G
0832d34192 [ticket/9388] Fix unit tests.
PHPBB3-9388
2014-05-08 08:35:38 -07:00