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

23769 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
Tristan Darricau
4f44e73b21 [ticket/13034] Fix unit tests 
PHPBB3-13034
 2014-09-04 23:21:56 +02:00
Tristan Darricau
cb3eb84665 [ticket/13034] Fix the route generated for the frontend not in the phpbb root 
PHPBB3-13034
 2014-09-04 23:21:55 +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
Tristan Darricau
61dc381be6 [ticket/13024] Fix event file (remove subsilver references) 
PHPBB3-13024
 2014-09-01 00:33:54 +02:00
Marc Alexander
34d8caf773 Merge branch 'develop-ascraeus' into develop 
Conflicts:
	phpBB/styles/subsilver2/template/viewtopic_body.html
 2014-08-31 19:31:13 +02:00
Marc Alexander
97c798a375 Merge pull request #2913 from Nicofuma/ticket/13024 
[ticket/13024] Add template event viewtopic_body_postrow_post_content_footer
 2014-08-31 19:30:01 +02:00
Tristan Darricau
76053b3cd4 [ticket/13024] Add template event viewtopic_body_postrow_post_content_footer 
PHPBB3-13024
 2014-08-30 23:52:14 +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
Pico
7fc550aedc [ticket/12991] Correct language mistakes 
PHPBB3-12991
 2014-08-30 06:31:55 +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
Marc Alexander
80a1314ebb Merge branch 'develop-ascraeus' into develop 2014-08-28 21:18:41 +02:00
Marc Alexander
cbbef46c6c Merge pull request #2909 from n-aleha/ticket/11909 
[ticket/11909] Remove unused function load_migrations
 2014-08-28 21:18:17 +02:00
PayBas
ab9cdcadfb [ticket/12961] Shorten ext-db link text 
PHPBB3-12961
 2014-08-26 12:45:54 +02:00
n-aleha
bcc1b7aec9 [ticket/11909] Remove unused function load_migrations 
Remove unused function load_migrations from \phpbb\db\migrator

PHPBB3-11909
 2014-08-26 02:56:47 +03:00
Pico
9d44c5d940 [ticket/12661] Add new line at the end of files 
PHPBB3-12661
 2014-08-25 22:35:55 +02:00
Cesar G
7048387620 Merge branch 'develop-ascraeus' into develop 
* develop-ascraeus:
  [ticket/12506] Fix search result h3 margin
  [ticket/12506] Fix responsive profile min-height (no avatar)
  [ticket/12506] Reposition buttons to make room for "online" banner
  [ticket/12506] Reposition post-buttons for compact layout
 2014-08-25 13:13:46 -07:00
Cesar G
7cd6dbe898 Merge remote-tracking branch 'PayBas/ticket/12506' into develop-ascraeus 
* PayBas/ticket/12506:
  [ticket/12506] Fix search result h3 margin
  [ticket/12506] Fix responsive profile min-height (no avatar)
  [ticket/12506] Reposition buttons to make room for "online" banner
  [ticket/12506] Reposition post-buttons for compact layout
 2014-08-25 13:13:25 -07:00
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
Pico88
273fc5b5b6 [ticket/12661] Add template test 
PHPBB3-12661
 2014-08-24 10:16:39 +02:00
Pico88
ae3b015f65 [ticket/12661] Load extensions templates from "all" folder by render() 
PHPBB3-12661
 2014-08-24 08:10:37 +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