Commit graph

23481 commits

Author SHA1 Message Date
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
Tristan Darricau
ca5987ceb8 [ticket/12174] Coding style
PHPBB3-12174
2014-05-10 23:50:42 +02:00
Tristan Darricau
49bc10de4d [ticket/8610] Merging topics does not handle bookmarks correctly
https://tracker.phpbb.com/browse/PHPBB3-8610

PHPBB3-8610
2014-05-10 22:17:01 +02:00
Tristan Darricau
cee9b1d856 [ticket/11226] Use $user->lang()
PHPBB3-11226
2014-05-10 19:47:32 +02:00
Tristan Darricau
164f52c3f3 [ticket/10899] Remove extra ';'
PHPBB3-10899
2014-05-10 19:04:37 +02:00
Tristan Darricau
56aaba696f [ticket/10899] Typo
PHPBB3-10899
2014-05-10 18:25:24 +02:00
Tristan Darricau
c6d7875b9b [ticket/10899] Refactoring in \phpbb\log\log_interface
PHPBB3-10899
2014-05-10 18:24:07 +02:00
Andreas Fischer
1b26cf0274 Merge branch 'develop-ascraeus' into develop
* develop-ascraeus:
  [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:48 +02: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
Tristan Darricau
c5a4ad3d31 [ticket/10899] Using Delete All in log viewer with keyword search
https://tracker.phpbb.com/browse/PHPBB3-10899

PHPBB3-10899
2014-05-10 17:03:09 +02:00
marcosbc
984ae598be [ticket/12270] No quote notif and double poster notification fix
Since a call was added to self::approve_topic(), the poster would
get double-notified about it (even if it was later marked as read).
Also, when creating a new topic with a quote, it would not be
notified, this has also been fixed.

PHPBB3-12270
2014-05-10 16:36:11 +02:00
Tristan Darricau
eee2091201 [ticket/11226] filespec::move_file() should error correctly
PHPBB3-11226
2014-05-10 15:09:25 +02:00
Tristan Darricau
9519c4e8c4 [ticket/12109] Fix coding style
PHPBB3-12109
2014-05-10 02:35:51 +02:00
Tristan Darricau
9b9c048702 [ticket/12109] Bug when setting permissions with "Select all users"
https://tracker.phpbb.com/browse/PHPBB3-12109

PHPBB3-12109
2014-05-10 01:53:51 +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
Tristan Darricau
27cb84d3d4 [ticket/12174] Remove $update_topic_attachments_flag
PHPBB3-12174
2014-05-09 09:48:09 +02:00
marcosbc
867dc84c33 [ticket/12270] Fixed tests
PHPBB3-12270
2014-05-09 01:22:20 +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
Tristan Darricau
93f901d078 [ticket/12174] Don't update the flag for a post without attachment
PHPBB3-12174
2014-05-09 00:50:34 +02: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
Tristan Darricau
93d3c517e3 [ticket/12074] Update the visibility of the constructor
PHPBB3-12074
2014-05-09 00:48:34 +02:00
Tristan Darricau
712491697e [ticket/12174] Update the conditions
PHPBB3-12174
2014-05-09 00:46:56 +02:00
Tristan Darricau
a80ad5d00f [ticket/12174] Remove inline assignment
PHPBB3-12174
2014-05-09 00:31:53 +02:00
Tristan Darricau
3029f93000 [ticket/12074] Don't log errors
PHPBB3-12074
2014-05-09 00:26:07 +02:00
Tristan Darricau
f755f69606 [ticket/12174] Update sql query
PHPBB3-12174
2014-05-09 00:18:38 +02:00
Tristan Darricau
a640a455f3 [ticket/12074] Managing extensions doesn't produce any log entry
PHPBB3-12074
2014-05-09 00:07:56 +02: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
Tristan Darricau
51c93aeb02 [ticket/12174] Revert the changes on $topic_update_array
PHPBB3-12174
2014-05-08 19:48:00 +02:00
Tristan Darricau
112e55e8ab [ticket/12174] Corrections
PHPBB3-12174
2014-05-08 19:07:18 +02: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
Cesar G
1836b01303 [ticket/9388] Use the new toggle function for the avatar type <select>.
PHPBB3-9388
2014-05-08 08:35:38 -07:00
Cesar G
e378037516 [ticket/9388] Display only the settings for the selected search backend.
PHPBB3-9388
2014-05-08 08:35:38 -07:00
Cesar G
d95164e641 [ticket/9388] Display only the settings for the auth method that's selected.
PHPBB3-9388
2014-05-08 08:35:38 -07:00
Cesar G
2e025f1655 [ticket/9388] Add support for making <select> options able to toggle settings.
PHPBB3-9388
2014-05-08 08:35:38 -07:00
PayBas
1cdff60676 [ticket/12431] Lang full sentence
PHPBB3-12431
2014-05-08 15:27:27 +02:00
Joas Schilling
db384ee3c2 Merge branch 'develop-ascraeus' into develop
* develop-ascraeus:
  [ticket/12451] Remove duplicated lang var
  [ticket/12451] Use new line to concatenate strings
  [ticket/12451] Split TOO_MANY_CHARS vars for plurals
  [ticket/12451] Split TOO_FEW_CHARS_LIMIT for plurals
2014-05-08 15:15:44 +02:00
Joas Schilling
d4fc060bcd Merge pull request #2363 from Elsensee/ticket/12451
[ticket/12451] Split lang vars in posting.php for plurals

* Elsensee/ticket/12451:
  [ticket/12451] Remove duplicated lang var
  [ticket/12451] Use new line to concatenate strings
  [ticket/12451] Split TOO_MANY_CHARS vars for plurals
  [ticket/12451] Split TOO_FEW_CHARS_LIMIT for plurals
2014-05-08 15:10:34 +02:00
Joas Schilling
78b7cee763 Merge branch 'develop-ascraeus' into develop
* develop-ascraeus:
  [ticket/12025] Apply DeMorgan
  [ticket/12025] Fixing the condition....
  [ticket/12025] Don't show any error on preview if the message is empty
  [ticket/12025] Post Preview no longer shows warnings
2014-05-08 14:42:14 +02:00