Commit graph

21562 commits

Author SHA1 Message Date
Andreas Fischer
1b8bcef2d1 Merge pull request #2457 from prototech/ticket/12544
[ticket/12544] Update Plupload to 2.1.2.

* prototech/ticket/12544:
  [ticket/12544] Update Plupload to 2.1.2.
2014-05-14 23:04:25 +02:00
brunoais
d27ece1994 [ticket/12533] Make <a> use all the "see all" "button"
Changed the CSS so that the `<a>` of the notifications
list for the "see all" uses all the container.

PHPBB3-12533
2014-05-14 09:51:51 +01:00
brunoais
86d19b6062 [ticket/12533] Make <a> use all the notification item size
Changed padding CSS to the notifications' `<li>` and it's
`<a>` (immediate child) so that the `<a>` block uses all
 it's container width and height.

To compensate that, I added the padding that was in the
`<li>` to the `<a>`

PHPBB3-12533
2014-05-14 09:51:39 +01:00
Cesar G
bc31a0d252 [ticket/12543] Only take over ENTER and ESC keys when alert box is active.
PHPBB3-12543
2014-05-13 17:49:54 -07:00
Tristan Darricau
7af785f903 [ticket/12435] Update the comment
PHPBB3-12435
2014-05-14 02:32:12 +02:00
Cesar G
c1b817466c [ticket/12544] Update Plupload to 2.1.2.
PHPBB3-12544
2014-05-13 17:23:48 -07:00
Tristan Darricau
cb97c26e88 [ticket/12435] purge_notifications() fails for unused notifications
https://tracker.phpbb.com/browse/PHPBB3-12435

PHPBB3-12435
2014-05-14 02:09:41 +02:00
Joas Schilling
dceea23b1f [ticket/12540] Fix broken placeholders in language files
PHPBB3-12540
2014-05-13 21:41:11 +02:00
Joas Schilling
bf1f0b8062 Merge branch 'develop-ascraeus' into develop
* develop-ascraeus:
  [ticket/12519] Restore m_approve language description
2014-05-13 12:21:41 +02: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
ddced2ac4d Merge branch 'develop-ascraeus' into develop
* develop-ascraeus:
  [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:10:23 +02: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
4f8b33cc14 Merge branch 'develop-ascraeus' into develop
* develop-ascraeus:
  [ticket/12518] Apply De Morgan to make the conditions easier to read
2014-05-12 01:10:30 +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
bf7a1e3e55 Merge branch 'develop-ascraeus' into develop
* develop-ascraeus:
  [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:38:04 +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
Matt Friedman
beab2c9252 [ticket/12531] Restore default topic link functionality in subsilver2
PHPBB3-12531
2014-05-11 10:27:47 -07:00
Joas Schilling
e17a156365 Merge branch 'develop-ascraeus' into develop
* develop-ascraeus:
  [ticket/12451] Fix whitespace in posting.php lang file
2014-05-11 18:57:44 +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
b9dda0eb15 Merge branch 'develop-ascraeus' into develop
* develop-ascraeus:
  [ticket/12517] Correctly call $log->add in prune shadow topics
2014-05-11 18:13:42 +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
90c2bf26c0 Merge branch 'develop-ascraeus' into develop
* develop-ascraeus:
  [ticket/12526] Fix undefined index: filesize when editing PM with attachments.
2014-05-11 18:09:56 +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
8d17cf5a70 Merge branch 'develop-ascraeus' into develop
* develop-ascraeus:
  [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:23 +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
7ec0289b83 Merge branch 'develop-ascraeus' into develop
* develop-ascraeus:
  [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:01:31 +02: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
f861df10a1 Merge branch 'develop-ascraeus' into develop
* develop-ascraeus:
  [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:51:36 +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
243cce0350 Merge branch 'develop-ascraeus' into develop
* develop-ascraeus:
  [ticket/12524] Add search.php core event to modify search results rowset
2014-05-11 10:43:26 +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
ea989a2456 Merge branch 'develop-ascraeus' into develop
* develop-ascraeus:
  [ticket/12431] Lang full sentence
  [ticket/12431] Add topic poll icon.
  [ticket/12431] Add has_poll icon to topiclists
2014-05-11 10:24:56 +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
b4c7978e13 Merge branch 'develop-ascraeus' into develop
* develop-ascraeus:
  [ticket/12523] Add template events search_results_topic_(before/after)
2014-05-11 10:19:55 +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
1f7e6730b8 Merge branch 'develop-ascraeus' into develop
* develop-ascraeus:
  [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:58 +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