Commit graph

21483 commits

Author SHA1 Message Date
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
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
Joas Schilling
44d593ad85 Merge pull request #2360 from Nicofuma/ticket/12025
[ticket/12025] Post Preview no longer shows warnings

* Nicofuma/ticket/12025:
  [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:41:49 +02:00
Joas Schilling
fadc23344f Merge branch 'develop-ascraeus' into develop
* develop-ascraeus:
  [ticket/12325] Use \RecursiveDirectoryIterator
  [ticket/12325] Doc blocks
  [ticket/12325] Change private function to protected
  [ticket/12325] Add visibilities
  [ticket/12325] Add files located in deleted dirs
  [ticket/12325] Generate the list of the deleted files and folders
2014-05-08 14:28:09 +02:00
Joas Schilling
5f2b0fba1e Merge pull request #2410 from Nicofuma/ticket/12325
[ticket/12325] Generate the list of the deleted files and folders

* Nicofuma/ticket/12325:
  [ticket/12325] Use \RecursiveDirectoryIterator
  [ticket/12325] Doc blocks
  [ticket/12325] Change private function to protected
  [ticket/12325] Add visibilities
  [ticket/12325] Add files located in deleted dirs
  [ticket/12325] Generate the list of the deleted files and folders
2014-05-08 14:22:01 +02:00
Joas Schilling
6c9111bd5b Merge branch 'develop-ascraeus' into develop
* develop-ascraeus:
  [ticket/12500] Set a title attribute in user.img()
2014-05-08 13:27:55 +02:00
Joas Schilling
dcfb4cacd8 Merge pull request #2408 from prototech/ticket/12500
[ticket/12500] Set a title attribute in user.img()

* prototech/ticket/12500:
  [ticket/12500] Set a title attribute in user.img()
2014-05-08 13:27:33 +02:00
Joas Schilling
4affb33396 Merge branch 'develop-ascraeus' into develop
* develop-ascraeus:
  [ticket/12440] Use a more generic approach for replacing the URL.
  [ticket/12440] Set browser URL to point to specific post when using view=unread
2014-05-08 13:23:36 +02:00
Joas Schilling
e976f7908a Merge pull request #2414 from prototech/ticket/12440
[ticket/12440] Set browser URL to point to specific post when using view=unread

* prototech/ticket/12440:
  [ticket/12440] Use a more generic approach for replacing the URL.
  [ticket/12440] Set browser URL to point to specific post when using view=unread

Conflicts:
	phpBB/styles/prosilver/template/viewtopic_body.html
2014-05-08 13:23:12 +02:00
Joas Schilling
15c0898911 Merge branch 'develop-ascraeus' into develop
* develop-ascraeus:
  [ticket/12402] CAPTCHA plugin migration fails to detect missing plugins
2014-05-08 13:17:25 +02:00
Joas Schilling
416c58a418 Merge pull request #2418 from Nicofuma/ticket/12402
[ticket/12402] CAPTCHA plugin migration fails to detect missing plugins

* Nicofuma/ticket/12402:
  [ticket/12402] CAPTCHA plugin migration fails to detect missing plugins
2014-05-08 13:13:15 +02:00
Joas Schilling
89e6694045 Merge branch 'develop-ascraeus' into develop
* develop-ascraeus:
  [ticket/12510] Convert & to &amp; in build_url() when no params are stripped.
2014-05-08 13:02:11 +02:00
Joas Schilling
aade62b0a3 Merge pull request #2419 from prototech/ticket/12510
[ticket/12510] Convert & to &amp; in build_url() when no params are stripped.

* prototech/ticket/12510:
  [ticket/12510] Convert & to &amp; in build_url() when no params are stripped.
2014-05-08 13:02:01 +02:00
Joas Schilling
f28ce51afb Merge branch 'develop-ascraeus' into develop
* develop-ascraeus:
  [ticket/12428] Use the database to store the original version number
  [ticket/12428] Incorrect from version in database update log entry
2014-05-08 12:57:07 +02:00
Joas Schilling
0c3c77c6bf Merge pull request #2422 from Nicofuma/ticket/12428
[ticket/12428] Incorrect from version in database update log entry

* Nicofuma/ticket/12428:
  [ticket/12428] Use the database to store the original version number
  [ticket/12428] Incorrect from version in database update log entry
2014-05-08 12:56:59 +02:00
Joas Schilling
f80e8d5fb5 Merge branch 'develop-ascraeus' into develop
* develop-ascraeus:
  [ticket/12511] Add missing titles for profile fields in members group view
2014-05-08 12:41:17 +02:00
Joas Schilling
ef99d6fcc5 Merge pull request #2423 from rxu/ticket/12511
[ticket/12511] Add missing titles for profile fields in members group view

* rxu/ticket/12511:
  [ticket/12511] Add missing titles for profile fields in members group view
2014-05-08 12:32:04 +02:00
Joas Schilling
6aa3aa3a17 Merge branch 'develop-ascraeus' into develop
* develop-ascraeus:
  [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
2014-05-08 12:29:01 +02:00
Joas Schilling
03f3f1141f Merge pull request #2424 from VSEphpbb/ticket/12513
[ticket/12513] Add simple_header head event with support for asset calls

* VSEphpbb/ticket/12513:
  [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
2014-05-08 12:28:53 +02:00
Joas Schilling
3a39a99ed6 Merge branch 'develop-ascraeus' into develop
* develop-ascraeus:
  [ticket/12493] Add functional test
  [ticket/12493] Fix sql query for selection of users that have disabled PM
2014-05-08 12:23:10 +02:00
Joas Schilling
48a170549c Merge pull request #2421 from n-aleha/ticket/12493
[ticket/12493] Fix sql query for selection of users that have disabled PM

* n-aleha/ticket/12493:
  [ticket/12493] Add functional test
  [ticket/12493] Fix sql query for selection of users that have disabled PM
2014-05-08 12:22:49 +02:00
Tristan Darricau
32efd5de73 [ticket/12428] Use the database to store the original version number
PHPBB3-12428
2014-05-07 23:04:41 +02:00
n-aleha
83a905de4b [ticket/12493] Add functional test
Added a functional test.

PHPBB3-12493
2014-05-07 23:00:50 +03:00
n-aleha
0166493a89 [ticket/12493] Fix sql query for selection of users that have disabled PM
This fixes a bug where a user A could not send a PM to user B when both users
allowed other users to send them a PM. More precisely, it fixes the selection
of users that either are inactive or have disabled private messages.

PHPBB3-12493
2014-05-07 23:00:42 +03:00
Joas Schilling
5ce5d107c2 Merge branch 'develop-ascraeus' into develop
* develop-ascraeus:
  [ticket/12488] subSilver2 fix (no longer displays if warnings = 0)
  [ticket/12488] Typo fix
  [ticket/12488] Removed <em> and removed anonymous check
  [ticket/12488] Add user warning indication to viewtopic posts
2014-05-07 21:17:18 +02:00
Joas Schilling
077c7cf7aa Merge pull request #2400 from PayBas/ticket/12488
[ticket/12488] Add user warning indication to viewtopic posts

* PayBas/ticket/12488:
  [ticket/12488] subSilver2 fix (no longer displays if warnings = 0)
  [ticket/12488] Typo fix
  [ticket/12488] Removed <em> and removed anonymous check
  [ticket/12488] Add user warning indication to viewtopic posts
2014-05-07 21:17:04 +02:00
Joas Schilling
3a0bb88866 Merge branch 'develop-ascraeus' into develop
* develop-ascraeus:
  [ticket/12357] Support routes in generate_smilies() function.
2014-05-07 21:14:31 +02:00
Joas Schilling
7294bc9402 Merge pull request #2413 from prototech/ticket/12357
[ticket/12357] Support routes in generate_smilies() function.

* prototech/ticket/12357:
  [ticket/12357] Support routes in generate_smilies() function.
2014-05-07 21:08:10 +02:00
Matt Friedman
d2c5386394 [ticket/12513] Add asset include support to simple header/footer in ACP
PHPBB3-12513
2014-05-07 11:59:49 -07:00
Matt Friedman
8fda490050 [ticket/12513] Add simple_header head event with support for CSS assets calls
PHPBB3-12513
2014-05-07 11:53:25 -07:00
rxu
4b54d0b4af [ticket/12511] Add missing titles for profile fields in members group view
For memberlist group view in cases the group is presented with the group leader
and group members, for members profile fields titles are missing: Posts,
Joined, Last active and custom profile fields titles.

PHPBB3-12511
2014-05-07 23:31:09 +08:00
Tristan Darricau
e0dbbfb4af [ticket/12428] Incorrect from version in database update log entry
https://tracker.phpbb.com/browse/PHPBB3-12428

PHPBB3-12428
2014-05-07 02:07:30 +02:00
Cesar G
eddb420375 [ticket/12510] Convert & to &amp; in build_url() when no params are stripped.
PHPBB3-12510
2014-05-06 15:58:10 -07:00