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

23580 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
Marc Alexander
6f804018d0 Merge branch 'develop-ascraeus' into develop 2014-08-11 07:32:27 +02:00
Marc Alexander
48ce9f5e9d Merge pull request #2867 from prototech/ticket/12967 
[ticket/12967] Fix undefined variable phpbb_dispatcher error.
 2014-08-11 07:31:59 +02:00
Marc Alexander
8f1b261500 Merge branch 'develop-ascraeus' into develop 2014-08-11 07:28:59 +02:00
Marc Alexander
71c9e6c67c Merge pull request #2863 from rxu/ticket/12944 
[ticket/12944] Add core.login_forum_box core event
 2014-08-11 07:27:42 +02:00
Tristan Darricau
4683864b4b [ticket/11854] Update tests 
PHPBB3-11854
 2014-08-11 01:17:01 +02:00
Tristan Darricau
fa2ac1f271 [ticket/11854] Use a set_name method instead of overriding get_service_name 
PHPBB3-11854
 2014-08-11 01:16:58 +02:00
Tristan Darricau
76633544ee [ticket/11854] Change the error message in reCaptcha 
PHPBB3-11854
 2014-08-11 01:16:55 +02:00
Tristan Darricau
fc4b1090cc [ticket/11854] Fix comments 
PHPBB3-11854
 2014-08-11 01:16:50 +02:00
Tristan Darricau
351a6dcad2 [ticket/11854] Base the migration on rc2 
PHPBB3-11854
 2014-08-11 01:16:46 +02:00
Tristan Darricau
2cbcf4bcbf [ticket/11854] Fix the factory in \phpbb\auth\provider\db 
PHPBB3-11854
 2014-08-11 01:16:42 +02:00
Tristan Darricau
036a61a904 [ticket/11854] Remove unused globals 
PHPBB3-11854
 2014-08-11 01:16:38 +02:00
Tristan Darricau
e889b8f931 [ticket/11854] Remove constants and use DI for QA tables 
PHPBB3-11854
 2014-08-11 01:16:35 +02:00
Tristan Darricau
02f3b74e8a [ticket/11854] Fix coding style 
PHPBB3-11854
 2014-08-11 01:16:30 +02:00
Tristan Darricau
850b7dbf07 [ticket/11854] Update the default captcha choosen during the installation 
PHPBB3-11854
 2014-08-11 01:16:28 +02:00
Tristan Darricau
bd09356c30 [ticket/11854] Rename captchas.plugins.service_collection service 
PHPBB3-11854
 2014-08-11 01:16:25 +02:00
Tristan Darricau
b91abf1a0b [ticket/11854] Rename captchas.factory service to captcha.factory 
PHPBB3-11854
 2014-08-11 01:16:22 +02:00
Tristan Darricau
d73d606f11 [ticket/11854] Fix various comments 
PHPBB3-11854
 2014-08-11 01:16:18 +02:00
Tristan Darricau
577f9ac7e4 [ticket/11854] Split phpbb\captcha\gd.php 
PHPBB3-11854
 2014-08-11 01:16:15 +02:00
Tristan Darricau
99b7d18ab2 [ticket/11854] Migrate all old php4 constructor 
PHPBB3-11854
 2014-08-11 01:16:10 +02:00
Tristan Darricau
28cf0ef832 [ticket/11854] Update unit tests 
PHPBB3-11854
 2014-08-11 01:16:07 +02:00
Tristan Darricau
6e4991093a [ticket/11854] Fix migration 
PHPBB3-11854
 2014-08-11 01:16:02 +02:00
Tristan Darricau
a1d5ad8a37 [ticket/11854] Add missing dot in the migration file 
PHPBB3-11854
 2014-08-11 01:15:58 +02:00
Tristan Darricau
dd88022a70 [ticket/11854] Add a migration to update the captcha_plugin setting 
PHPBB3-11854
 2014-08-11 01:15:54 +02:00
Tristan Darricau
160ff7b912 [ticket/11854] Move captcha stuff to phpbb/ and use DI for plugins 
PHPBB3-11854
 2014-08-11 01:15:49 +02:00
Michael Miday
ada35dca00 [ticket/12862] Remove remaining simple-wrap id 
PHPBB3-12862
 2014-08-11 00:55:26 +02:00
rxu
96e8b67a4e [ticket/12944] Add core.login_forum_box core event 
Add core.login_forum_box core event to allow extensions
performing additional actions on forum login.

PHPBB3-12944
 2014-08-11 06:35:36 +08:00
Cesar G
43a309ce2b [ticket/12967] Fix undefined variable phpbb_dispatcher error. 
PHPBB3-12967
 2014-08-11 00:34:12 +02:00
rxu
b20af9a6d2 [ticket/12942] Add core.add_form_key core event 
Add core.add_form_key core event to allow extensions modifying
form key.

PHPBB3-12942
 2014-08-11 02:15:05 +08:00
Dhruv
d86411b38a Merge branch 'develop-ascraeus' into develop 
# By Andreas Fischer
# Via Andreas Fischer (1) and Dhruv Goel (1)
* develop-ascraeus:
  [ticket/12964] Correct use of undefined $row variable.
 2014-08-10 18:38:08 +02:00
Dhruv Goel
e0d377bca7 Merge pull request #2866 from bantu/ticket/12964 
[ticket/12964] Correct use of undefined $row variable.
 2014-08-10 18:36:25 +02:00
Marc Alexander
06be2ff67d Merge branch 'develop-ascraeus' into develop 2014-08-10 18:07:11 +02:00
Marc Alexander
bc9b813ce7 Merge pull request #2864 from rxu/ticket/12931 
[ticket/12931] Fix general error on user registration
 2014-08-10 18:06:55 +02:00
Marc Alexander
db9bf6da33 Merge branch 'develop-ascraeus' into develop 2014-08-10 17:00:41 +02:00
Marc Alexander
2a5eca0391 Merge pull request #2714 from prototech/ticket/12809 
[ticket/12809] Fix select button and dropdown list items in RTL.
 2014-08-10 17:00:19 +02:00
Marc Alexander
752c73193e [ticket/12966] Sort posts by post_id in addition to sorting by post_time 
This should make sure that posts with the same post time are properly sorted
on database backends like postgres.

PHPBB3-12966
 2014-08-10 16:49:01 +02:00
Callum Macrae
7df97601a3 [ticket/12951] Made editorconfig file comments better 
PHPBB3-12951
 2014-08-10 15:55:02 +02:00
Andreas Fischer
f471eeda33 [ticket/12964] Correct use of undefined $row variable. 
PHPBB3-12964
 2014-08-10 15:54:56 +02:00
rxu
838d4dc2c6 [ticket/12931] Fix general error on user registration 
Fix "Illegal use of $_SERVER" general error on user registration
when $config['server_name'] is not set.

PHPBB3-12931
 2014-08-10 21:31:08 +08:00
Joas Schilling
d998efcf54 Merge branch 'develop-ascraeus' into develop 
* develop-ascraeus:
  [ticket/12932] Remove set_datetime_class method from user class
  [ticket/12932] Fix tests and calls to create_datetime
  [ticket/12932] Add method for getting the datetime class and allow overriding

Conflicts:
	phpBB/config/services.yml
 2014-08-10 15:24:43 +02:00