Commit graph

21907 commits

Author SHA1 Message Date
PayBas
ca55f22c73 [ticket/12961] Add additional link to the KB
PHPBB3-12961
2014-08-21 20:05:55 +02:00
Cesar G
be0ebbe644 [ticket/13004] Remove obsolete S_HAS_ATTACHMENTS check from topic tools.
PHPBB3-13004
2014-08-21 10:47:40 -07:00
Mario Skouat
923a818e37 [ticket/13003] Add missing language keys
PHPBB3-13003
2014-08-21 19:37:03 +02:00
Tristan Darricau
afb9d0a3d7 [ticket/12990] Use {$var} instead of ${var}
PHPBB3-12990
2014-08-21 16:04:46 +02:00
Andreas Fischer
a7a05ca75c Merge pull request #2894 from Nicofuma/ticket/12999
[ticket/12999] Remove @author tags

* Nicofuma/ticket/12999:
  [ticket/12999] Remove @author tags
2014-08-21 13:44:10 +02:00
Marc Alexander
31aac66f5a Merge pull request #2885 from Nicofuma/ticket/12990
[ticket/12990] Use the full services name for the notification's types
2014-08-21 00:44:05 +02:00
Marc Alexander
421005b282 Merge pull request #2889 from rxu/ticket/12994
[ticket/12994] Add core event to viewtopic.php before sending vars to template
2014-08-21 00:22:18 +02:00
rxu
60b38847d2 [ticket/12994] Add core event to viewtopic.php before sending vars to template
Add core event to viewtopic.php before sending vars to template
to allow extensions performing additional actions/modifying data first.

PHPBB3-12994
2014-08-21 04:54:26 +08:00
Tristan Darricau
9486c693b6 [ticket/12998] Fix use of $lang in mcp_warn.php
PHPBB3-12998
2014-08-19 23:02:54 +02:00
Tristan Darricau
c013e727d4 [ticket/12999] Remove @author tags
PHPBB3-12999
2014-08-19 22:54:45 +02:00
Tristan Darricau
fe1ab6d2ef [ticket/12993] Return an array instead of reference passing
PHPBB3-12993
2014-08-19 22:25:01 +02:00
Louis7777
8a5dd101a3 [ticket/12989] Remove unused "created_by.jpg"
This image is not used anywhere in prosilver.

PHPBB3-12989
2014-08-19 20:58:47 +02:00
Tristan Darricau
5e7d9d2fcf [ticket/12993] Fix includes of functions_display
PHPBB3-12993
2014-08-19 13:51:21 +02:00
Tristan Darricau
496cc64bc6 [ticket/12993] Rename to phpbb_get_user_rank
PHPBB3-12993
2014-08-18 16:32:05 +02:00
Tristan Darricau
685bdc87e6 [ticket/12993] Fix user_loader and memberlist
PHPBB3-12993
2014-08-18 14:07:47 +02:00
Forumhulp.com
8671e40217 [ticket/12993] Improve get_user_ranks
Explanation in http://area51.phpbb.com/phpBB/viewtopic.php?f=108&t=46051

PHPBB3-12993
2014-08-18 13:59:33 +02:00
Tristan Darricau
71f78fb8c6 [ticket/12990] Use protected instead of private
PHPBB3-12990
2014-08-17 23:03:44 +02:00
Andreas Fischer
a82a88b555 Merge pull request #2886 from Oyabun1/ticket/12984
[ticket/12984] Remove blank line when no forum description shown

* Oyabun1/ticket/12984:
  [ticket/12984] Remove blank line when no forum description shown
2014-08-17 22:31:46 +02:00
Pico88
9d7deba67a [ticket/12991] Have events after/before "add warning" field - user and post
PHPBB3-12991
2014-08-17 19:04:35 +02:00
Tristan Darricau
b18fe1203a [ticket/12990] Fix unit tests
PHPBB3-12990
2014-08-17 16:19:23 +02:00
Oyabun1
621f8c922f [ticket/12984] Remove blank line when no forum description shown
Add a conditional for forum description and move the <br /> within it.
Currently if there is no forum description but there is
1. a displayed forum moderator and/or
2. a displayed sub-forum
a blank line is added in place of the description

PHPBB3-12984
2014-08-17 20:39:22 +10:00
Andreas Fischer
4ff5aa18ae Merge pull request #2881 from rxu/ticket/12986
[ticket/12986] Fix detection of common words in search

* rxu/ticket/12986:
  [ticket/12986] Fix detection of common words in search
2014-08-17 01:14:46 +02:00
Tristan Darricau
fe80967535 [ticket/12990] Use the full services name for the notification's types
PHPBB3-12990
2014-08-16 21:46:03 +02:00
rxu
354d08dfff [ticket/12986] Fix detection of common words in search
$search->get_common_words() call goes before the split_keywords() call,
but $search->common_words array is being generated
within the function $search->split_keywords(). Thus, get_common_words()
returned an empty array instead of common words array.

