makary/phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-06-16 08:18:53 +00:00
Code Issues Projects Releases Packages Wiki Activity
23481 commits 18 branches 192 tags 206 MiB
Commit graph

23481 commits

This branch
This branch
All branches
Author SHA1 Message Date
Andreas Fischer
10b525fd9f Merge branch 'develop-ascraeus' into develop 
* develop-ascraeus:
  [ticket/12862] Remove remaining simple-wrap id
  [ticket/12862] Resize popups consistently
  [ticket/12862] Add Border
 2014-08-23 11:40:38 +02:00
Andreas Fischer
a79da361ee Merge pull request #2783 from hanakin/ticket/12862 
[ticket/12862] Fix pop-up box wraps

* hanakin/ticket/12862:
  [ticket/12862] Remove remaining simple-wrap id
  [ticket/12862] Resize popups consistently
  [ticket/12862] Add Border
 2014-08-23 11:40:37 +02:00
Andreas Fischer
5f4726e607 Merge branch 'develop-ascraeus' into develop 
* develop-ascraeus:
  [ticket/13003] Add missing language keys
 2014-08-22 11:59:26 +02:00
Andreas Fischer
d2ed2c4e1e Merge pull request #2899 from Skouat/ticket/13003 
[ticket/13003] Add missing language keys

* Skouat/ticket/13003:
  [ticket/13003] Add missing language keys
 2014-08-22 11:59:26 +02:00
Andreas Fischer
3dd5712504 Merge branch 'develop-ascraeus' into develop 
* develop-ascraeus:
  [ticket/13004] Remove obsolete S_HAS_ATTACHMENTS check from topic tools.
 2014-08-21 22:48:16 +02:00
Andreas Fischer
39bfbc3a26 Merge pull request #2900 from prototech/ticket/13004 
[ticket/13004] Remove obsolete S_HAS_ATTACHMENTS check from topic tools.

* prototech/ticket/13004:
  [ticket/13004] Remove obsolete S_HAS_ATTACHMENTS check from topic tools.
 2014-08-21 22:48:15 +02:00
Marc Alexander
2544d8f9d9 Merge branch 'develop-ascraeus' into develop 2014-08-21 20:50:05 +02:00
Marc Alexander
7483d01942 Merge pull request #2898 from Nicofuma/ticket/12990 
[ticket/12990] Use {$var} instead of ${var}
 2014-08-21 20:49:41 +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
f08ef371c5 Merge branch 'develop-ascraeus' into develop 
* develop-ascraeus:
  [ticket/12999] Remove @author tags
 2014-08-21 13:44:10 +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
b2701f00e9 Merge branch 'develop-ascraeus' into develop 2014-08-21 00:44:27 +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
19aecaf7c7 Merge branch 'develop-ascraeus' into develop 2014-08-21 00:22:41 +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
Marc Alexander
aa8403ff02 Merge branch 'develop-ascraeus' into develop 2014-08-20 22:04:14 +02:00
Marc Alexander
43d7d47e9b Merge pull request #2895 from Nicofuma/ticket/12998 
[ticket/12998] Fix use of $lang in mcp_warn.php
 2014-08-20 22:03:50 +02: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
Andreas Fischer
6fb9fcd8ec Merge branch 'develop-ascraeus' into develop 
* develop-ascraeus:
  [ticket/12989] Remove unused "created_by.jpg"
 2014-08-19 21:29:18 +02:00
Andreas Fischer
0f3defbb26 Merge pull request #2893 from bantu/ticket/12989 
[ticket/12989] Remove unused "created_by.jpg"

* bantu/ticket/12989:
  [ticket/12989] Remove unused "created_by.jpg"
 2014-08-19 21:29:17 +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
Andreas Fischer
e9347ec839 Merge branch 'develop-ascraeus' into develop 
* develop-ascraeus:
  [ticket/12996] Fix reliability issue in flock test.
 2014-08-19 12:20:07 +02:00
Andreas Fischer
da3ddaf676 Merge pull request #2892 from bantu/ticket/12996 
[ticket/12996] Fix reliability issue in flock test.

* bantu/ticket/12996:
  [ticket/12996] Fix reliability issue in flock test.
 2014-08-19 12:20:06 +02:00
Fred Emmott
0ef7a9d455 [ticket/12996] Fix reliability issue in flock test. 
$delta was always an int - so, this test would sometimes fail if you
happened to call time() /very/ close to a 1s boundary.

Found by HHVM's continuous testing.

PHPBB3-12996
 2014-08-19 11:53:34 +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
Andreas Fischer
dc87e581c1 Merge branch 'develop-ascraeus' into develop 
* develop-ascraeus:
  [ticket/12984] Remove blank line when no forum description shown
 2014-08-17 22:31:46 +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
f1e9c24c66 Merge branch 'develop-ascraeus' into develop 
* develop-ascraeus:
  [ticket/12986] Fix detection of common words in search
 2014-08-17 01:14:47 +02: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
f3076cf444 Merge branch 'develop-ascraeus' into develop 
* develop-ascraeus:
  [ticket/12975] Fix the construction of phpbb\auth\provider\db for Oauth
 2014-08-16 09:50:51 +02: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
Marc Alexander
bebcd59694 Merge branch 'develop-ascraeus' into develop 2014-08-14 14:47:50 +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
Cesar G
baa9f17f7c Merge branch 'develop-ascraeus' into develop 
* develop-ascraeus:
  [ticket/12856] Remove images from assets/plupload/img/
  [ticket/12856] Copy plupload images to prosilver dir
 2014-08-13 15:01:06 -07:00
Cesar G
26b8c6cc13 Merge remote-tracking branch 'PayBas/ticket/12856' into develop-ascraeus 
* PayBas/ticket/12856:
  [ticket/12856] Remove images from assets/plupload/img/
  [ticket/12856] Copy plupload images to prosilver dir
 2014-08-13 15:00:48 -07: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
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
Dhruv
2302bc2473 Merge branch 'develop-ascraeus' into develop 
# By Callum Macrae
# Via Callum Macrae (1) and Dhruv Goel (1)
* develop-ascraeus:
  [ticket/12951] Made editorconfig file comments better
  [ticket/12951] Added editorconfig
 2014-08-12 16:17:24 +02:00
Dhruv Goel
1dc2d0e759 Merge pull request #2853 from callumacrae/ticket/12951 
[ticket/12951] Added editorconfig
 2014-08-12 16:15:47 +02:00
Tristan Darricau
cf0356f71a Merge pull request #2871 from nickvergessen/ticket/12974 
[ticket/12974] Update nightly build version to 3.2.0-a1-dev

* nickvergessen/ticket/12974:
  [ticket/12974] Update nightly build version to 3.2.0-a1-dev
 2014-08-12 10:59:47 +02:00