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,502 Commits 17 Branches 190 Tags
Commit Graph

23502 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Andreas Fischer
dde16e4b2a Merge branch 'develop-ascraeus' into develop 
* develop-ascraeus:
  [ticket/13008] Add functionnal test
  [ticket/13008] Use an absolute path with the FileLocator for the routing files
 2014-08-24 22:32:55 +02:00
Andreas Fischer
9fc5073540 Merge pull request #2905 from Nicofuma/ticket/13008 
[ticket/13008] Use an absolute path with the FileLocator for the routing files

* Nicofuma/ticket/13008:
  [ticket/13008] Add functionnal test
  [ticket/13008] Use an absolute path with the FileLocator for the routing files
 2014-08-24 22:32:54 +02:00
Tristan Darricau
0386b1788a [ticket/13008] Add functionnal test 
PHPBB3-13008
 2014-08-24 15:17:50 +02:00
Tristan Darricau
8144de3792 Merge branch 'develop-ascraeus' into develop 
* develop-ascraeus:
  [ticket/13010] Specifiy correct clean_row() call in phpbb_get_avatar docblock
 2014-08-24 00:26:57 +02:00
Tristan Darricau
154710aa50 Merge pull request #2907 from marc1706/ticket/13010 
[ticket/13010] Specifiy correct clean_row() call in phpbb_get_avatar docblock

* marc1706/ticket/13010:
  [ticket/13010] Specifiy correct clean_row() call in phpbb_get_avatar docblock
 2014-08-24 00:26:27 +02:00
Marc Alexander
c2f19239a1 Merge branch 'develop-ascraeus' into develop 2014-08-24 00:20:51 +02:00
Marc Alexander
e2c56609ab Merge pull request #2904 from Nicofuma/ticket/12990 
[ticket/12990] Disable all the notifications types which are not in the core
 2014-08-24 00:20:24 +02:00
Marc Alexander
6e274740df [ticket/13010] Specifiy correct clean_row() call in phpbb_get_avatar docblock 
PHPBB3-13010
 2014-08-24 00:11:43 +02:00
Tristan Darricau
1a41632af8 [ticket/12990] Disable all the notifications types which are not in the core 
PHPBB3-12990
 2014-08-23 23:39:46 +02:00
Andreas Fischer
05616b6ceb Merge branch 'develop-ascraeus' into develop 
* develop-ascraeus:
  [ticket/12658] Rebased and fixed unit tests
  [ticket/12658] Fix wrong eol character
  [ticket/12658] Refactoring code
  [ticket/12658] Fix typo and coding style mistakes
  [ticket/12658] Add test for command config:delete
  [ticket/12658] Add test for command config:increment
  [ticket/12658] Add test for command config:get
  [ticket/12658] Add test for command config:set-atomic
  [ticket/12658] Add test for base case of command config:set
 2014-08-23 13:21:51 +02:00
Andreas Fischer
1e09fd0cee Merge pull request #2551 from ptitlazy/ticket/12658 
[ticket/12658] Add test for base case of commands config:

* ptitlazy/ticket/12658:
  [ticket/12658] Rebased and fixed unit tests
  [ticket/12658] Fix wrong eol character
  [ticket/12658] Refactoring code
  [ticket/12658] Fix typo and coding style mistakes
  [ticket/12658] Add test for command config:delete
  [ticket/12658] Add test for command config:increment
  [ticket/12658] Add test for command config:get
  [ticket/12658] Add test for command config:set-atomic
  [ticket/12658] Add test for base case of command config:set
 2014-08-23 13:21:50 +02:00
Tristan Darricau
91804b53fb [ticket/12658] Rebased and fixed unit tests 
PHPBB3-12658
 2014-08-23 12:45:25 +02:00
LEZY Thomas
5a4de4aa1f [ticket/12658] Fix wrong eol character 
PHPBB3-12658
 2014-08-23 12:41:44 +02:00
LEZY Thomas
059f21a3ac [ticket/12658] Refactoring code 
PHPBB3-12658
 2014-08-23 12:41:42 +02:00
LEZY Thomas
ab6c9775d3 [ticket/12658] Fix typo and coding style mistakes 
PHPBB3-12658
 2014-08-23 12:41:41 +02:00
LEZY Thomas
f9803b7360 [ticket/12658] Add test for command config:delete 
PHPBB3-12658
 2014-08-23 12:41:39 +02:00
LEZY Thomas
3fbab9504b [ticket/12658] Add test for command config:increment 
PHPBB3-12658
 2014-08-23 12:41:37 +02:00
LEZY Thomas
9affb8c171 [ticket/12658] Add test for command config:get 
PHPBB3-12658
 2014-08-23 12:41:36 +02:00
LEZY Thomas
ede73b207b [ticket/12658] Add test for command config:set-atomic 
PHPBB3-12658
 2014-08-23 12:41:35 +02:00
LEZY Thomas
1662ee64e0 [ticket/12658] Add test for base case of command config:set 
PHPBB3-12658
 2014-08-23 12:41:32 +02:00
Tristan Darricau
03b9eb5dcb [ticket/13008] Use an absolute path with the FileLocator for the routing files 
PHPBB3-13008
 2014-08-23 12:34:23 +02:00
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
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
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
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