makary/phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-06-09 04:48:53 +00:00
Code Issues Projects Releases Packages Wiki Activity
phpbb/phpBB/includes/ucp
History
Joas Schilling bdb7ec0ceb Merge remote-tracking branch 'phpbb/develop' into feature/softdelete-1-permission 
* phpbb/develop: (704 commits)
  [ticket/11630] Improvements to the PHP lint pre-commit hook
  [feature/auth-refactor] Move auth providers to separate directory
  [ticket/11619] Use HTTP/1.0 because of lack of chunked-encoding handling.
  [ticket/11619] Some tests for get_remote_file().
  [ticket/11617] Remove spaces and tabs from empty lines
  [ticket/11617] Missing U_ACTION in acp_captcha.php
  [feature/auth-refactor] Fix code style issue
  [feature/auth-refactor] Fix comment grammar
  [feature/auth-refactor] Fix the actual cause of test failures
  [ticket/10838] Fix URL for wiki and remove irrelevant line
  [ticket/10838] Remove php 5.4 and builtin server references
  [ticket/10838] Fix missing data
  [ticket/10838] separate database used mentioned in unit tests
  [ticket/11585] Make $auth_admin class property
  [feature/auth-refactor] A possible fix for the functional test failures
  [ticket/11566] Subsilver template error displayed after table headers
  [ticket/11566] Remove extra pair of brackets from conditional statement
  [ticket/11566] Check that guest doesn't have reporting permission by default
  [ticket/11566] Add captcha to report post template in subsilver
  [ticket/11566] Use the new constant CONFIRM_REPORT for captcha init
  ...

Conflicts:
	phpBB/docs/sphinx.sample.conf
	phpBB/feed.php
	phpBB/styles/prosilver/template/search_results.html
	phpBB/styles/prosilver/template/viewforum_body.html
2013-07-11 11:41:48 +02:00
..
info [feature/avatars] Reduce module auth of ucp avatar settings 2013-03-04 00:25:38 +01:00
ucp_activate.php [ticket/11454] Use set_addresses in other applicable areas 2013-04-24 15:34:12 -05:00
ucp_attachments.php [ticket/11023] Fix additional whitespaces that were added by PHPBB3-10968 2012-10-17 23:34:37 +02:00
ucp_confirm.php [ticket/9916] Updating header license and removing Version $Id$ 2011-12-31 13:32:52 +00:00
ucp_groups.php [ticket/11602] Do not call localize_errors() if avatars are disabled 2013-06-11 14:54:22 +02:00
ucp_main.php [feature/soft-delete] Correctly calculate the number of replies everywhere 2012-10-22 11:14:00 +02:00
ucp_notifications.php [ticket/11533] Columns counter for notification settings 2013-05-11 23:30:44 +03:00
ucp_pm.php [ticket/9916] Updating header license and removing Version $Id$ 2011-12-31 13:32:52 +00:00
ucp_pm_compose.php Merge branch 'develop-olympus' into develop 2013-05-06 22:11:33 +02:00
ucp_pm_options.php Merge branch 'develop-olympus' into develop 2012-06-21 10:31:08 +02:00
ucp_pm_viewfolder.php [ticket/11023] Fix additional whitespaces that were added by PHPBB3-10968 2012-10-17 23:34:37 +02:00
ucp_pm_viewmessage.php Merge pull request #1287 from erangamapa/ticket/11106 2013-03-31 14:54:23 -07:00
ucp_prefs.php Merge branch 'develop' of github.com:EXreaction/phpbb3 into ticket/11103 2012-12-07 21:14:39 -06:00
ucp_profile.php [ticket/11454] Use set_addresses in other applicable areas 2013-04-24 15:34:12 -05:00
ucp_register.php [ticket/11454] Use set_addresses in other applicable areas 2013-04-24 15:34:12 -05:00
ucp_remind.php [ticket/10325] fix language key 2013-04-25 21:01:21 +05:30
ucp_resend.php [ticket/11454] Use set_addresses in other applicable areas 2013-04-24 15:34:12 -05:00
ucp_zebra.php [feature/php-events] Fix naming and doc of core.ucp_add_zebra 2012-08-04 17:50:16 +02:00