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

21296 commits

This branch
This branch
All branches
Author SHA1 Message Date
Joas Schilling
35cd0d8cc6 Merge branch 'develop-ascraeus' into develop 
* develop-ascraeus:
  [ticket/12421] Rebase and enable tests
  [ticket/12421] Don't parse [attachment] tags if user can't view them
 2014-05-06 21:50:54 +02:00
Joas Schilling
6d40d437eb Merge pull request #2330 from Nicofuma/ticket/12421 
[ticket/12421] Don't parse [attachment] tags if user can't view them

* Nicofuma/ticket/12421:
  [ticket/12421] Rebase and enable tests
  [ticket/12421] Don't parse [attachment] tags if user can't view them
 2014-05-06 21:50:42 +02:00
Andreas Fischer
801cac50bd Merge branch 'develop-ascraeus' into develop 
* develop-ascraeus:
  [ticket/12507] Move the 'require' statement
  [ticket/12507] Add console command to purge the cache
 2014-05-06 18:38:26 +02:00
Andreas Fischer
0d4a7d76f4 Merge pull request #2416 from Nicofuma/ticket/12507 
[ticket/12507] Add console command to purge the cache

* Nicofuma/ticket/12507:
  [ticket/12507] Move the 'require' statement
  [ticket/12507] Add console command to purge the cache
 2014-05-06 18:33:40 +02:00
Tristan Darricau
09011288b6 [ticket/12507] Move the 'require' statement 
PHPBB3-12507
 2014-05-06 17:58:31 +02:00
Tristan Darricau
06ecb62abd [ticket/12507] Add console command to purge the cache 
PHPBB3-12507
 2014-05-06 16:50:18 +02:00
Tristan Darricau
62b4e7b9d2 [ticket/12421] Rebase and enable tests 
PHPBB3-12421
 2014-05-06 14:54:22 +02:00
Dhruv
a9fe4ad1a4 Merge branch 'develop-ascraeus' into develop 
# By Joas Schilling
# Via Dhruv Goel (1) and Joas Schilling (1)
* develop-ascraeus:
  [ticket/12504] Use local variables where possible
  [ticket/12504] Use defined variables
  [ticket/12504] Remove unused request object from avatar manager test
  [ticket/12486] Make assertion on the return to remove "Risky" from phpunit
  [ticket/12486] Rename data provider to fix "Risky" from phpunit
  [ticket/12503] All tests should extend \phpbb_test_case
 2014-05-06 17:51:09 +05:30
Tristan Darricau
f4df3f0aaf [ticket/12421] Don't parse [attachment] tags if user can't view them 
https://tracker.phpbb.com/browse/PHPBB3-12421

PHPBB3-12421
 2014-05-06 14:19:55 +02:00
Dhruv Goel
571d6ae852 Merge pull request #2411 from nickvergessen/ticket/12503 
[ticket/12503] Fix several errors in test suite
 2014-05-06 17:49:23 +05:30
Joas Schilling
2772af18eb Merge branch 'develop-ascraeus' into develop 
* develop-ascraeus:
  [ticket/12459] Change language strings
  [ticket/12459] Enable related tests
  [ticket/12459] Fix: Differentiating unapproved and deleted posts
  [ticket/12459] Fix: Soft deleted topics should appear in feeds
  [ticket/12459] Fix: the posts were always marked as unapproved
 2014-05-06 14:09:04 +02:00
Joas Schilling
c7d29fbdb1 Merge pull request #2373 from Nicofuma/ticket/12459 
[ticket/12459] Unapproved posts/topics are not correctly handled in feeds

* Nicofuma/ticket/12459:
  [ticket/12459] Change language strings
  [ticket/12459] Enable related tests
  [ticket/12459] Fix: Differentiating unapproved and deleted posts
  [ticket/12459] Fix: Soft deleted topics should appear in feeds
  [ticket/12459] Fix: the posts were always marked as unapproved
 2014-05-06 13:59:09 +02:00
Joas Schilling
d5b39a45c8 Merge branch 'develop-ascraeus' into develop 
* develop-ascraeus:
  [ticket/11497] Rename set_ext_finder in find_routing_files
  [ticket/11497] Change the date in the package declaration
  [ticket/11497] Fix pagination tests
  [ticket/11497] Use a mock object to define the root folder for the finder
  [ticket/11497] Generate the list of the routes in controller_helper
  [ticket/11497] Fix the path for the finder in controller_provider
  [ticket/11497] Fix tests
  [ticket/11497] Update pagination test
  [ticket/11497] Remove 'ext.finder' from services' list
 2014-05-06 13:56:24 +02:00
Joas Schilling
1b3d54f5dd Merge pull request #2397 from Nicofuma/ticket/11497 
[ticket/11497] Remove 'ext.finder' from services' list

* Nicofuma/ticket/11497:
  [ticket/11497] Rename set_ext_finder in find_routing_files
  [ticket/11497] Change the date in the package declaration
  [ticket/11497] Fix pagination tests
  [ticket/11497] Use a mock object to define the root folder for the finder
  [ticket/11497] Generate the list of the routes in controller_helper
  [ticket/11497] Fix the path for the finder in controller_provider
  [ticket/11497] Fix tests
  [ticket/11497] Update pagination test
  [ticket/11497] Remove 'ext.finder' from services' list
 2014-05-06 13:51:29 +02:00
