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

20672 Commits

Author SHA1 Message Date
Joas Schilling
3ce479f061 Merge remote-tracking branch 'marc/ticket/12398' into develop-ascraeus
* marc/ticket/12398:
  [ticket/12398] Select correct post to restore during softdelete tests
2014-04-13 22:42:45 +02:00
Marc Alexander
ad1513cde9 [ticket/12398] Select correct post to restore during softdelete tests
PHPBB3-12398
2014-04-13 22:22:55 +02:00
Oliver Schramm
dde7ac3b2b [ticket/10423] Match multiple wildcards
Multiple wildcards are removed from the string if there is
no word before or after them. If there is a word before or
after them, they are just replaced with a single one.

PHPBB3-10423
2014-04-13 21:36:09 +02:00
Oliver Schramm
face175471 [ticket/10423] Move code into a function and add tests for it
PHPBB3-10423
2014-04-13 21:15:14 +02:00
rxu
62a729e85e [ticket/12401] Pass more data to core.viewtopic_modify_post_row event
$topic_data array is used in viewtopic.php to populate $post_row template
block array data. Although $topic_data is not being passed
to core.viewtopic_modify_post_row event for modifying/adding
$post_row data in it. So, pass this array to the event.
Also, total_posts is added.

PHPBB3-12401
2014-04-13 23:13:55 +08:00
rxu
e6a4633b51 [ticket/12400] Add viewforum event to modify topics data
The event allows extensions to use and/or modify topics list and/or
topics data before dumping out the viewforum page.
For extensions which operate with viewforum page, f.e. if the topics list
and data is needed to retrieve, add, modify additional topics info
before the output loop.

PHPBB3-12400
2014-04-13 22:51:24 +08:00
Joas Schilling
cbc1c4bf31 Merge remote-tracking branch 'marc/ticket/12398' into develop-ascraeus
* marc/ticket/12398:
  [ticket/12398] Use return of submit_post in softdelete and download tests
  [ticket/12398] Use submit_post return in prune_shadow_topic_test
2014-04-12 16:45:30 +02:00
Joas Schilling
8d012197f4 [ticket/12390] Remove documentation, tests and other files from vendor/
PHPBB3-12390
2014-04-12 16:35:20 +02:00
Marc Alexander
5124920d22 [ticket/12398] Use return of submit_post in softdelete and download tests
PHPBB3-12398
2014-04-12 14:36:05 +02:00
Marc Alexander
bd31ebd287 [ticket/12398] Use submit_post return in prune_shadow_topic_test
This should get rid of possible failures during functional tests.

PHPBB3-12398
2014-04-12 14:34:16 +02:00
Cesar G
1efb0a8488 Merge remote-tracking branch 'nickvergessen/ticket/12395' into develop-ascraeus
* nickvergessen/ticket/12395:
  [ticket/12395] Check for posts in the middle of the page
2014-04-12 03:34:51 -07:00
Joas Schilling
3d9b5aed46 [ticket/11917] Move OAuth Module to the bottom while installing
PHPBB3-11917
2014-04-12 11:50:55 +02:00
Joas Schilling
57146ccdd1 [ticket/11917] Hide OAuth UCP Module when OAuth is not the selected backend
PHPBB3-11917
2014-04-12 11:50:54 +02:00
Joas Schilling
b3a758a43b [ticket/12382] Add template test for subloops inside includes
PHPBB3-12382
2014-04-12 11:13:06 +02:00
Joas Schilling
beeca90861 [ticket/12395] Check for posts in the middle of the page
PHPBB3-12395
2014-04-12 10:46:06 +02:00
Joas Schilling
da834a96f9 Merge remote-tracking branch 'marc/ticket/12211' into develop-ascraeus
* marc/ticket/12211:
  [ticket/12211] Do not run attachment file names twice through htmlspecialchars
2014-04-12 10:16:41 +02:00
Cesar G
c1bcc1e7b3 Merge remote-tracking branch 'VarunAgw/ticket/12351' into develop-ascraeus
* VarunAgw/ticket/12351:
  [ticket/12351] Add loading indicator to links that are missing it.
2014-04-11 15:40:01 -07:00
Marc Alexander
106be54de3 [ticket/12211] Do not run attachment file names twice through htmlspecialchars
Upload filenames are already processed via htmlspecialchars in the
type_cast_helper of the new request class. There is no need to run it through
htmlspecialchars() again in the filespec class.

PHPBB3-12211
2014-04-11 21:10:28 +02:00
Varun Agrawal
bf79367a65 [ticket/12351] Add loading indicator to links that are missing it.
When you click on the link, the turning circle is missing, so you don't
know whether it is actually doing something or not, until the response is
served.