PHPBB3-12986
2014-08-17 00:35:12 +08:00
Andreas Fischer
e9f5b9d657 Merge pull request #2872 from Nicofuma/ticket/12975
[ticket/12975] Fix the construction of phpbb\auth\provider\db for Oauth

* Nicofuma/ticket/12975:
  [ticket/12975] Fix the construction of phpbb\auth\provider\db for Oauth
2014-08-16 09:50:51 +02:00
PayBas
45405a48a8 [ticket/12961] Move link to language file
PHPBB3-12961
2014-08-15 22:53:05 +02:00
PayBas
73426d2d30 [ticket/12961] Refactor lang entry
PHPBB3-12961
2014-08-14 22:22:20 +02:00
Marc Alexander
ad625c1e6d Merge pull request #2876 from PayBas/ticket/12900
[ticket/12900] Fix potential avatar size box overflow
2014-08-14 14:47:20 +02:00
PayBas
27bb2b7289 [ticket/12961] Change url to anti-spam-ext
As per IRC suggestion

PHPBB3-12961
2014-08-14 10:03:41 +02:00
PayBas
d08a7f70e6 [ticket/12961] Change url to https://www.phpbb.com/go/anti-spam/
PHPBB3-12961
2014-08-14 10:03:35 +02:00
Callum Macrae
9c87972385 [ticket/12982] Refactoring: Cleaned up crazy insert users stuff
PHPBB3-12982
2014-08-14 00:19:34 +01:00
Callum Macrae
9e3db526d5 [ticket/12982] Refactoring: Cleaned up forum_fn.js
PHPBB3-12982
2014-08-14 00:04:16 +01:00
Callum Macrae
9578fdf7d7 [ticket/12982] Refactoring: Cleaned up phpbb.search
PHPBB3-12982
2014-08-13 23:18:50 +01:00
Callum Macrae
d79fec1c3f [ticket/12982] Refactoring: made JS in adm nice
PHPBB3-12982
2014-08-13 22:53:28 +01:00
Callum Macrae
340f48fdeb [ticket/12982] Refactoring: made most JS nice.
PHPBB3-12982
2014-08-13 22:44:21 +01:00
PayBas
5cf9ab8a97 [ticket/12856] Remove images from assets/plupload/img/
PHPBB3-12856
2014-08-13 23:20:43 +02:00
PayBas
9db2ff7186 [ticket/12856] Copy plupload images to prosilver dir
PHPBB3-12856
2014-08-13 16:37:44 +02:00
PayBas
030d1a683b [ticket/12900] Fix potential avatar size box overflow
PHPBB3-12900
2014-08-13 16:23:20 +02:00
PayBas
55260127bd [ticket/12961] Add link in anti-spam ACP page to titania
PHPBB3-12961
2014-08-13 15:39:03 +02:00
Tristan Darricau
e31aafb393 [ticket/12975] Fix the construction of phpbb\auth\provider\db for Oauth
PHPBB3-12975
2014-08-12 23:12:57 +02:00
Joas Schilling
3be239b864 [prep-release-3.1.0-RC3] Update phpBB Version for RC4 development 2014-08-12 10:15:42 +02:00
Joas Schilling
de819bea74 [prep-release-3.1.0-RC3] Add changelog for 3.1.0-RC3 2014-08-11 19:34:31 +02:00
Joas Schilling
29886e703a [prep-release-3.1.0-RC3] Prepare Changelog 2014-08-11 19:33:18 +02:00
Joas Schilling
7367ab6e15 [prep-release-3.1.0-RC3] Add migration for 3.1.0-RC3 2014-08-11 19:32:54 +02:00
Joas Schilling
b40225c142 [prep-release-3.1.0-RC3] Update version to 3.1.0-RC3 2014-08-11 19:30:55 +02:00
Joas Schilling
edbae9ceaa [ticket/12970] Regenerate schema.json with new dependencies
PHPBB3-12970
2014-08-11 19:09:59 +02:00
Nils Adermann
bad90dafbf Merge remote-tracking branch 'github-marc1706/ticket/12822' into develop-ascraeus
* github-marc1706/ticket/12822:
  [ticket/12822] Fix test runs of avatar manager_test
  [ticket/12822] Add method for deleting avatars and use confirm_box
  [ticket/12822] Remove "None" option from avatar select boxes
2014-08-11 17:37:56 +02:00
Marc Alexander
91df95a90d Merge pull request #2842 from Nicofuma/ticket/11854
[ticket/11854] Move captchas to phpbb/ and use DI for plugins
2014-08-11 12:20:35 +02:00
Tristan Darricau
756aa68b34 [ticket/11854] Don't override get service name in nogd
PHPBB3-11854
2014-08-11 08:04:14 +02:00
Marc Alexander
c10c6bd342 Merge pull request #2845 from rxu/ticket/12942
[ticket/12942] Add core.add_form_key core event
2014-08-11 07:37:57 +02:00