Commit graph

21140 commits

Author SHA1 Message Date
Andreas Fischer
370015c1a5 [ticket/12468] Having mbstring.http_input set to '' is as good as 'pass'.
PHPBB3-12468
2014-05-02 14:41:08 +02:00
Andreas Fischer
bfc31f55b2 Merge branch 'develop-ascraeus' into develop
* develop-ascraeus:
  [ticket/12467] Add config*.php and tests_config*.php to .gitignore
2014-05-02 14:22:09 +02:00
Andreas Fischer
5e95815503 Merge branch 'develop-olympus' into develop-ascraeus
* develop-olympus:
  [ticket/12467] Add config*.php and tests_config*.php to .gitignore
2014-05-02 14:22:02 +02:00
Andreas Fischer
43c6fd768f Merge pull request #2371 from nickvergessen/ticket/12467
[ticket/12467] Add config*.php and tests_config*.php to .gitignore

* nickvergessen/ticket/12467:
  [ticket/12467] Add config*.php and tests_config*.php to .gitignore
2014-05-02 14:21:54 +02:00
Joas Schilling
535cd5670f [ticket/12467] Add config*.php and tests_config*.php to .gitignore
PHPBB3-12467
2014-05-02 13:47:30 +02:00
Nils Adermann
b6925ca6d1 Merge branch 'develop-ascraeus' into develop
* develop-ascraeus:
  [ticket/12403] Add template events to acp_users_prefs.html
2014-05-02 13:35:09 +02:00
Nils Adermann
2a280513ca Merge remote-tracking branch 'github-rxu/ticket/12403' into develop-ascraeus
* github-rxu/ticket/12403:
  [ticket/12403] Add template events to acp_users_prefs.html
2014-05-02 13:35:01 +02:00
Nils Adermann
f1a1a84bf0 Merge branch 'develop-ascraeus' into develop
* develop-ascraeus:
  [ticket/8960] Allow changing avatar path if it's not writable
2014-05-02 13:26:31 +02:00
Nils Adermann
ef0600bfa2 Merge remote-tracking branch 'github-marc1706/ticket/8960' into develop-ascraeus
* github-marc1706/ticket/8960:
  [ticket/8960] Allow changing avatar path if it's not writable
2014-05-02 13:26:03 +02:00
Nicofuma
8812cfcfbf [ticket/12413] Update configuration's asserts
PHPBB3-12413
2014-05-02 13:25:55 +02:00
Nicofuma
2bc4c0e39f [ticket/12413] Update init
PHPBB3-12413
2014-05-02 13:25:54 +02:00
Nicofuma
87fe1e6136 [ticket/12413] Remove unnecessary casts
PHPBB3-12413
2014-05-02 13:25:52 +02:00
Nicofuma
dcadc04b18 [ticket/12413] Disabled unapproved and solftdeleted tests
PHPBB3-12413
2014-05-02 13:25:51 +02:00
Nicofuma
21e2f5c517 [ticket/12413] Move parent:open() call to the end of the function
PHPBB3-12413
2014-05-02 13:25:49 +02:00
Nicofuma
ff2d26e7e8 [ticket/12413] Coding style again
PHPBB3-12413
2014-05-02 13:25:47 +02:00
Nicofuma
80b4a7f337 [ticket/12413] Fix coding style
PHPBB3-12413
2014-05-02 13:25:46 +02:00
Nicofuma
7d8d8394fc [ticket/12413] Fix: coding style
PHPBB3-12413
2014-05-02 13:25:44 +02:00
Nicofuma
ac59b6a199 [ticket/12413] Fixing the failed test
The test was failing because travis is too fast: 2 posts had the same
timestamp.

PHPBB3-12413
2014-05-02 13:25:42 +02:00
Nicofuma
edf0fd0fbd [ticket/12413] Adding the missing visibilities
PHPBB3-12413
2014-05-02 13:25:40 +02:00
Tristan Darricau
6c58f8cdee [ticket/12413] Using static attribute instead of @depends
Using a static attribute to store the initial state of the feeds instead
of transmit it with the @depends annotation.

This attribute is also added to backupStaticAttributesBlackList

PHPBB3-12413
2014-05-02 13:25:38 +02:00
Tristan Darricau
13d939b7e1 [ticket/12413] Useing @depends to transmit the state of the board
the state of the board is calculate in the first test and transmit to the
others thanks to the @depends annotation.