PHPBB3-12351
2014-04-12 00:28:59 +05:30
PayBas
9c8ea7bdba [ticket/12389] Change language of email friend
PHPBB3-12389
2014-04-11 19:48:18 +02:00
PayBas
0e842d9958 [ticket/12389] Move print topic & email topic icons to topic tools
PHPBB3-12389
2014-04-11 19:41:40 +02:00
Marc Alexander
5dc3651290 [ticket/12004] Support empty routes to app.php/ in path_helper
The symfony routing component allows us to use the path "/" for routes.
Therefore, we should be able to use example.com/app.php/ for controllers.
However, this currently does not properly work. The method get_web_root_path
incorrectly returns phpbb_root_path. Therefore, paths to images or files are
broken.

PHPBB3-12004
2014-04-11 17:21:30 +02:00
Joas Schilling
13a34ce59f Merge remote-tracking branch 'rxu/ticket/12336' into develop-ascraeus
* rxu/ticket/12336:
  [ticket/12336] Add functions_module.php core event
2014-04-11 16:31:26 +02:00
Joas Schilling
a6183c6484 Merge remote-tracking branch 'marc/ticket/12386' into develop-ascraeus
* marc/ticket/12386:
  [ticket/12386] Rename DEBUG_EXTRA to DEBUG_CONTAINER for more descriptive name
  [ticket/12386] Add DEBUG_EXTRA again and use it for container creation
2014-04-11 16:23:07 +02:00
Joas Schilling
68bd70ef37 [ticket/12388] Add tests for lang() use on log actions without data
PHPBB3-12388
2014-04-11 13:09:16 +02:00
PayBas
4abcdd9a18 [ticket/12347] Changed to the new navbar templates
PHPBB3-12347
2014-04-11 11:43:52 +02:00
Marc Alexander
fbeed2d975 [ticket/12372] Use $() instead of jQuery() in core.js for toggleDisplay
PHPBB3-12372
2014-04-11 11:31:22 +02:00
Marc Alexander
b2eef2f5f9 [ticket/12372] Use admin.js $(document).ready for hiding questionnaire details
PHPBB3-12372
2014-04-11 11:27:13 +02:00
Marc Alexander
03667081e1 [ticket/12386] Rename DEBUG_EXTRA to DEBUG_CONTAINER for more descriptive name
PHPBB3-12386
2014-04-11 11:11:31 +02:00
Marc Alexander
22090dc3a3 [ticket/12386] Add DEBUG_EXTRA again and use it for container creation
We are currently creating a new compiled container on every page load when
having DEBUG enabled. However, one might only have that enabled to be
presented with errors or for getting the page load stats.
This change will add the DEBUG_EXTRA constant again. It will be used for
choosing whether the compiled container should be created on every page load -
when defined as true - or just once after the cache is cleared.

PHPBB3-12386
2014-04-11 11:11:31 +02:00
Joas Schilling
d5363bd095 Merge remote-tracking branch 'vsephpbb/ticket/12283' into develop-ascraeus
* vsephpbb/ticket/12283:
  [ticket/12283] Remove obsolete online class from posting review page
2014-04-11 10:39:40 +02:00
Joas Schilling
59015cfaff Merge remote-tracking branch 'paybas/ticket/12377' into develop-ascraeus
* paybas/ticket/12377:
  [ticket/12377] Forgot to change the INCLUDEs
  [ticket/12377] Renamed template files to navbar_xxx
  [ticket/12377] Moved notifications to new template
  [ticket/12377] Forgot empty line at the end
  [ticket/12377] Move navbar(s) to new template file
2014-04-11 10:35:35 +02:00
Joas Schilling
b832ebe718 Merge remote-tracking branch 'vsephpbb/ticket/12380' into develop-ascraeus
* vsephpbb/ticket/12380:
  [ticket/12380] Explicity state the order of sorting for login keys
  [ticket/12380] Sort Remember Me keys by last login time in UCP
2014-04-11 10:32:53 +02:00
Joas Schilling
6664dbb586 Merge remote-tracking branch 'varunagw/ticket/12355' into develop-ascraeus
* varunagw/ticket/12355:
  [ticket/12355] Topic Tools not fully updated when subscribing/bookmarking
2014-04-11 09:13:45 +02:00
Joas Schilling
d3f378d1d6 [ticket/12388] Fix translation of log entries without additional log data
PHPBB3-12388
2014-04-11 09:08:46 +02:00
Varun Agrawal
285b7a1f4c [ticket/12355] Topic Tools not fully updated when subscribing/bookmarking
The Topic Tools menu appears at the top of a topic page and again at the
bottom of a topic page.
When you use the Topic Tools menu to Bookmark or Subscribe to a Topic, the
menu item you chose is updated to reflect that, by switching to say
Unsubscribe topic or Remove from Bookmarks.
However, this change is not mirrored in the other Topic Tools menu at the
other location on the page.
Both Topic Tools menus should be updated during the AJAX event, so that
they always show the same options to the user.
It is solved by creating a data-update-all attribute which contains all
the class/ID that will update when topic tool is clicked

PHPBB3-12355
2014-04-11 10:12:35 +05:30
Cesar G
251b2ba28f Merge branch 'develop-olympus' into develop-ascraeus
* develop-olympus:
  [ticket/10687] Improve error message if unable to get image dimensions
