1
0
mirror of https://github.com/phpbb/phpbb.git synced 2025-02-24 20:13:22 +01:00

1900 Commits

Author SHA1 Message Date
Nathan Guse
1d243b78bb Merge pull request #1813 from marc1706/ticket/11912
[ticket/11912] Add mimetype guesser for proper mimetype guessing
2013-12-04 14:12:25 -08:00
Nathan Guse
97bf88dd32 Merge pull request #1879 from Pico88/ticket/12026
[ticket/12026] Correct path for template files
2013-12-04 13:59:59 -08:00
Nathan Guse
e399a52816 Merge pull request #1887 from nickvergessen/ticket/skouat/10910
[ticket/10910] Function build_cfg_template() allow $size for $tpl_type = select
2013-12-04 09:48:10 -08:00
Joas Schilling
b474917ba3 Merge remote-tracking branch 'Marc/ticket/11842' into develop
* Marc/ticket/11842:
  [ticket/11842] Add functional test for creating group
  [ticket/11842] Use avatar_data for obtaining driver that should be deleted
  [ticket/11842] Use type map for updating avatar types in database
  [ticket/11842] Add missing prefix for group id in avatar data
  [ticket/11842] Use only new avatar type in user_delete function
  [ticket/11842] Add migration file for updating avatar type in database
  [ticket/11842] Replace outdated occurences of user and group avatar_type
  [ticket/11842] Use group_id 0 and correct avatar name after creating group
2013-12-04 17:20:20 +01:00
Joas Schilling
fa33abaf0d Merge remote-tracking branch 'bantu/ticket/12056-develop' into develop
* bantu/ticket/12056-develop:
  [ticket/12056] group_user_attributes: Fix "Creating ... from empty value".
  [ticket/12056] Fix "Call to undefined function ...\utf8_normalize_nfc()"
  [ticket/12056] Fix "Call to undefined function ...\utf8_clean_string()"
  [ticket/12056] Fix "Call to a member function trigger_event() on a non-object".
  [ticket/12056] Fix "Call to undefined function phpbb\phpbb_get_plural_form()".
  [ticket/12056] Fix "undefined function phpbb_pcre_utf8_support()".
  [ticket/12056] validate_config_vars: Fix ".. undefined function utf8_strlen()"
  [ticket/12056] validate_config_vars: Fix "Creating ... from empty value".
  [ticket/12056] validate_range: Fix "Creating default object from empty value"
  [ticket/12056] build_select: Fix "Creating default object from empty value"
  [ticket/12056] h_radio test: Fix "Creating default object from empty value"
2013-12-04 16:01:32 +01:00
Marc Alexander
80fa658e8f [ticket/11842] Add functional test for creating group
PHPBB3-11842
2013-12-04 15:58:07 +01:00
Joas Schilling
8087a76c36 Merge branch 'develop-olympus' into develop
* develop-olympus:
  [ticket/12056] Fix failure due to "Creating default object from empty value".
