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

733 Commits

Author SHA1 Message Date
Dhruv
f9c7f0fc19 Merge remote-tracking branch 'nickvergessen/feature/pagination-class' into develop
# By Joas Schilling
# Via Joas Schilling
* nickvergessen/feature/pagination-class:
  [ticket/11849] Fix more function calls
  [ticket/11849] Update more MCP calls to pagination class
  [ticket/11849] Update some ACP modules with new pagination
  [ticket/11849] Update rest of the UCP modules
  [ticket/11849] Update UCP notifications and pm folder
  [ticket/11849] Update search and memberlist
  [ticket/11849] Update pagination in viewonline.php
  [ticket/11849] Remove old pagination test
  [ticket/11849] Update pagination code in viewtopic.php
  [ticket/11849] Replace pagination in viewforum.php with class
  [ticket/11849] Add service definition
  [ticket/11849] Remove pagination functions
  [ticket/11849] Test validate_start and on_page
  [ticket/11849] Move pagination code to class
2013-12-25 00:54:07 +05:30
Joas Schilling
4f4512cbac [ticket/11849] Update pagination code in viewtopic.php
PHPBB3-11849
2013-12-18 18:35:25 +01:00
Cesar G
e110d591a9 [ticket/11241] Consolidate topic actions into "Topic tools" dropdown.
PHPBB3-11241
2013-12-06 00:56:24 -08:00
Joas Schilling
8b2d515736 Merge remote-tracking branch 'prototech/ticket/11672' into develop
* prototech/ticket/11672:
  [ticket/11672] Move the reapply_sid() call before meta_refresh() is called.
  [ticket/11672] Remove duplicate $request global.
  [ticket/11672] The json response call exits so the else is not necessary.
  [ticket/11672] Remove the messages for lock/unlock/change topic type.
  [ticket/11672] Clean up the logic in mcp_queue.php.
  [ticket/11672] Remove some messages that were missed in mcp_queue.php.
  [ticket/11672] Replace sprintf() usage with $user->lang().
  [ticket/11672] Removed unnecessary text from alerts.
2013-12-03 21:10:25 +01:00
Joas Schilling
2a154d0a10 [ticket/12015] Fix variable name and event version
PHPBB3-12015
2013-11-21 23:42:40 +01:00
Nathan Guse
b64d94b6bc Merge pull request #1870 from nickvergessen/ticket/12015
Ticket/12015 Enhance events in viewtopic to increase their usability
2013-11-21 14:21:31 -08:00
Joas Schilling
e9e667762b [ticket/12015] Fix english grammar
PHPBB3-12015
2013-11-21 23:18:29 +01:00
Cesar G
44b6f45759 [ticket/11484] Display login box for users following email notification link.
The link used for the latest post now uses view=unread so redirecting the user
using the value for the e parameter is no longer necessary.

PHPBB3-11484
2013-11-21 08:11:17 -08:00
Cesar G
c6473da412 [ticket/11672] Replace sprintf() usage with $user->lang().
PHPBB3-11672
2013-11-19 07:32:49 -08:00
callumacrae
0faafce4ce [ticket/11672] Removed unnecessary text from alerts.
Messages like "Return to forum last visited" are entirely unnecessary
when using AJAX to delete a post, so this commit removes them.