2014-04-10 17:42:59 -07:00
Cesar G
e64c2326bd Merge remote-tracking branch 'marc1706/ticket/10687' into develop-olympus
* marc1706/ticket/10687:
  [ticket/10687] Improve error message if unable to get image dimensions
2014-04-10 17:42:14 -07:00
Nils Adermann
3f74e5b88b Merge remote-tracking branch 'github-nickvergessen/ticket/12370' into develop-ascraeus
* github-nickvergessen/ticket/12370:
  [ticket/12370] Add unit tests for topic notifications
  [ticket/12370] Fix functional notification test and remove unneeded requests
  [ticket/12370] Do not delete topic notifications when the topic is visible
2014-04-10 14:26:41 -07:00
Nils Adermann
62fad6ae9b Merge remote-tracking branch 'github-nickvergessen/ticket/12367' into develop-ascraeus
* github-nickvergessen/ticket/12367:
  [ticket/12367] Change phpbb_wrapper_gmgetdate_test to use data providers
2014-04-10 14:25:01 -07:00
Nils Adermann
497d81af68 Merge remote-tracking branch 'github-nickvergessen/ticket/12113' into develop-ascraeus
* github-nickvergessen/ticket/12113:
  [ticket/12113] Fix view_log() tests
  [ticket/12113] Correctly use plurals when deleting user warnings
  [ticket/12113] Allow log entries to use plurals
2014-04-10 14:22:36 -07:00
Nils Adermann
90ebd49a2b Merge remote-tracking branch 'github-nickvergessen/ticket/12373' into develop-ascraeus
* github-nickvergessen/ticket/12373:
  [ticket/12373] Add to and from forum_id to LOG_MOVE log entries
2014-04-10 14:19:13 -07:00
Nils Adermann
5de4d181ee Merge remote-tracking branch 'github-nickvergessen/ticket/12348' into develop-ascraeus
* github-nickvergessen/ticket/12348:
  [ticket/12348] Allow to run create_schema_files when phpBB is not installed
2014-04-10 14:16:38 -07:00
Nils Adermann
0ad9833668 Merge remote-tracking branch 'github-nickvergessen/ticket/12331' into develop-ascraeus
* github-nickvergessen/ticket/12331:
  [ticket/12331] Add functional test for saving custom profile fields
  [ticket/12331] Fix SQL error when inserting a new entry to profile field data
2014-04-10 14:14:30 -07:00
Nils Adermann
e2654b34c8 Merge remote-tracking branch 'github-nickvergessen/ticket/12286' into develop-ascraeus
* github-nickvergessen/ticket/12286:
  [ticket/12286] Reword section about plurals
  [ticket/12286] Fix spelling of elephant(s) in the sample
  [ticket/12286] Correctly capitalize PHP
  [ticket/12286] Fix nesting of ul inside li element
  [ticket/12286] Add note that goto should not be used
  [ticket/12286] Add section about plurals to the coding guidelines
  [ticket/12286] Classes must use the name space
  [ticket/12286] Remove section about utf8_normalize_nfc()
  [ticket/12286] Use $request->variable() instead of request_var()
  [ticket/12286] Function names should be prefixed with phpbb_
  [ticket/12286] Add "Since" to template event docs
  [ticket/12286] style.php and imagesets dont exist anymore
  [ticket/12286] Styles have a phpbb_version and a style_version in 3.1
  [ticket/12286] Use UTF8 (c) in style.cfg samples
2014-04-10 14:05:56 -07:00
Nils Adermann
7a947b247d Merge remote-tracking branch 'github-nickvergessen/ticket/12282' into develop-ascraeus
* github-nickvergessen/ticket/12282:
  [ticket/12282] Update new references
  [ticket/12282] Update container db mock
  [ticket/12282] Add new line at EOF of the interface
  [ticket/12282] Use interface for type hinting
  [ticket/12282] Use {@inheritDoc} for inherited methods
  [ticket/12282] Add Interface for DBAL drivers
2014-04-10 14:04:43 -07:00
Nils Adermann
79fe781629 Merge remote-tracking branch 'github-nickvergessen/ticket/11352' into develop-ascraeus
* github-nickvergessen/ticket/11352:
  [ticket/11352] Add functional tests for disapproving a post/topic
  [ticket/11352] Redirect the user back to view*.php after disapproving
2014-04-10 13:56:30 -07:00
Matt Friedman
eb6b877330 [ticket/12380] Explicity state the order of sorting for login keys
PHPBB3-12380
2014-04-10 09:10:01 -07:00
Matt Friedman
49885e55e7 [ticket/12380] Sort Remember Me keys by last login time in UCP
PHPBB3-12380
2014-04-10 09:04:35 -07:00
Joas Schilling
09804bbae8 [ticket/12382] Add template test for subloops inside events
PHPBB3-12382
2014-04-10 16:06:00 +02:00