2013-12-04 15:57:25 +01:00
Marc Alexander
abb2def48d [ticket/11842] Use avatar_data for obtaining driver that should be deleted
PHPBB3-11842
2013-12-04 15:42:17 +01:00
Andreas Fischer
3a03b01ce0 [ticket/12056] group_user_attributes: Fix "Creating ... from empty value".
PHPBB3-12056
2013-12-04 14:22:33 +01:00
Andreas Fischer
ffc24a507d [ticket/12056] Fix "Call to undefined function ...\utf8_normalize_nfc()"
PHPBB3-12056
2013-12-04 14:16:10 +01:00
Andreas Fischer
d589696827 [ticket/12056] Fix "Call to undefined function ...\utf8_clean_string()"
PHPBB3-12056
2013-12-04 14:13:59 +01:00
Andreas Fischer
b41781ed64 [ticket/12056] Fix "Call to a member function trigger_event() on a non-object".
PHPBB3-12056
2013-12-04 13:51:42 +01:00
Andreas Fischer
d63ac61b19 [ticket/12056] Fix "Call to undefined function phpbb\phpbb_get_plural_form()".
PHPBB3-12056
2013-12-04 13:46:51 +01:00
Andreas Fischer
417fddf710 [ticket/12056] Fix "undefined function phpbb_pcre_utf8_support()".
PHPBB3-12056
2013-12-04 13:44:33 +01:00
Andreas Fischer
7e160e4fc0 [ticket/12056] validate_config_vars: Fix ".. undefined function utf8_strlen()"
PHPBB3-12056
2013-12-04 13:37:56 +01:00
Andreas Fischer
0f41241273 [ticket/12056] validate_config_vars: Fix "Creating ... from empty value".
PHPBB3-12056
2013-12-04 13:36:23 +01:00
Andreas Fischer
70e47bc929 [ticket/12056] validate_range: Fix "Creating default object from empty value"
PHPBB3-12056
2013-12-04 13:33:19 +01:00
Andreas Fischer
c07b44716c [ticket/12056] build_select: Fix "Creating default object from empty value"
PHPBB3-12056
2013-12-04 13:31:12 +01:00
Andreas Fischer
c659fe4cbe [ticket/12056] h_radio test: Fix "Creating default object from empty value"
PHPBB3-12056
2013-12-04 13:29:40 +01:00
Andreas Fischer
e41cd384f5 [ticket/12056] Fix failure due to "Creating default object from empty value".
PHPBB3-12056
2013-12-04 13:22:47 +01:00
Joas Schilling
9fbeae3e0c [ticket/12026] Add functional test for ucp extension module
PHPBB3-12026
2013-12-03 18:10:33 +01:00
Joas Schilling
a8e29f0804 Merge branch 'develop-olympus' into develop
* develop-olympus:
  [ticket/11699] Also exclude the phpBB/cache directory.
  [ticket/11699] Properly exclude the .git directory. Namely missing dot prefix.
  [ticket/11699] Exclude build/new_version and build/old_versions from lint.
2013-12-02 23:33:24 +01:00
Andreas Fischer
0b55ab720c [ticket/12050] Make phpbb_notification_submit_post_base abstract.
PHPBB3-12050
2013-12-01 13:03:03 +01:00
Andreas Fischer
981df153d2 [ticket/11699] Also exclude the phpBB/cache directory.
PHPBB3-11699
2013-11-29 14:02:50 +01:00
Andreas Fischer
0834a749e7 [ticket/11699] Properly exclude the .git directory. Namely missing dot prefix.
PHPBB3-11699
2013-11-29 14:00:55 +01:00
Andreas Fischer
97b1d70a37 [ticket/11699] Exclude build/new_version and build/old_versions from lint.
PHPBB3-11699
2013-11-29 10:50:38 +01:00
Marc Alexander
33f4d267ef Merge branch 'develop' of https://github.com/phpbb/phpbb3 into ticket/11842
Conflicts:
	phpBB/includes/acp/acp_groups.php
2013-11-27 14:55:24 +01:00
Marc Alexander
c9c419c431 [ticket/11912] Expect logic exceptions in test if no guesser available
PHPBB3-11912
2013-11-23 01:19:43 +01:00
Marc Alexander
943ab555da Merge branch 'develop' of https://github.com/phpbb/phpbb3 into ticket/11912
Conflicts:
	phpBB/config/services.yml
2013-11-23 00:54:56 +01:00
Joas Schilling
8c73c9658e [ticket/10910] Fix unit tests
PHPBB3-10910
2013-11-22 15:51:22 +01:00
Mario Skouat
9861cd21dd [ticket/10910] Add unit tests for select
PHPBB3-10910
2013-11-22 15:04:39 +01:00
Joas Schilling
d213e23ab6 Merge remote-tracking branch 'Marc/ticket/11896' into develop
* Marc/ticket/11896:
  [ticket/11896] Use $form_time and fix out of bounds $form_time
  [ticket/11896] Correctly document return of null in docblocks
  [ticket/11896] Minor code improvements in phpbb_functional_test_case
  [ticket/11896] Add functional tests for marking all notifications read
  [ticket/11896] Add ability to define expected message after posting
  [ŧicket/11896] Set form_time with time() when marking all notifications read
2013-11-19 01:03:12 +01:00
Joas Schilling
632d6e9621 [ticket/12023] Add test for failing .css copy
PHPBB3-12023
2013-11-19 00:23:23 +01:00
Marc Alexander
7f10312bf2 [ticket/11896] Correctly document return of null in docblocks
Also got rid of previous incorrect comment in docblocks.