PHPBB3-11672
2013-11-19 07:32:49 -08:00
Joas Schilling
ecda590b86 [ticket/12015] Add @change to events that got changed
PHPBB3-12015
2013-11-13 17:13:18 +01:00
Joas Schilling
c2c976fe03 [ticket/12015] Add post counting information to event
PHPBB3-12015
2013-11-13 16:24:25 +01:00
Joas Schilling
1efab9ec77 [ticket/12015] Add an event after the post has been assigned to the template
PHPBB3-12015
2013-11-13 14:31:51 +01:00
Joas Schilling
e3b70c4c08 [ticket/12015] Add attachments to core.viewtopic_modify_post_row
PHPBB3-12015
2013-11-13 14:30:20 +01:00
Joas Schilling
f4cff08a19 [ticket/12015] Add more parameters to core.viewtopic_get_post_data
PHPBB3-12015
2013-11-13 14:29:24 +01:00
Cesar G
98a1694c7c [ticket/10383] Update the results without the overlay popup.
PHPBB3-10383
2013-10-07 17:55:04 -07:00
Cesar G
637a5a5eea [ticket/10383] AJAXify poll voting
PHPBB3-10383
2013-10-06 21:48:36 -07:00
Nathan Guse
31aebb355c Merge pull request #1654 from rechosen/ticket/11786
[ticket/11786] Fix various defects in PHPDoc in-code documentation
2013-10-03 20:22:41 -07:00
rechosen
e45b69ee09 Merge branch 'develop' of git://github.com/phpbb/phpbb3 into ticket/11786 2013-09-23 18:08:29 +02:00
Nils Adermann
21bbb58503 Merge remote-tracking branch 'github-phpbb/develop' into ticket/11700
* github-phpbb/develop: (586 commits)
  [ticket/11735] Display disabled checkbox in subsilver for read notifications
  [ticket/11735] Display disabled checkbox when notification is already read
  [ticket/11844] update acp/authentication language var
  [ticket/11795] Remove PM popup
  [ticket/11795] Remove outdated comment from forum_fn.js
  [ticket/11795] Move find user JS to forum_fn
  [ticket/11795] Replace TWIG with phpBB syntax in ACP
  [ticket/11795] Move MSN scripts to forum_fn.js
  [ticket/11795] Use phpBB template syntax instead of TWIG
  [ticket/11795] Move PM popup JS to forum_fn.js
  [ticket/11795] Get rid of pagination JS variables
  [ticket/11795] Get rid of onload_functions
  [ticket/11795] Use data-reset-on-edit attr to reset elements
  [ticket/11795] Redo form elements auto-focus
  [ticket/11811] Remove outline on :focus
  [ticket/11836] Fix subsilver fatal error
  [ticket/11837] Replace escaped single quote with utf-8 single quote
  [ticket/11836] Fix fatal error on unsupported provider for auth link
  [ticket/11837] Translate UCP_AUTH_LINK_NOT_SUPPORTED
  [ticket/11809] Ensure code.js is first script included after jQuery
  ...

Conflicts:
	phpBB/config/services.yml
	phpBB/develop/create_schema_files.php
	phpBB/develop/mysql_upgrader.php
	phpBB/download/file.php
	phpBB/includes/bbcode.php
	phpBB/includes/functions_container.php
	phpBB/install/database_update.php
	phpBB/install/index.php
	phpBB/phpbb/controller/helper.php
	phpBB/phpbb/controller/resolver.php
	phpBB/phpbb/request/request_interface.php
	phpBB/phpbb/session.php
	phpBB/phpbb/style/extension_path_provider.php
	phpBB/phpbb/style/path_provider.php
	phpBB/phpbb/style/path_provider_interface.php
	phpBB/phpbb/style/resource_locator.php
	phpBB/phpbb/style/style.php
	phpBB/phpbb/template/locator.php
	phpBB/phpbb/template/template.php
	phpBB/phpbb/template/twig/node/includeasset.php
	phpBB/phpbb/template/twig/node/includecss.php
	phpBB/phpbb/template/twig/node/includejs.php
	phpBB/phpbb/template/twig/twig.php
	tests/controller/helper_url_test.php
	tests/di/create_container_test.php
	tests/extension/style_path_provider_test.php
	tests/notification/notification_test.php
	tests/session/continue_test.php
	tests/session/creation_test.php
	tests/template/template_events_test.php
	tests/template/template_test_case.php
	tests/template/template_test_case_with_tree.php
	tests/test_framework/phpbb_functional_test_case.php
2013-09-16 01:24:05 +02:00
Nils Adermann
b95fdacdd3 [ticket/11700] Move all recent code to namespaces
PHPBB3-11700
2013-09-16 00:25:27 +02:00
rechosen
3dfad1f01e [ticket/9550] Add the core.viewtopic_post_rowset_data event to viewtopic.php
To allow extra fields added to the query retrieving post data to be used for
setting template variables, they need to be added to the post rowset. This
commit adds the core.viewtopic_post_rowset_data event that enables extension
developers to modify the post rowset when the database row is still available.