Cesar G
e5d18ac827 Merge branch 'develop-ascraeus' into develop 
* develop-ascraeus:
  [ticket/12332] Add missing semicolon to inline styling
  [ticket/12332] Adjust size of mark column where too wide
  [ticket/12332] Adjust column widths for responsive changes
  [ticket/12332] Restore some changes back to original state
  [ticket/12332] Add break-word to fixed width table CSS
  [ticket/12332] Accomplish all word creaking in template and CSS
  [ticket/12332] Remove width sizing, as it is already set
  [ticket/12332] Fix displaying attachments with long file names
 2014-05-05 16:51:50 -07:00
Cesar G
71379c3a0f Merge remote-tracking branch 'VSEphpbb/ticket/12332' into develop-ascraeus 
* VSEphpbb/ticket/12332:
  [ticket/12332] Add missing semicolon to inline styling
  [ticket/12332] Adjust size of mark column where too wide
  [ticket/12332] Adjust column widths for responsive changes
  [ticket/12332] Restore some changes back to original state
  [ticket/12332] Add break-word to fixed width table CSS
  [ticket/12332] Accomplish all word creaking in template and CSS
  [ticket/12332] Remove width sizing, as it is already set
  [ticket/12332] Fix displaying attachments with long file names
 2014-05-05 16:51:29 -07:00
Cesar G
63632d0713 Merge branch 'develop-ascraeus' into develop 
* develop-ascraeus:
  [ticket/12498] Adds height-property for IE8 in tweaks.css
 2014-05-05 16:46:07 -07:00
Cesar G
698d8551cf Merge remote-tracking branch 'Crizz0/ticket/12498' into develop-ascraeus 
* Crizz0/ticket/12498:
  [ticket/12498] Adds height-property for IE8 in tweaks.css
 2014-05-05 16:45:44 -07:00
Tristan Darricau
717f8a6671 [ticket/12459] Change language strings 
PHPBB3-12459
 2014-05-05 18:58:15 +02:00
Joas Schilling
d9de4fc72c [ticket/12504] Use local variables where possible 
PHPBB3-12504
 2014-05-05 18:31:01 +02:00
Joas Schilling
f27e4a44b8 [ticket/12504] Use defined variables 
PHPBB3-12504
 2014-05-05 18:27:00 +02:00
Joas Schilling
5d8d42d88a [ticket/12504] Remove unused request object from avatar manager test 
PHPBB3-12504
 2014-05-05 18:25:44 +02:00
Joas Schilling
fe99e60d82 [ticket/12486] Make assertion on the return to remove "Risky" from phpunit 
PHPBB3-12486
 2014-05-05 18:21:28 +02:00
Tristan Darricau
346c6f3998 [ticket/11497] Rename set_ext_finder in find_routing_files 
PHPBB3-11497
 2014-05-05 18:20:14 +02:00
Joas Schilling
e9dabb0903 [ticket/12486] Rename data provider to fix "Risky" from phpunit 
PHPBB3-12486
 2014-05-05 18:19:12 +02:00
Joas Schilling
baef26f7ed [ticket/12503] All tests should extend \phpbb_test_case 
PHPBB3-12503
 2014-05-05 18:16:50 +02:00
Joas Schilling
019952e846 Merge branch 'develop-ascraeus' into develop 
* develop-ascraeus:
  [ticket/12491] Fix clashing USERNAME_FULL template variable.
 2014-05-05 12:37:04 +02:00
Joas Schilling
324daf72fe Merge pull request #2409 from prototech/ticket/12491 
[ticket/12491] Fix clashing USERNAME_FULL template variable.

* prototech/ticket/12491:
  [ticket/12491] Fix clashing USERNAME_FULL template variable.
 2014-05-05 12:36:50 +02:00
Cesar G
a4aeb91ec0 [ticket/12491] Fix clashing USERNAME_FULL template variable. 
The user notes and user warn pages have a variable with the same name.

PHPBB3-12491
 2014-05-04 15:31:19 -07:00
Cesar G
7a3e79fc11 Merge branch 'develop-ascraeus' into develop 
* develop-ascraeus:
  [ticket/12415] Use private message instead of "pm" accronym
 2014-05-04 13:57:16 -07:00
Cesar G
0cc5cf57b2 Merge remote-tracking branch 'MGaetan89/ticket/12415' into develop-ascraeus 
* MGaetan89/ticket/12415:
  [ticket/12415] Use private message instead of "pm" accronym
 2014-05-04 13:55:14 -07:00
Andreas Fischer
fed96a9e7a Merge branch 'develop-ascraeus' into develop 
* develop-ascraeus:
  [ticket/12499] Incorrect call to phpbb\log\log::add() in db:migrate
 2014-05-04 22:40:45 +02:00
Andreas Fischer
0f4bff6101 Merge pull request #2407 from Nicofuma/ticket/12499 
[ticket/12499] Incorrect call to phpbb\log\log::add() in db:migrate

