1
0
mirror of https://github.com/phpbb/phpbb.git synced 2025-02-25 12:33:29 +01:00

17927 Commits

Author SHA1 Message Date
Joas Schilling
4a3756741c [ticket/12273] Move grabbing the $vars array line to a method
PHPBB3-12273
2014-04-18 12:56:43 +02:00
Joas Schilling
5387511f89 [ticket/12273] Grab name of events with a function
PHPBB3-12273
2014-04-18 12:56:34 +02:00
Joas Schilling
6c57edf3a3 [ticket/12273] Use the new class
PHPBB3-12273
2014-04-18 12:56:24 +02:00
Joas Schilling
22de4a5927 [ticket/12273] Add a basic set of tests for the exporter
PHPBB3-12273
2014-04-18 12:55:12 +02:00
Joas Schilling
0da5e3bee9 Merge pull request #2318 from prototech/ticket/12121
[ticket/12121] Preserve link redirect counts when updating from 3.0.x.

* prototech/ticket/12121:
  [ticket/12121] Preserve link redirect counts when updating from 3.0.x.
2014-04-16 23:33:03 +02:00
Joas Schilling
659c2e14b8 Merge pull request #2243 from n-aleha/ticket/12345
[ticket/12345] Improve search flood interval message for ascraeus

* n-aleha/ticket/12345:
  [ticket/12345] Improve search flood interval message for ascraeus
2014-04-16 23:26:09 +02:00
Cesar G
3d1a07f8f0 [ticket/12121] Preserve link redirect counts when updating from 3.0.x.
PHPBB3-12121
2014-04-15 21:15:54 -07:00
n-aleha
1f44b4da18 [ticket/12345] Improve search flood interval message for ascraeus
Show to guests and users the remaining seconds until their next allowed
search, if a search flood limit is enabled for them.

PHPBB3-12345
2014-04-16 02:14:36 +03:00
Joas Schilling
b305364b27 Merge pull request #2305 from n-aleha/ticket/12391
[ticket/12391] Assign variables to core.posting_modify_template_vars

* n-aleha/ticket/12391:
  [ticket/12391] Assign variables to core.posting_modify_template_vars
2014-04-16 00:57:07 +02:00
Joas Schilling
e50b6b5889 Merge pull request #2304 from n-aleha/ticket/12191
[ticket/12191] Move notification options to bottom while installing

* n-aleha/ticket/12191:
  [ticket/12191] Move notification options to bottom while installing
2014-04-16 00:49:59 +02:00
Joas Schilling
c4e3cc0850 Merge pull request #2301 from rxu/ticket/12401
[ticket/12401] Add $topic_data array to core.viewtopic_modify_post_row event

* rxu/ticket/12401:
  [ticket/12401] Pass more data to core.viewtopic_modify_post_row event
2014-04-16 00:17:31 +02:00
Joas Schilling
07442211b9 Merge pull request #2300 from rxu/ticket/12400
[ticket/12400] Add viewforum event to modify topics data

* rxu/ticket/12400:
  [ticket/12400] Add viewforum event to modify topics data
2014-04-16 00:03:20 +02:00
Andreas Fischer
41db97ad3a Merge branch 'develop-olympus' into develop-ascraeus
* develop-olympus:
  [ticket/12397] Fix sql_unique_index_exists doc block
2014-04-15 23:59:56 +02:00
Andreas Fischer
e9807e1741 Merge pull request #2310 from n-aleha/ticket/12397
[ticket/12397] Fix sql_unique_index_exists doc block

* n-aleha/ticket/12397:
  [ticket/12397] Fix sql_unique_index_exists doc block
2014-04-15 23:59:39 +02:00
n-aleha
bff63be512 [ticket/12397] Fix sql_unique_index_exists doc block
db_tools::sql_unique_index_exists() searches for unique indexes but not
primary key indexes.

PHPBB3-12397
2014-04-16 00:55:05 +03:00
Joas Schilling
d1f96aa036 Merge branch 'develop-olympus' into develop-ascraeus
* develop-olympus:
  [ticket/10423] Replace foreach with function in viewtopic.php
  [ticket/10423] Remove unnecessary include in test
  [ticket/10423] Match multiple wildcards
  [ticket/10423] Move code into a function and add tests for it
  [ticket/10423] Remove * from search or highlight string
2014-04-15 23:23:44 +02:00
Joas Schilling
675cef9c2e Merge pull request #2195 from Elsensee/ticket/10423
[ticket/10423] Remove * from search or highlight string

* Elsensee/ticket/10423:
  [ticket/10423] Replace foreach with function in viewtopic.php
  [ticket/10423] Remove unnecessary include in test
  [ticket/10423] Match multiple wildcards
  [ticket/10423] Move code into a function and add tests for it
  [ticket/10423] Remove * from search or highlight string
2014-04-15 23:23:26 +02:00
Joas Schilling
c63b5275d8 Merge branch 'ticket/lucifer4o/12344' into develop-ascraeus
* ticket/lucifer4o/12344:
  [ticket/12344] Add core.pm_submit_before to function submit_pm
2014-04-15 22:25:43 +02:00
lucifer4o
84c8c61eb2 [ticket/12344] Add core.pm_submit_before to function submit_pm
PHPBB3-12344
2014-04-15 22:19:47 +02:00
Oliver Schramm
f3cd7f73e1 [ticket/10423] Replace foreach with function in viewtopic.php
PHPBB3-10423
2014-04-15 20:43:16 +02:00
Andreas Fischer
7d4be1fe19 Merge pull request #2286 from nickvergessen/ticket/12388
[ticket/12388] Fix translation of log entries without additional log data

* nickvergessen/ticket/12388:
  [ticket/12388] Add tests for lang() use on log actions without data
  [ticket/12388] Fix translation of log entries without additional log data
2014-04-15 11:38:21 +02:00
n-aleha
11c4d14a9b [ticket/12391] Assign variables to core.posting_modify_template_vars
Assign variables to event "core.posting_modify_template_vars".
Also, fix a couple of typos.

PHPBB3-12391
2014-04-14 14:37:21 +03:00
Joas Schilling
b487da7c05 Merge remote-tracking branch 'marc/ticket/12004' into develop-ascraeus
* marc/ticket/12004:
  [ticket/12004] Support empty routes to app.php/ in path_helper
2014-04-14 12:40:47 +02:00
Joas Schilling
aebf2cc5cd Merge remote-tracking branch 'marc/ticket/12372' into develop-ascraeus
* marc/ticket/12372:
  [ticket/12372] Use $() instead of jQuery() in core.js for toggleDisplay
  [ticket/12372] Use admin.js $(document).ready for hiding questionnaire details
  [ticket/12372] Rename JS function dE() to phpbb.toggleDisplay()
  [ticket/12372] Move dE() function core.js
  [ticket/12372] Unify definition of function dE() across all files
  [ticket/12372] Use jQuery in javascript dE() function
2014-04-14 12:33:33 +02:00
n-aleha
6584f5eba6 [ticket/12191] Move notification options to bottom while installing
Move "ucp>board preferences>edit notification options" to bottom while
installing.

PHPBB3-12191
2014-04-14 00:02:28 +03: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
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
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
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
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