PHPBB3-11896
2013-11-14 15:17:25 +01:00
Marc Alexander
308329b547 [ticket/11896] Minor code improvements in phpbb_functional_test_case
Use assertContainsLang() and get rid of unnecessary logic in create_post()
and create_topic(). The docblocks were also slightly improved.

PHPBB3-11896
2013-11-14 15:09:49 +01:00
Cesar G
287c2550b8 [ticket/12008] Update the run time value for the prune notifications cron task
PHPBB3-12008
2013-11-14 01:05:58 -08:00
David King
8fd1f90e5f Merge pull request #1872 from nickvergessen/ticket/12017
Ticket/12017 Extension tests are broken on current develop
2013-11-13 16:34:32 -08:00
Joas Schilling
1e73e0c954 [ticket/12017] Fix phpbb requirement in composer.json
PHPBB3-12017
2013-11-14 00:15:23 +01:00
Joas Schilling
4e2bb6ef53 [ticket/12017] Copy config/ dir so events work
PHPBB3-12017
2013-11-14 00:14:53 +01:00
Joas Schilling
009a1303f5 [ticket/12017] Remove IN_PHPBB defined check
PHPBB3-12017
2013-11-14 00:14:04 +01:00
Nils Adermann
52845b22f2 Merge pull request #1815 from marc1706/ticket/11525
[ticket/11525] Only remove group or user prefix from given avatar data
2013-11-13 09:52:21 -08:00
Marc Alexander
13a4ceedb1 [ticket/11525] Use foreach instead of array_walk in method clean_row()
This approach is cleaner and probably even faster the previous ways that
included using array_walk() or array_map() and other helper functions
and methods.

PHPBB3-11525
2013-11-13 18:27:40 +01:00
Nils Adermann
e48b2c07eb Merge pull request #1871 from nickvergessen/ticket/12016
Ticket/12016 Event listeners should be services
2013-11-13 08:45:48 -08:00
Joas Schilling
fbf5911ac5 [ticket/12016] Update functional tests to use service for event listeners
PHPBB3-12016
2013-11-13 17:38:58 +01:00
Marc Alexander
95b22819a7 [ticket/11912] Use inverted $overload for setting function_exists in tests
PHPBB3-11912
2013-11-11 21:59:47 +01:00
Marc Alexander
bef6a5a640 [ticket/11912] Introduce guesser priority to mimetype guessers
The mimetype guesser priority can now be set through the service definition.
Mimetypes will be guessed from the guesser with the highest priority to
the one with the lowest priority. Standard priority types have been added
to the service definition file. Any integer value can be used though.
Standard mimetype guessers that do not have the methods get_priority
and set_priority implemented, like the standard MimeTypeGuessers of symfony,
will have the default priority with the value of 0. Lower priority guessers
have values lower than 0 while high priority ones can be added with values
higher than 0.

PHPBB3-11912
2013-11-11 21:18:23 +01:00
Marc Alexander
b1719db47d [ticket/11912] Add extension_guesser for guessing mimetype by extension
The content_guesser now only guesses the mimetype with the function
mime_content_type() while the guessing by extension is done using the
extension_guesser.

PHPBB3-11912
2013-11-11 20:15:28 +01:00
Nathan Guse
d69f35d450 Merge pull request #1853 from nickvergessen/ticket/11927
[ticket/11927] Correctly add new files on update
2013-11-11 09:40:50 -08:00
Joas Schilling
cfb0a41030 Merge remote-tracking branch 'EXreaction/ticket/11943' into develop
* EXreaction/ticket/11943:
  [ticket/11943] New line at EOF for define_error.html
  [ticket/11943] Forgot template file for test
  [ticket/11943] Throw an exception if DEFINE is setup improperly
  [ticket/11943] Split fix_inline_variable_tokens into 3 steps
  [ticket/11943] Require stricter DEFINE statements for templates
  [ticket/11943] Do not quote the value when it is exactly true, false, or null
  [ticket/11943] Add test for DEFINE $VAR = false
2013-11-11 18:23:37 +01:00
Nathan Guse
47e364ae68 [ticket/11943] New line at EOF for define_error.html
PHPBB3-11943
2013-11-11 10:59:17 -06:00