mirror/php-phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-02-25 12:33:29 +01:00
Code Issues Releases Wiki Activity
23,515 Commits 17 Branches 190 Tags
Commit Graph

23515 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
Joas Schilling
7faf66c492 [ticket/12974] Update nightly build version to 3.2.0-a1-dev 
PHPBB3-12974
 2014-08-12 10:56:20 +02:00
Joas Schilling
483b40dfa3 Merge branch 'develop-ascraeus' into develop 
* develop-ascraeus:
  [prep-release-3.1.0-RC3] Update phpBB Version for RC4 development
  [prep-release-3.1.0-RC3] Add changelog for 3.1.0-RC3
  [prep-release-3.1.0-RC3] Prepare Changelog
  [prep-release-3.1.0-RC3] Add migration for 3.1.0-RC3
  [prep-release-3.1.0-RC3] Update version to 3.1.0-RC3

Conflicts:
	phpBB/styles/subsilver2/style.cfg
 2014-08-12 10:17:47 +02:00
Joas Schilling
e47b7540c3 Merge branch 'prep-release-3.1.0-RC3' into develop-ascraeus 
* prep-release-3.1.0-RC3:
  [prep-release-3.1.0-RC3] Update phpBB Version for RC4 development
  [prep-release-3.1.0-RC3] Add changelog for 3.1.0-RC3
  [prep-release-3.1.0-RC3] Prepare Changelog
  [prep-release-3.1.0-RC3] Add migration for 3.1.0-RC3
  [prep-release-3.1.0-RC3] Update version to 3.1.0-RC3
 2014-08-12 10:16:38 +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 release-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
Tristan Darricau
a60d4b2507 Merge branch 'develop-ascraeus' into develop 
* develop-ascraeus:
  [ticket/12970] Regenerate schema.json with new dependencies
 2014-08-11 19:26:37 +02:00
Tristan Darricau
f76d671dc7 Merge pull request #2870 from nickvergessen/ticket/12970 
[ticket/12970] Regenerate schema.json with new dependencies

* nickvergessen/ticket/12970:
  [ticket/12970] Regenerate schema.json with new dependencies
 2014-08-11 19:24:56 +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
24dc0a66eb Merge branch 'develop-ascraeus' into develop 
* develop-ascraeus:
  [ticket/12822] Correctly call \phpbb\user in avatar manager test
 2014-08-11 18:13:57 +02:00
Nils Adermann
96005ceb9e Merge remote-tracking branch 'github-marc1706/ticket/12822' into develop-ascraeus 
* github-marc1706/ticket/12822:
  [ticket/12822] Correctly call \phpbb\user in avatar manager test
 2014-08-11 18:13:51 +02:00
Marc Alexander
07576dc169 [ticket/12822] Correctly call \phpbb\user in avatar manager test 
PHPBB3-12822
 2014-08-11 18:04:20 +02:00
Nils Adermann
837ed8b6e1 Merge branch 'develop-ascraeus' into develop 
* develop-ascraeus:
  [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

Conflicts:
	phpBB/styles/subsilver2/template/ucp_groups_manage.html
	phpBB/styles/subsilver2/template/ucp_profile_avatar.html
 2014-08-11 17:38:29 +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
f09db1a7b4 Merge branch 'develop-ascraeus' into develop 
Conflicts:
	phpBB/config/services.yml
 2014-08-11 12:23:21 +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
7b35bd3e7c Merge branch 'develop-ascraeus' into develop 2014-08-11 07:38:22 +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