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

9150 commits

Author SHA1 Message Date
Marc Alexander
c00e0c55c5 Merge branch 'develop-ascraeus' into develop 2014-09-07 11:58:57 +02:00
Marc Alexander
a0ee6ccdf3 Merge pull request #2925 from nickvergessen/ticket/12983 
Ticket/12983 UCP preferences, Display posts ordering by: input is not properly validated
 2014-09-07 11:41:44 +02:00
Tristan Darricau
e0711b417f Merge branch 'develop-ascraeus' into develop 
* develop-ascraeus:
  [ticket/13031] Slightly change behavior of choose_mime_type and add unit tests
  [ticket/13031] Guess with all mimetype guessers and pick best guess
  [ticket/13031] Only use mimetype guesser guess if it helps us
 2014-09-06 13:54:16 +02:00
Tristan Darricau
6387bf8d13 Merge pull request #2918 from marc1706/ticket/13031 
[ticket/13031] Only use mimetype guesser guess if it helps us

* marc1706/ticket/13031:
  [ticket/13031] Slightly change behavior of choose_mime_type and add unit tests
  [ticket/13031] Guess with all mimetype guessers and pick best guess
  [ticket/13031] Only use mimetype guesser guess if it helps us
 2014-09-06 13:53:43 +02:00
Marc Alexander
bc38730ab5 Merge branch 'develop-ascraeus' into develop 2014-09-05 21:36:02 +02:00
Marc Alexander
6eaeae60f6 Merge pull request #2748 from carlo94it/ticket/12765 
[ticket/12765] Use db_tools instead of generating queries at moment
 2014-09-05 21:23:04 +02:00
Joas Schilling
b9cb3b9e3e [ticket/12983] Correctly validate sorting options in the UCP 
PHPBB3-12983
 2014-09-05 13:24:31 +02:00
Marc Alexander
d31ff51785 [ticket/13031] Guess with all mimetype guessers and pick best guess 
PHPBB3-13031
 2014-09-05 10:56:06 +02:00
Marc Alexander
7de15bc54c [ticket/13031] Only use mimetype guesser guess if it helps us 
If we already have a mimetype and the guesser's guess is the default fallback,
we should keep the already existing mimetype the browser supplied. Otherwise,
platforms that might not support mimetype guessers will cause us to always
have the mimetype set to application/octet-stream on images. This will prevent
users from uploading images.

PHPBB3-13031
 2014-09-03 23:09:17 +02:00
Marc Alexander
05a7a57815 Merge branch 'develop-ascraeus' into develop 2014-08-30 22:56:26 +02:00
Marc Alexander
01f821bbc3 Merge pull request #2826 from brunoais/ticket/12928 
[ticket/12928] core.mcp_reports_gather_query_before
 2014-08-30 22:55:56 +02:00
Dhruv
df3bc78af8 Merge branch 'develop-ascraeus' into develop 
# By Marc Alexander
# Via Dhruv Goel (1) and Marc Alexander (1)
* develop-ascraeus:
  [ticket/12966] Sort by post_time and post_id where applicable
  [ticket/12966] Sort posts by post_id in addition to sorting by post_time
 2014-08-29 20:44:41 +05:30
Dhruv Goel
6d9c0a76df Merge pull request #2865 from marc1706/ticket/12966 
[ticket/12966] Sort posts by post_id in addition to sorting by post_time
 2014-08-29 20:44:01 +05:30
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
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
Marc Alexander
e5e45f860b [ticket/12966] Sort by post_time and post_id where applicable 
This change was not applied to the search as this would require a larger
rewrite of the search methods.

PHPBB3-12966
 2014-08-23 16:36:39 +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
aa8403ff02 Merge branch 'develop-ascraeus' into develop 2014-08-20 22:04:14 +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
Tristan Darricau
71f78fb8c6 [ticket/12990] Use protected instead of private 
PHPBB3-12990
 2014-08-17 23:03:44 +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
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