Commit graph

21829 commits

Author SHA1 Message Date
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
Joas Schilling
192bb74e3c [ticket/12527] Use a proper language string on confirm screen
PHPBB3-12527
2014-05-11 13:30:13 +02:00
Joas Schilling
eaa4552412 [ticket/12527] Remove unnecessary language strings
PHPBB3-12527
2014-05-11 13:30:07 +02:00
Joas Schilling
ada9fc81a3 [ticket/12527] Check whether the language exists
PHPBB3-12527
2014-05-11 13:29:56 +02:00
Joas Schilling
63e195d7f0 [ticket/12527] Restore missing files and variables check
PHPBB3-12527
2014-05-11 13:29:49 +02:00
Joas Schilling
c334d8431d [ticket/12527] Remove editor from template
PHPBB3-12527
2014-05-11 13:29:44 +02:00
Joas Schilling
61bca8ed8a [ticket/12527] Remove language file editor form ACP
PHPBB3-12527
2014-05-11 13:29:17 +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
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
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