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

20931 Commits

Author SHA1 Message Date
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
76574d4b5e [ticket/8558] htmlspecialchars_decode the contact name for emails
PHPBB3-8558
2014-05-02 13:03:14 +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
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
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
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
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
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
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
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
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
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
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
PayBas
5ec67ed248 [ticket/12442] More heading classes
I think that about finishes the most important one

PHPBB3-12442
2014-04-30 09:44:28 +02:00
Joas Schilling
83cdad77ec Merge branch 'develop-olympus' into develop-ascraeus
* develop-olympus:
2014-04-29 21:29:29 +02:00
Joas Schilling
1ba6a45a78 Merge pull request #2362 from n-aleha/ticket/12186a
[ticket/12186] Move PM reports below post reports while installing for ascraeus

* n-aleha/ticket/12186a:
  [ticket/12186] Move PM reports below post reports while installing for ascraeus
  [ticket/12186] Move PM reports below post reports while installing
2014-04-29 21:29:18 +02:00
Joas Schilling
06e9d8871c Merge pull request #2319 from n-aleha/ticket/12186
[ticket/12186] Move PM reports below post reports while installing

* n-aleha/ticket/12186:
  [ticket/12186] Move PM reports below post reports while installing
2014-04-29 21:28:54 +02:00
Joas Schilling
417a0d0ea6 Merge pull request #2366 from bantu/ticket/12458
[ticket/12458] Apply Squiz.WhiteSpace.SuperfluousWhitespace.* to legacy code

* bantu/ticket/12458:
  [ticket/12458] Apply Squiz.WhiteSpace.SuperfluousWhitespace.* to legacy code.
2014-04-29 20:40:06 +02:00
Andreas Fischer
89391dec08 [ticket/12458] Apply Squiz.WhiteSpace.SuperfluousWhitespace.* to legacy code.
* There MUST NOT be trailing whitespace at the end of lines.
* There MUST NOT be whitespace before the first content of a file.
* There MUST NOT be whitespace after the last content of a file.
* Functions MUST NOT contain multiple empty lines in a row.

PHPBB3-12458
2014-04-29 17:51:21 +02:00
Andreas Fischer
40351fae96 Merge pull request #2364 from nickvergessen/ticket/12456
[ticket/12456] Missing new lines at the end of file in language files

* nickvergessen/ticket/12456:
  [ticket/12456] Add , after the last array element
  [ticket/12456] Fix duplicated empty lines in language files
  [ticket/12456] Fix missing new lines at the end of email templates
2014-04-29 17:08:49 +02:00
Joas Schilling
23b3667978 [ticket/12456] Add , after the last array element
PHPBB3-12456
2014-04-29 16:24:51 +02:00
Joas Schilling
38f05750b7 [ticket/12456] Fix duplicated empty lines in language files
PHPBB3-12456
2014-04-29 15:44:17 +02:00
Joas Schilling
cec060bb9b [ticket/12456] Fix missing new lines at the end of email templates
PHPBB3-12456
2014-04-29 15:43:55 +02:00
Joas Schilling
7f90ff70ac [ticket/12273] Move $extension to constructor so the path is always set
PHPBB3-12273
2014-04-28 23:52:48 +02:00
Joas Schilling
2d5bae555d [ticket/12273] Find events.md relative from the path not the phpbb root
PHPBB3-12273
2014-04-28 23:15:38 +02:00
Joas Schilling
8d9fb27edc [ticket/12273] Do not look in extensions docs/ and tests/ directory
PHPBB3-12273
2014-04-28 23:11:40 +02:00
Joas Schilling
f57df8e12e [ticket/12273] Also check file for adm "Location:" events
PHPBB3-12273
2014-04-28 21:14:29 +02:00
Joas Schilling
b28c8aebaa [ticket/12273] Do not allow template events in non-html files
PHPBB3-12273
2014-04-28 21:10:08 +02:00
Joas Schilling
da6eb0282d [ticket/12273] Fix return description
PHPBB3-12273
2014-04-28 21:08:48 +02:00
Joas Schilling
2928effb3c [ticket/12273] Update exporter to allow specifying an extension
PHPBB3-12273
2014-04-28 21:04:36 +02:00
Joas Schilling
ed669982c2 [ticket/12273] Allow to filter events for extensions
PHPBB3-12273
2014-04-28 21:03:59 +02:00
Nicofuma
5c33c20186 [ticket/12445] Change the formulation
PHPBB3-12445
2014-04-28 18:44:56 +02:00
Joas Schilling
bf8b9f0143 [ticket/12273] Remove old parameter from function call
PHPBB3-12273
2014-04-28 00:06:14 +02:00
Joas Schilling
35f8b7f5ea [ticket/12273] Fix table header for adm events
PHPBB3-12273
2014-04-27 23:54:12 +02:00