* Nicofuma/ticket/12499:
  [ticket/12499] Incorrect call to phpbb\log\log::add() in db:migrate
 2014-05-04 22:38:46 +02:00
Tristan Darricau
66b7eaa1ca [ticket/12499] Incorrect call to phpbb\log\log::add() in db:migrate 
https://tracker.phpbb.com/browse/PHPBB3-12499

PHPBB3-12499
 2014-05-04 22:20:22 +02:00
Joas Schilling
8f0006ec95 Merge branch 'develop-ascraeus' into develop 
* develop-ascraeus:
  [prep-release-3.1.0-b3] Update phpBB Version for b4 development
  [prep-release-3.1.0-b3] Add changelog for 3.1.0-b3
  [prep-release-3.1.0-b3] Prepare Changelog
  [prep-release-3.1.0-b3] Add migration for 3.1.0-b3
  [prep-release-3.1.0-b3] Update version to 3.1.0-b3
 2014-05-04 20:25:29 +02:00
Joas Schilling
6cca7d0443 Merge branch 'prep-release-3.1.0-b3' into develop-ascraeus 
* prep-release-3.1.0-b3:
  [prep-release-3.1.0-b3] Update phpBB Version for b4 development
  [prep-release-3.1.0-b3] Add changelog for 3.1.0-b3
  [prep-release-3.1.0-b3] Prepare Changelog
  [prep-release-3.1.0-b3] Add migration for 3.1.0-b3
  [prep-release-3.1.0-b3] Update version to 3.1.0-b3
 2014-05-04 20:25:11 +02:00
Joas Schilling
a469974c85 [prep-release-3.1.0-b3] Update phpBB Version for b4 development 2014-05-04 20:23:33 +02:00
Crizzo
2c8cb4dd60 [ticket/12498] Adds height-property for IE8 in tweaks.css 
PHPBB3-12498
 2014-05-04 18:58:27 +02:00
Joas Schilling
4f5ab1e5e7 [prep-release-3.1.0-b3] Add changelog for 3.1.0-b3 2014-05-04 17:47:19 +02:00
Joas Schilling
324a30315c [prep-release-3.1.0-b3] Prepare Changelog 2014-05-04 17:36:59 +02:00
Gaëtan Muller
eccdc74478 [ticket/12415] Use private message instead of "pm" accronym 
https://tracker.phpbb.com/browse/PHPBB3-12415

PHPBB3-12415
 2014-05-04 17:35:06 +02:00
Joas Schilling
eca1e582d0 [prep-release-3.1.0-b3] Add migration for 3.1.0-b3 2014-05-04 17:34:02 +02:00
Joas Schilling
80d113f688 [prep-release-3.1.0-b3] Update version to 3.1.0-b3 2014-05-04 17:27:20 +02:00
Joas Schilling
c4986448c9 Merge branch 'develop-ascraeus' into develop 
* develop-ascraeus:
  [ticket/12494] Undefined index: user_type on viewtopic.php
 2014-05-04 16:44:01 +02:00
Joas Schilling
5b6bce89c9 Merge pull request #2405 from Nicofuma/ticket/12494 
[ticket/12494] Undefined index: user_type on viewtopic.php

* Nicofuma/ticket/12494:
  [ticket/12494] Undefined index: user_type on viewtopic.php
 2014-05-04 16:43:47 +02:00
Joas Schilling
647a424ed1 Merge branch 'develop-ascraeus' into develop 
* develop-ascraeus:
  [ticket/12484] Add template event ucp_agreement_terms_before/after
 2014-05-04 16:41:24 +02:00
Joas Schilling
541de3281a Merge pull request #2394 from VSEphpbb/ticket/12484 
[ticket/12484] Add template event ucp_agreement_terms_before/after

* VSEphpbb/ticket/12484:
  [ticket/12484] Add template event ucp_agreement_terms_before/after
 2014-05-04 16:41:19 +02:00
Joas Schilling
73e07b497b Merge branch 'develop-ascraeus' into develop 
* develop-ascraeus:
  [ticket/12411] Improved change documentation
  [ticket/12411] Missed on bool var
  [ticket/12411] Corrected event vars description
  [ticket/12411] Expand vars of event: core.search_modify_tpl_ary
 2014-05-04 16:35:11 +02:00
Joas Schilling
40e28ac56b Merge pull request #2315 from PayBas/ticket/12411 
[ticket/12411] Expand vars of event: core.search_modify_tpl_ary

* PayBas/ticket/12411:
  [ticket/12411] Improved change documentation
  [ticket/12411] Missed on bool var
  [ticket/12411] Corrected event vars description
  [ticket/12411] Expand vars of event: core.search_modify_tpl_ary
 2014-05-04 16:35:03 +02:00
Joas Schilling
86f9a45040 Merge branch 'develop-ascraeus' into develop 
* develop-ascraeus:
  [ticket/12392] Fix avatar double assignment bug
  [ticket/12392] Include $profile_fields in core.memberlist_view_profile
 2014-05-04 16:31:55 +02:00