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

23580 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Marc Alexander
5df5b9c2d5 Merge branch 'develop-ascraeus' into develop 2014-09-08 16:47:43 +02:00
Marc Alexander
bcd4cebd48 Merge pull request #2915 from rxu/ticket/13026 
[ticket/13026] Add template vars array to core.viewonline_overwrite_location
 2014-09-08 16:46:26 +02:00
Marc Alexander
8a568a77f6 Merge branch 'develop-ascraeus' into develop 2014-09-08 16:30:31 +02:00
Marc Alexander
cc96bcff99 Merge pull request #2911 from rxu/ticket/13020 
[ticket/13020] Add variables to core.viewforum_get_topic_data event
 2014-09-08 16:30:05 +02:00
Andreas Fischer
04c073e138 Merge branch 'develop-ascraeus' into develop 
* develop-ascraeus:
  [ticket/13035] Remove empty meta tags

Conflicts:
	phpBB/styles/subsilver2/template/overall_header.html
	phpBB/styles/subsilver2/template/simple_header.html
 2014-09-08 13:46:16 +02:00
Andreas Fischer
33e5e426d4 Merge pull request #2933 from bantu/ticket/13035 
[ticket/13035] Remove empty meta tags

* bantu/ticket/13035:
  [ticket/13035] Remove empty meta tags
 2014-09-08 13:45:34 +02:00
dcz
85468ce2ec [ticket/13035] Remove empty meta tags 
PHPBB3-13035
 2014-09-08 13:09:38 +02:00
rxu
de7b100b8a [ticket/13020] Add forum_data variable to core.viewforum_get_topic_data event 
PHPBB3-13020
 2014-09-07 19:48:06 +08:00
rxu
d470d628f5 [ticket/13026] Add template vars array to core.viewonline_overwrite_location 
Add template vars array to core.viewonline_overwrite_location event
to allow modifying/adding template vars for every user row.

PHPBB3-13026
 2014-09-07 19:04:32 +08:00
Joas Schilling
54ccea9312 Merge branch 'develop-ascraeus' into develop 
* develop-ascraeus:
  [ticket/13048] Only update session_page if request is not ajax
 2014-09-07 12:50:55 +02:00
Joas Schilling
12398d65fd Merge pull request #2930 from Senky/ticket/13048 
[ticket/13048] AJAX requests are being stored to session_page

* Senky/ticket/13048:
  [ticket/13048] Only update session_page if request is not ajax
 2014-09-07 12:50:03 +02:00
Joas Schilling
8ed0f94e31 Merge branch 'develop-ascraeus' into develop 
* develop-ascraeus:
  [ticket/13047] Add $post_list array to core.viewtopic_modify_page_title event
 2014-09-07 12:47:36 +02:00
Joas Schilling
c1d0528d80 Merge pull request #2929 from rxu/ticket/13047 
[ticket/13047] Add $post_list array to core.viewtopic_modify_page_title event

* rxu/ticket/13047:
  [ticket/13047] Add $post_list array to core.viewtopic_modify_page_title event
 2014-09-07 12:47:13 +02:00
Joas Schilling
043a66faaa Merge branch 'develop-ascraeus' into develop 
* develop-ascraeus:
  [ticket/13046] Call phpbb_load_extensions_autoloaders() in $download/file.php
 2014-09-07 12:43:23 +02:00
Joas Schilling
b3a8e92810 Merge pull request #2928 from Nicofuma/ticket/13046 
[ticket/13046] Call phpbb_load_extensions_autoloaders() in $download/file.php

* Nicofuma/ticket/13046:
  [ticket/13046] Call phpbb_load_extensions_autoloaders() in $download/file.php
 2014-09-07 12:42:52 +02:00
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
Joas Schilling
d5801333f7 [ticket/12983] Do not test invalid values until Symfony 2.4 
PHPBB3-12983
 2014-09-07 10:40:18 +02:00
Jakub Senko
b218f3ad43 [ticket/13048] Only update session_page if request is not ajax 
PHPBB3-13048
 2014-09-07 10:15:51 +02:00
rxu
a6f1b22eb3 [ticket/13047] Add $post_list array to core.viewtopic_modify_page_title event 
PHPBB3-13047
 2014-09-07 13:36:23 +08:00
Tristan Darricau
088e34dc47 [ticket/13046] Call phpbb_load_extensions_autoloaders() in $download/file.php 
PHPBB3-13046
 2014-09-07 01:41:21 +02:00