PHPBB3-9550
2013-09-06 15:04:52 +02:00
rechosen
e2014ab76e [ticket/11786] Fix PHPDoc documentation of a few events
Fixed some PHPDoc errors I noticed while working on the karma extension.
Mostly spacing issues or omitted characters, though there was one description
that made no sense at all.

PHPBB3-11786
2013-08-13 16:23:54 +02:00
Joas Schilling
b4e043ba15 Merge pull request #1630 from brunoais/ticket/11638
[ticket/11638] Variable names goof...
2013-07-30 03:27:22 -07:00
Bruno Ais
8295d0fb36 [ticket/11638] Variable names goof...
sub-task of ticket PHPBB3-11635:
find and fix all bypasses of generate_text_for_*

PHPBB3-11638
2013-07-30 11:15:46 +01:00
Joas Schilling
49d908e959 Merge pull request #1624 from brunoais/ticket/11638
[ticket/11638] Changed the layout to match the other similar commits
2013-07-29 09:09:07 -07:00
Bruno Ais
ccc5c5f6b8 [ticket/11638] Changed the layout to match the other similar commits
sub-task of ticket PHPBB3-11635:
find and fix all bypasses of generate_text_for_*

PHPBB3-11638
2013-07-29 17:00:51 +01:00
Nathan Guse
7027610e23 Merge pull request #1542 from brunoais/ticket/11638
[ticket/11638] generate_text_for_display on viewtopic.php
2013-07-29 07:42:32 -07:00
Bruno Ais
4cdccbd42b [ticket/11638] Removed the unneeded reset.
sub-task of ticket PHPBB3-11635:
find and fix all bypasses of generate_text_for_*

PHPBB3-11638
2013-07-24 12:45:23 +01:00
Bruno Ais
6c68348a71 [ticket/11638] Use the $parse_flags like the other commits
sub-task of ticket PHPBB3-11635:
find and fix all bypasses of generate_text_for_*

PHPBB3-11638
2013-07-24 12:31:38 +01:00
Bruno Ais
029015e154 [ticket/11638] Reverted to use the $parse tags way as the other ones
sub-task of ticket PHPBB3-11635:
find and fix all bypasses of generate_text_for_*

PHPBB3-11638
2013-07-24 12:31:14 +01:00
Bruno Ais
4ed322b5b8 [ticket/11638] Updated: bitwise $parse_flags use optionset()
sub-task of ticket PHPBB3-11635:
find and fix all bypasses of generate_text_for_*

PHPBB3-11638
2013-07-24 11:59:28 +01:00
Bruno Ais
7341482304 [ticket/11638] Fixed not following guidelines for brackets
sub-task of ticket PHPBB3-11635:
find and fix all bypasses of generate_text_for_*

PHPBB3-11638
2013-07-20 16:25:05 +01:00
Bruno Ais
fc64e6997f [ticket/11638] Fixed typo in the variable name.
sub-task of ticket PHPBB3-11635:
find and fix all bypasses of generate_text_for_*

PHPBB3-11638
2013-07-20 16:24:31 +01:00
Nils Adermann
da2752e400 [ticket/11700] Modify all code to use the new interface names
PHPBB3-11700
2013-07-14 13:30:52 -04:00
Bruno Ais
713a2ba573 [ticket/11638] generate_text_for_display on viewtopic.php
lines: 1403-1417

sub-task of ticket PHPBB3-11635:
find and fix all bypasses of generate_text_for_*

PHPBB3-11638
2013-07-13 16:57:00 +01:00
Bruno Ais
a58ccdabf3 [ticket/11638] generate_text_for_display on viewtopic.php
lines: 1395-1403

sub-task of ticket PHPBB3-11635:
find and fix all bypasses of generate_text_for_*

PHPBB3-11638
2013-07-13 16:55:36 +01:00
Bruno Ais
97054d81f8 [ticket/11638] generate_text_for_display on viewtopic.php
lines: 846-854