PHPBB3-12413
2014-05-02 13:25:36 +02:00
Tristan Darricau
103befc3d6 [ticket/12413] Tests: Adding functional tests for the feeds
Some tests are disabled until PHPBB3-12418 (#2331) and PHPBB3-12421 (#2330) are
fixed and merged

PHPBB3-12413
2014-05-02 13:25:35 +02:00
Tristan Darricau
e7f970e26d [ticket/12413] Fatal Error for feed.php?mode=forums
https://tracker.phpbb.com/browse/PHPBB3-12413
http://area51.phpbb.com/phpBB/viewtopic.php?f=81&t=45475

PHPBB3-12413
2014-05-02 13:25:33 +02:00
Nils Adermann
fa230b48ec Merge remote-tracking branch 'github-marc1706/ticket/8960-olympus' into develop-olympus
* github-marc1706/ticket/8960-olympus:
  [ticket/8960] Allow changing avatar path if it's not writable
2014-05-02 13:25:29 +02:00
Nils Adermann
f91b27584b Merge branch 'develop-ascraeus' into develop
* develop-ascraeus:
  [ticket/8558] htmlspecialchars_decode the contact name for emails
2014-05-02 13:03:59 +02:00
Nils Adermann
76574d4b5e [ticket/8558] htmlspecialchars_decode the contact name for emails
PHPBB3-8558
2014-05-02 13:03:14 +02:00
Nils Adermann
9d00e95229 Merge branch 'develop-ascraeus' into develop
* develop-ascraeus:
  [ticket/8558] Fix operator
  [ticket/8558] Fix field length in ACP
  [ticket/8558] Use only one variable and improve explain string
  [ticket/8558] Add config in migrations and schema_data
  [ticket/8558] Add display name in emails from board
2014-05-02 12:50:24 +02:00
Nils Adermann
854854b60f Merge remote-tracking branch 'github-elsensee/ticket/stenudd/8558-2' into develop-ascraeus
* github-elsensee/ticket/stenudd/8558-2:
  [ticket/8558] Fix operator
  [ticket/8558] Fix field length in ACP
  [ticket/8558] Use only one variable and improve explain string
  [ticket/8558] Add config in migrations and schema_data
  [ticket/8558] Add display name in emails from board

Conflicts:
	phpBB/includes/functions_messenger.php
2014-05-02 12:49:07 +02:00
Nils Adermann
367abd2297 Merge branch 'develop-ascraeus' into develop
* develop-ascraeus:
  [ticket/8558] Do string concatenation only once and do htmlspecialchars
  [ticket/8558] Add display name in emails from board
2014-05-02 12:43:20 +02:00
Nils Adermann
e511ea71c1 Merge remote-tracking branch 'github-elsensee/ticket/stenudd/8558' into develop-ascraeus
* github-elsensee/ticket/stenudd/8558:
  [ticket/8558] Do string concatenation only once and do htmlspecialchars
  [ticket/8558] Add display name in emails from board
2014-05-02 12:42:32 +02:00
Nils Adermann
69a14cf238 Merge branch 'develop-ascraeus' into develop
* develop-ascraeus:
  [ticket/12409] Add acp_users.php core events to modify users preferences data
2014-05-02 12:29:37 +02:00
Nils Adermann
0c02607aa8 Merge remote-tracking branch 'github-rxu/ticket/12409' into develop-ascraeus
* github-rxu/ticket/12409:
  [ticket/12409] Add acp_users.php core events to modify users preferences data
2014-05-02 12:29:18 +02:00
Nils Adermann
5f76c8be07 Merge branch 'develop-ascraeus' into develop
* develop-ascraeus: (55 commits)
  [ticket/12273] Move $extension to constructor so the path is always set
  [ticket/12273] Find events.md relative from the path not the phpbb root
  [ticket/12273] Do not look in extensions docs/ and tests/ directory
  [ticket/12273] Also check file for adm "Location:" events
  [ticket/12273] Do not allow template events in non-html files
  [ticket/12273] Fix return description
  [ticket/12273] Update exporter to allow specifying an extension
  [ticket/12273] Allow to filter events for extensions
  [ticket/12273] Remove old parameter from function call
  [ticket/12273] Fix table header for adm events
  [ticket/12273] Add root path to recursive_event_filter_iterator
  [ticket/12273] Fix missing classes in export_events_for_wiki.php
  [ticket/12273] Use RecursiveDirectoryIterator with filter in php_exporter
  [ticket/12273] Use RecursiveDirectoryIterator in md_exporter
  [ticket/12273] Fix doc blocks
  [ticket/12273] Do not allow 3.1-A1 for template events
  [ticket/12273] Sort arguments alphabetically before exporting
  [ticket/12273] Do not allow 3.1-A1 version
  [ticket/12273] Update since version to 3.1.0-a* style
  [ticket/12273] Update existing events
  ...
2014-05-02 12:25:04 +02:00
Nils Adermann
7c2239e75c Merge remote-tracking branch 'github-nickvergessen/ticket/12273' into develop-ascraeus
* github-nickvergessen/ticket/12273: (55 commits)
  [ticket/12273] Move $extension to constructor so the path is always set
  [ticket/12273] Find events.md relative from the path not the phpbb root
  [ticket/12273] Do not look in extensions docs/ and tests/ directory
  [ticket/12273] Also check file for adm "Location:" events
  [ticket/12273] Do not allow template events in non-html files
  [ticket/12273] Fix return description
  [ticket/12273] Update exporter to allow specifying an extension
  [ticket/12273] Allow to filter events for extensions
  [ticket/12273] Remove old parameter from function call
  [ticket/12273] Fix table header for adm events
  [ticket/12273] Add root path to recursive_event_filter_iterator
  [ticket/12273] Fix missing classes in export_events_for_wiki.php
  [ticket/12273] Use RecursiveDirectoryIterator with filter in php_exporter
  [ticket/12273] Use RecursiveDirectoryIterator in md_exporter
  [ticket/12273] Fix doc blocks
  [ticket/12273] Do not allow 3.1-A1 for template events
  [ticket/12273] Sort arguments alphabetically before exporting
  [ticket/12273] Do not allow 3.1-A1 version
  [ticket/12273] Update since version to 3.1.0-a* style
  [ticket/12273] Update existing events
  ...
2014-05-02 12:22:05 +02:00
Nils Adermann
fa06988eed Merge branch 'develop-ascraeus' into develop
* develop-ascraeus:
  [ticket/12371] Fix language string
  [ticket/12371] Fix typos in comment
  [ticket/12371] Fix redirect link for approve_post and post_in_queue
  [ticket/12371] Delete the approve_post notification when editing a post
  [ticket/12371] Fix language in comment
  [ticket/12371] Reapprove the post and topic again in tests
  [ticket/12371] Correctly set is_starter when editing first post of the topic
  [ticket/12371] Add functional tests for reapproving
  [ticket/12371] Fix query in mcp_sorting()
  [ticket/12371] Rename disapprove and softdelete tests
  [ticket/12371] We do not group quote notifications anymore
  [ticket/12371] Fix SQL query
  [ticket/11772] Do not send out new topic/post notifications when reapproving
  [ticket/12052] Use different visibility when post was edited
  [ticket/12052] Add support for ITEM_UNAPPROVED to set_post_visibility method
  [ticket/12371] Do not add unlimited users as responders
  [ticket/12371] Do not update the notification entry unneccessarily
  [ticket/12371] Do not delete post related notifications when a post is deleted
  [ticket/12371] Allow notification types to redirect to a different url
  [ticket/12371] Do not group "quote" notifications
2014-05-02 12:11:30 +02:00
Nils Adermann
d36795b844 Merge remote-tracking branch 'github-nickvergessen/ticket/12371' into develop-ascraeus
* github-nickvergessen/ticket/12371:
  [ticket/12371] Fix language string
  [ticket/12371] Fix typos in comment
  [ticket/12371] Fix redirect link for approve_post and post_in_queue
  [ticket/12371] Delete the approve_post notification when editing a post
  [ticket/12371] Fix language in comment
  [ticket/12371] Reapprove the post and topic again in tests
  [ticket/12371] Correctly set is_starter when editing first post of the topic
  [ticket/12371] Add functional tests for reapproving
  [ticket/12371] Fix query in mcp_sorting()
  [ticket/12371] Rename disapprove and softdelete tests
  [ticket/12371] We do not group quote notifications anymore
  [ticket/12371] Fix SQL query
  [ticket/11772] Do not send out new topic/post notifications when reapproving
  [ticket/12052] Use different visibility when post was edited
  [ticket/12052] Add support for ITEM_UNAPPROVED to set_post_visibility method
  [ticket/12371] Do not add unlimited users as responders
  [ticket/12371] Do not update the notification entry unneccessarily
  [ticket/12371] Do not delete post related notifications when a post is deleted
  [ticket/12371] Allow notification types to redirect to a different url
  [ticket/12371] Do not group "quote" notifications
2014-05-02 12:11:09 +02:00
Joas Schilling
5c7199f3dd [ticket/12371] Fix language string
PHPBB3-12371
2014-05-02 11:51:40 +02:00
Joas Schilling
2bb12d0d6f [ticket/12371] Fix typos in comment
PHPBB3-12371
2014-05-02 11:51:20 +02:00
Nathaniel Guse
391275dd07 Merge branch 'develop-ascraeus' into develop
# By Crizzo
# Via Crizzo (1) and Nathaniel Guse (1)
* develop-ascraeus:
  [ticket/12404] Splits up the line 18 in subsilver2 into more lines
  [ticket/12404] Changes append/prepend to after/before
  [ticket/12404] Adds two new events and changes some places
  [ticket/12404] Adds a new event before and after the Timezone display
2014-05-01 22:24:37 -05:00
Nathaniel Guse
73b950d2f1 Merge remote-tracking branch 'remotes/Crizz0/ticket/12404' into develop-ascraeus
# By Crizzo
# Via Crizzo
* remotes/Crizz0/ticket/12404:
  [ticket/12404] Splits up the line 18 in subsilver2 into more lines
  [ticket/12404] Changes append/prepend to after/before
  [ticket/12404] Adds two new events and changes some places
  [ticket/12404] Adds a new event before and after the Timezone display
2014-05-01 22:24:31 -05:00
Nathaniel Guse
bf32b31f8a Merge branch 'develop-ascraeus' into develop
# By Nicofuma
# Via Nathaniel Guse (1) and Nicofuma (1)
* develop-ascraeus:
  [ticket/12432] Correcting the assertion
  [ticket/12432] Adding unit test
  [ticket/12432] Migrator should not revert custom functions
2014-05-01 22:16:07 -05:00
Nathaniel Guse
4f393ad096 Merge remote-tracking branch 'remotes/Nicofuma/ticket/12432' into develop-ascraeus
# By Nicofuma
# Via Nicofuma
* remotes/Nicofuma/ticket/12432:
  [ticket/12432] Correcting the assertion
  [ticket/12432] Adding unit test
  [ticket/12432] Migrator should not revert custom functions
2014-05-01 22:16:02 -05:00
Nathaniel Guse
e31a071f2b Merge branch 'develop-ascraeus' into develop
# By PayBas
# Via Nathaniel Guse (1) and PayBas (1)
* develop-ascraeus:
  [ticket/12442] More heading classes
  [ticket/12442] Add CSS classes to important headings
2014-05-01 22:00:29 -05:00
Nathaniel Guse
f0036d2ac6 Merge remote-tracking branch 'remotes/PayBas/ticket/12442' into develop-ascraeus
# By PayBas
# Via PayBas
* remotes/PayBas/ticket/12442:
  [ticket/12442] More heading classes
  [ticket/12442] Add CSS classes to important headings
2014-05-01 21:55:45 -05:00
Nathaniel Guse
8ae229febe Merge branch 'develop-ascraeus' into develop
# By Nicofuma
# Via Nathaniel Guse (1) and Nicofuma (1)
* develop-ascraeus:
  [ticket/12444] Replacing spaces with tabs
  [ticket/12444] Replace spaces with tabs
  [ticket/12444] Adding regression test
  [ticket/12444] The logs message aren't filled correctly
2014-05-01 21:49:55 -05:00
Nathaniel Guse
4f236729e4 Merge remote-tracking branch 'remotes/Nicofuma/ticket/12444' into develop-ascraeus
# By Nicofuma
# Via Nicofuma
* remotes/Nicofuma/ticket/12444:
  [ticket/12444] Replacing spaces with tabs
  [ticket/12444] Replace spaces with tabs
  [ticket/12444] Adding regression test
  [ticket/12444] The logs message aren't filled correctly
2014-05-01 21:49:18 -05:00
Nathaniel Guse
a3995d123a Merge branch 'develop-ascraeus' into develop
# By Nicofuma
# Via Nathaniel Guse (1) and Nicofuma (1)
* develop-ascraeus:
  [ticket/12445] Change the formulation
  [ticket/12445] Disapproved post: the name of the poster should be in logs
2014-05-01 21:47:06 -05:00
Nathaniel Guse
5c54cd6a45 Merge remote-tracking branch 'remotes/Nicofuma/ticket/12445' into develop-ascraeus
# By Nicofuma
# Via Nicofuma
* remotes/Nicofuma/ticket/12445:
  [ticket/12445] Change the formulation
  [ticket/12445] Disapproved post: the name of the poster should be in logs
2014-05-01 21:46:34 -05:00
Nathaniel Guse
730b73dab7 Merge branch 'develop-ascraeus' into develop
# By Cesar G
# Via Cesar G (1) and Nathaniel Guse (1)
* develop-ascraeus:
  [ticket/11339] Always clear timeout functions on subsequent AJAX calls
2014-05-01 21:36:25 -05:00
Nathaniel Guse
621023e4ae Merge remote-tracking branch 'remotes/prototech/ticket/11339' into develop-ascraeus
# By Cesar G
# Via Cesar G
* remotes/prototech/ticket/11339:
  [ticket/11339] Always clear timeout functions on subsequent AJAX calls
2014-05-01 21:35:40 -05:00