Tristan Darricau
af10ca630d Merge branch 'develop-ascraeus' into develop 
* develop-ascraeus:
  [ticket/12852] Add unit tests
  [ticket/12852] Add space after if
  [ticket/12852] Remove whitespace
  [ticket/12852] Make get_url_parts handle get variable with no value
 2014-09-06 15:47:47 +02:00
Tristan Darricau
297ab5c526 Merge pull request #2919 from Senky/ticket/12852 
[ticket/12852] Make get_url_parts handle get variable with no value

* Senky/ticket/12852:
  [ticket/12852] Add unit tests
  [ticket/12852] Add space after if
  [ticket/12852] Remove whitespace
  [ticket/12852] Make get_url_parts handle get variable with no value
 2014-09-06 15:47:30 +02:00
Joas Schilling
647a75249c [ticket/12983] Add functional test for ucp pref module 
PHPBB3-12983
 2014-09-06 15:16:51 +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
21029e9fd2 [ticket/13031] Slightly change behavior of choose_mime_type and add unit tests 
The mime type 'application/octet-stream' will still always be overwritten by
proper guesses. However, guesses with guessers that have a higher priority
will now overwrite previous guesses even if the mime types of these guesses
had a slash in them.

PHPBB3-13031
 2014-09-05 21:55:49 +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
Marc Alexander
f7d41c8465 Merge branch 'develop-ascraeus' into develop 
Conflicts:
	phpBB/styles/subsilver2/template/ucp_header.html
 2014-09-05 21:07:02 +02:00
Marc Alexander
b854882470 Merge pull request #2868 from rxu/ticket/12969 
[ticket/12969] Add template events around username link on composing pm
 2014-09-05 21:05:33 +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
Jakub Senko
7b796532df [ticket/12852] Add unit tests 
PHPBB3-12852
 2014-09-04 17:56:48 +02:00
Jakub Senko
1d4cae9ecb [ticket/12852] Add space after if 
PHPBB3-12852
 2014-09-04 17:44:41 +02:00
Jakub Senko
28587d0afc [ticket/12852] Remove whitespace 
PHPBB3-12852
 2014-09-04 16:15:45 +02:00
Jakub Senko
17e4e5f8c4 [ticket/12852] Make get_url_parts handle get variable with no value 
PHPBB3-12852
 2014-09-04 13:33:04 +02:00
Marc Alexander
c46747aa9f Merge branch 'develop-ascraeus' into develop 2014-09-04 13:06:46 +02:00
Marc Alexander
10c99b3c2b Merge pull request #2917 from bantu/ticket/13032 
[ticket/13032] Update Symfony Components to 2.3.19
 2014-09-04 13:06:13 +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
Andreas Fischer
a3c63f6c03 [ticket/13032] Also update symfony/css-selector and pin it down. 
PHPBB3-13032
 2014-09-03 21:47:41 +02:00
Andreas Fischer
65577ed422 [ticket/13032] Update Symfony Components to 2.3.19 
PHPBB3-13032
 2014-09-03 21:40:38 +02:00
Marc Alexander
c5576710ec Merge pull request #2916 from Nicofuma/ticket/12661 
[ticket/12661] Fix unit tests
 2014-09-02 22:37:34 +02:00
Tristan Darricau
55a3c96fb0 [ticket/12661] Fix unit tests 
PHPBB3-12661
 2014-09-02 22:12:11 +02:00
Marc Alexander
cf5ae5abbc Merge branch 'develop-ascraeus' into develop 2014-09-02 20:55:25 +02:00
Marc Alexander
6777d462ff Merge pull request #2908 from Pico/t/12661 
[ticket/12661] Load extensions templates from "all" folder by render()
 2014-09-02 20:54:51 +02:00
Marc Alexander
da9888d04f Merge branch 'develop-ascraeus' into develop 
Conflicts:
	phpBB/styles/subsilver2/template/mcp_warn_post.html
	phpBB/styles/subsilver2/template/mcp_warn_user.html
 2014-09-01 22:46:08 +02:00
Marc Alexander
d86817ef07 Merge pull request #2887 from Pico/ticket/12991 
[ticket/12991] Have events after/before "add warning" field - user and post
 2014-09-01 22:43:54 +02:00
rxu
1d4c040d4f [ticket/12969] Add template events around username link on composing pm 
Add template event before/after find username link on composing pm
to allow extensions perform additional actions on user finding.

PHPBB3-12969
 2014-09-02 01:02:17 +08:00
Marc Alexander
d5003877e3 Merge pull request #2914 from Nicofuma/ticket/13024 
[ticket/13024] Fix event file (remove subsilver references)
 2014-09-01 00:44:33 +02:00