makary/phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-06-11 22:08:54 +00:00
Code Issues Projects Releases Packages Wiki Activity
phpbb/phpBB/includes/ucp
History
Joas Schilling 42c062cedf Merge branch 'develop' of https://github.com/phpbb/phpbb3 into feature/softdelete-1-permission 
* 'develop' of https://github.com/phpbb/phpbb3: (480 commits)
  [ticket/6723] Show info that message has been deleted before delivery
  [ticket/11385] Fix issue with migration module tool not getting extension module info
  [ticket/11386] Fix failing tests from constructor changes
  [ticket/11386] Fix circular reference error & serialize error
  [ticket/11386] Remove tests that check if finder cache is working
  [ticket/11386] Forgot to get the migration classes
  [ticket/11386] Update tests with new constructors for ext.manager/migrator
  [ticket/11386] Use finder to find migration files
  [ticket/11363] Fix to make get_module_infos get from all extensions
  [ticket/11381] Make finder able to search in all available extensions
  [ticket/11103] Revert whitespace changes
  [ticket/11103] Few more minor language things
  [ticket/11103] Don't call generate_board_url many times
  [ticket/11103] Case time in queries as an int
  [ticket/11103] Fix effectively installed check
  [ticket/11103] Remove padding from notifications for now.
  [ticket/11363] Fix a couple bugs and throw errors if the file not found
  [ticket/11372] Migrator should only check if effectively installed if not
  [ticket/11363] Load module info files for extensions too
  [ticket/11103] Notifications Migration file
  ...

Conflicts:
	phpBB/includes/functions_posting.php
	phpBB/includes/mcp/mcp_queue.php
	phpBB/includes/search/fulltext_mysql.php
	phpBB/includes/search/fulltext_native.php
	phpBB/includes/search/fulltext_postgres.php
	phpBB/includes/search/fulltext_sphinx.php
	phpBB/install/database_update.php
	phpBB/styles/prosilver/template/ajax.js
2013-03-03 20:06:52 +01:00
..
info Merge branch 'develop' of github.com:EXreaction/phpbb3 into ticket/11103 2012-12-07 21:14:39 -06:00
ucp_activate.php Merge PR #1219 branch 'develop-olympus' into develop 2013-01-27 17:46:11 -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/9492] Ensure to update all avatar values when the avatar is changed 2013-01-17 14:43:00 +01: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/11103] Instantiate $phpbb_notifications as needed 2012-12-13 19:19:40 -06: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-01-31 00:32:39 +01: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 [ticket/11201] Revert WLM dropping because it is still used in China. 2013-02-04 01:31:43 +01: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/11201] Revert WLM dropping because it is still used in China. 2013-02-04 01:31:43 +01:00
ucp_register.php [ticket/8713] Revert changes to ucp_profile, ucp_register and acp_users. 2012-09-09 21:10:29 +02:00
ucp_remind.php [feature/class-prefix] Rename auth => phpbb_auth 2012-03-31 18:14:11 +02:00
ucp_resend.php [ticket/9916] Updating header license and removing Version $Id$ 2011-12-31 13:32:52 +00:00
ucp_zebra.php [feature/php-events] Fix naming and doc of core.ucp_add_zebra 2012-08-04 17:50:16 +02:00