sub-task of ticket PHPBB3-11635:
find and fix all bypasses of generate_text_for_*

PHPBB3-11638
2013-07-13 16:39:29 +01:00
Bruno Ais
b4fcdc51e9 [ticket/11638] generate_text_for_display on viewtopic.php
lines: 835-843

sub-task of ticket PHPBB3-11635:
find and fix all bypasses of generate_text_for_*

PHPBB3-11638
2013-07-13 16:38:51 +01:00
Joas Schilling
8352a7cada Merge remote-tracking branch 'phpbb/develop' into ticket/9657
* phpbb/develop: (216 commits)
  [ticket/11626] Remove last reference to template in ldap
  [ticket/11626] Remove LDAP dependency on template
  [develop-olympus] Increment version number to 3.0.13-dev.
  [develop-olympus] Add changelog for 3.0.12 release.
  [develop-olympus] Bump version numbers for 3.0.12-RC1 release.
  [develop-olympus] Bumping version numbers to final for 3.0.12 releases.
  [ticket/11669] Fix PHP bug #55124 (recursive mkdir on /./)
  [ticket/11668] Run lint test at the end of the test suite
  [ticket/11548] Fix test errors in groups test on develop
  [ticket/11548] Check upload avatar URL the same way as in phpBB 3.0
  [ticket/11548] Fix incorrect usage of array_map on acp groups page
  [ticket/11665] Fix test class name
  [ticket/11664] Stop creating php.html file in root path in tests
  [ticket/11665] Can't change file names already sent to set_filenames
  [ticket/11662] Typos: occured -> occurred
  [ticket/11662] Typos: occured -> occurred
  [ticket/11660] Fix bugs from bugs in #11651 (missing vars, db->sql_connect)
  [feature/auth-refactor] Add parent::setUp() in setUp()
  [feature/auth-refactor] Changes
  [feature/auth-refactor] DataProvider for acp_board test
  ...
2013-07-13 09:36:24 -04:00
Joas Schilling
5ab0090e6c [ticket/9657] Remove sql_visibility as it is always non-empty
PHPBB3-9657
2013-07-11 22:35:55 -04:00
Nathaniel Guse
7104aeb77e Merge branch 'develop-olympus' into develop
# By Vjacheslav Trushkin
# Via Nathaniel Guse (1) and Vjacheslav Trushkin (1)
* develop-olympus:
  [ticket/10772] Remove unnecessary comment
  [ticket/10772] Functional tests for forum style

Conflicts:
	tests/functional/forum_style_test.php
2013-07-11 13:15:26 -05:00
Joas Schilling
9aed758c13 [ticket/9657] Use the service instead of the static class
PHPBB3-9657
2013-07-11 14:24:07 +02:00
Vjacheslav Trushkin
1ea1247cd5 [ticket/10772] Remove unnecessary comment
PHPBB3-10772
2013-05-16 09:34:58 +03:00
Vjacheslav Trushkin
f3c547bc8d Merge branch 'ticket/10772' into ticket/develop/10772
* ticket/10772:
  [ticket/10772] Use forum specific style for trigger_error
2013-05-12 12:42:22 +03:00
Vjacheslav Trushkin
170333a6fc [ticket/10772] Use forum specific style for trigger_error
PHPBB3-10772
2013-05-11 22:49:42 +03:00
Joas Schilling
5da250148b [ticket/9657] Finish subsilver2 viewforum and viewtopic
PHPBB3-9657
2013-03-12 09:14:39 +01:00
Joas Schilling
cd95d3abf7 [ticket/9657] Include poster name in "deleted post" message
Also switched from passive to active form

PHPBB3-9657
2013-03-11 12:22:47 +01:00
Joas Schilling
f5482e73fd [ticket/9657] Correctly return to viewtopic page when handling posts
While managing posts from viewtopic.php we should return to that page,
rather then the MCP

PHPBB3-9657
2013-03-06 13:05:33 +01:00
Joas Schilling
164a06c066 [ticket/9657] Fix "Display this post" link if javascript is disabled
PHPBB3-9657
2013-03-06 13:05:33 +01:00