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

9121 Commits

Author SHA1 Message Date
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
3be239b864 [prep-release-3.1.0-RC3] Update phpBB Version for RC4 development 2014-08-12 10:15:42 +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
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
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
b91abf1a0b [ticket/11854] Rename captchas.factory service to captcha.factory 
PHPBB3-11854
 2014-08-11 01:16:22 +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
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
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
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
Joas Schilling
54b0ebc410 Merge pull request #2862 from marc1706/ticket/12932 
[ticket/12932] Add method for allowing override of \phpbb\datetime class

* marc1706/ticket/12932:
  [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
 2014-08-10 15:23:15 +02:00
Dhruv
58a863dbad Merge branch 'develop-ascraeus' into develop 
# By omniError
# Via Dhruv Goel (1) and omniError (1)
* develop-ascraeus:
  [ticket/12831] fix CS
  [ticket/12831] simplified code, upd event block
  [ticket/12831] reimplemented headers as array
  [ticket/12831] Optn to prevent setting HTTP headers
 2014-08-10 15:06:45 +02:00
Dhruv Goel
472fe9fe60 Merge pull request #2730 from omniError/ticket/12831 
[ticket/12831] Allow events in page_header functions to prevent the setting of HTTP headers
 2014-08-10 15:05:28 +02:00
Marc Alexander
8d99b4afe1 [ticket/12932] Fix tests and calls to create_datetime 
PHPBB3-12932
 2014-08-10 13:43:04 +02:00
Marc Alexander
a57a96cbdd [ticket/12932] Add method for getting the datetime class and allow overriding 
An extension can now override the datetime class by overwriting the
datetime.class parameter in their own yml file.

PHPBB3-12932
 2014-08-10 13:41:08 +02:00
Joas Schilling
9572cc0ccc Merge branch 'develop-ascraeus' into develop 
* develop-ascraeus:
  [ticket/12943] Add core.phpbb_generate_debug_output core event
 2014-08-10 13:23:15 +02:00
Joas Schilling
707568c496 Merge pull request #2846 from rxu/ticket/12943 
[ticket/12943] Add core.phpbb_generate_debug_output core event

* rxu/ticket/12943:
  [ticket/12943] Add core.phpbb_generate_debug_output core event
 2014-08-10 13:19:56 +02:00
Joas Schilling
9e0c234979 Merge branch 'develop-ascraeus' into develop 
* develop-ascraeus:
  [ticket/12938] Remove functional tests for 'Download all attachments'.
  [ticket/12938] Remove the 'Download all attachments' feature.
 2014-08-10 12:22:35 +02:00
Joas Schilling
1f6b9628e7 Merge pull request #2852 from bantu/ticket/12938 
[ticket/12938] Remove the 'Download all attachments' feature.

* bantu/ticket/12938:
  [ticket/12938] Remove functional tests for 'Download all attachments'.
  [ticket/12938] Remove the 'Download all attachments' feature.
 2014-08-10 12:22:22 +02:00
Tristan Darricau
e7e6d45789 [ticket/12957] Update the constructions of the template engine 
PHPBB3-12957
 2014-08-10 03:32:27 +02:00
omniError
71d39ab7d5 [ticket/12831] fix CS 
https://tracker.phpbb.com/browse/PHPBB3-12831

PHPBB3-12831
 2014-08-09 20:24:03 -05:00
omniError
7e4c3fde01 [ticket/12831] simplified code, upd event block 
https://tracker.phpbb.com/browse/PHPBB3-12831

PHPBB3-12831
 2014-08-09 18:48:26 -05:00
Tristan Darricau
59b5ab4866 Merge branch 'develop-ascraeus' into develop 
* develop-ascraeus:
  [ticket/12941] Fix remaining Sami complaints.
  [ticket/12941] Check for Sami parse errors on Travis CI.
  [ticket/12941] Add sami.conf.php for Travis CI.
 2014-08-10 01:02:38 +02:00
Tristan Darricau
b000d10ef8 Merge pull request #2849 from bantu/ticket/12941 
[ticket/12941] Check for Sami parse errors on Travis CI.

* bantu/ticket/12941:
  [ticket/12941] Fix remaining Sami complaints.
  [ticket/12941] Check for Sami parse errors on Travis CI.
  [ticket/12941] Add sami.conf.php for Travis CI.
 2014-08-10 01:02:27 +02:00
omniError
8989f6f878 [ticket/12831] reimplemented headers as array 
https://tracker.phpbb.com/browse/PHPBB3-12831

PHPBB3-12831
 2014-08-09 14:40:18 -05:00
Andreas Fischer
076d4ddd7f [ticket/12941] Fix remaining Sami complaints. 
PHPBB3-12941
 2014-08-09 18:08:49 +02:00
Tristan Darricau
04c084ead8 Merge branch 'develop-ascraeus' into develop 
* develop-ascraeus:
  [ticket/12718] Use a separate variable for sql query
  [ticket/12718] Fix spacing and type casting
  [ticket/12718] Fix docblocks
  [ticket/12718] Add tests to check user_posts on post deletion
  [ticket/12718] Update docblock
  [ticket/12718] Use remove_topic_from_statistic() for delete_topic
 2014-08-09 17:50:54 +02:00
Tristan Darricau
86f94f922c Merge pull request #2624 from dhruvgoel92/ticket/12718 
[ticket/12718] Use remove_topic_from_statistic() for delete_topic

* dhruvgoel92/ticket/12718:
  [ticket/12718] Use a separate variable for sql query
  [ticket/12718] Fix spacing and type casting
  [ticket/12718] Fix docblocks
  [ticket/12718] Add tests to check user_posts on post deletion
  [ticket/12718] Update docblock
  [ticket/12718] Use remove_topic_from_statistic() for delete_topic
 2014-08-09 17:33:44 +02:00
rxu
917cd4dec7 [ticket/12943] Add core.phpbb_generate_debug_output core event 
Add core.phpbb_generate_debug_output core event to allow extensions
outputting additional debug info.

PHPBB3-12943
 2014-08-09 23:02:36 +08:00
Andreas Fischer
12caf2f03d [ticket/12938] Remove the 'Download all attachments' feature. 
PHPBB3-12938
 2014-08-09 16:33:59 +02:00
Marc Alexander
4840584cd6 Merge branch 'develop-ascraeus' into develop 2014-08-09 13:06:01 +02:00
Marc Alexander
20b8ea947c Merge pull request #2833 from Geolim4/ticket/11520 
[ticket/11520] Re-adjust userpost count on topic fork
 2014-08-09 13:00:34 +02:00
Joas Schilling
d497104671 Merge branch 'develop-ascraeus' into develop 
* develop-ascraeus:
  [ticket/12841] Make config position default to after
  [ticket/12841] Update comments in tests making after default
  [ticket/12841] prefix function name with phpbb_
  [ticket/12841] Add a tests for the new function
  [ticket/12841] Fix white space issues reported by sniffer
  [ticket/12841] Allow extensions to position new config vars
 2014-08-09 11:44:18 +02:00
Joas Schilling
7a016572bd Merge pull request #2724 from VSEphpbb/ticket/12841 
[ticket/12841] Allow extensions to position new config vars

* VSEphpbb/ticket/12841:
  [ticket/12841] Make config position default to after
  [ticket/12841] Update comments in tests making after default
  [ticket/12841] prefix function name with phpbb_
  [ticket/12841] Add a tests for the new function
  [ticket/12841] Fix white space issues reported by sniffer
  [ticket/12841] Allow extensions to position new config vars
 2014-08-09 11:43:56 +02:00
Geolim4
3825aee130 [ticket/11520] Re-adjust userpost count on topic fork 
PHPBB3-11520
 2014-08-08 17:07:29 +02:00
Geolim4
af67bd3ea5 [ticket/11520] Coding guideline compliance 
PHPBB3-11520
 2014-08-08 17:07:16 +02:00
Geolim4
fc1e420a7c [ticket/11520] Re-adjust userpost count on topic fork 
PHPBB3-11520
 2014-08-08 17:05:40 +02:00