makary/phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-06-08 12:28:52 +00:00
Code Issues Projects Releases Packages Wiki Activity
phpbb/phpBB/includes/acp
History
Nils Adermann b16f3834a3 Merge branch 'develop-olympus' into develop 
By Andreas Fischer
via Andreas Fischer (1) and Nils Adermann (1)
* develop-olympus:
  [ticket/10550] Sort not installed styles list in the styles section of the ACP.

Conflicts:
	phpBB/includes/acp/acp_styles.php
2012-05-31 15:46:23 +02:00
..
info [feature/merging-style-components] New acp_styles 2012-03-14 23:47:57 +02:00
acp_attachments.php [ticket/9916] Updating header license and removing Version $Id$ 2011-12-31 13:32:52 +00:00
acp_ban.php [ticket/9916] Updating header license and removing Version $Id$ 2011-12-31 13:32:52 +00:00
acp_bbcodes.php [ticket/10271] AJAXified various deletions in the ACP. 2012-03-31 02:09:15 +02:00
acp_board.php Merge PR #721 branch 'rahulr92/ticket/10650' into develop 2012-05-21 23:42:48 -04:00
acp_bots.php [ticket/10272] AJAXified the bots page in the ACP. 2012-03-31 02:09:15 +02:00
acp_captcha.php Merge remote-tracking branch 'unknownbliss/ticket/9916' into develop 2012-01-02 17:54:54 +01:00
acp_database.php Merge branch 'develop-olympus' into develop 2012-05-31 15:34:58 +02:00
acp_disallow.php [ticket/9916] Updating header license and removing Version $Id$ 2011-12-31 13:32:52 +00:00
acp_email.php [ticket/9916] Updating header license and removing Version $Id$ 2011-12-31 13:32:52 +00:00
acp_forums.php [ticket/10650] Removed changes from acp_forums.php 2012-04-08 11:12:29 +05:30
acp_groups.php [ticket/9916] Updating header license and removing Version $Id$ 2011-12-31 13:32:52 +00:00
acp_icons.php [ticket/10271] AJAXified various deletions in the ACP. 2012-03-31 02:09:15 +02:00
acp_inactive.php [ticket/9916] Updating header license and removing Version $Id$ 2011-12-31 13:32:52 +00:00
acp_jabber.php [ticket/9916] Updating header license and removing Version $Id$ 2011-12-31 13:32:52 +00:00
acp_language.php [ticket/9916] Updating header license and removing Version $Id$ 2011-12-31 13:32:52 +00:00
acp_logs.php [ticket/9916] Updating header license and removing Version $Id$ 2011-12-31 13:32:52 +00:00
acp_main.php Merge branch 'develop-olympus' into develop 2012-05-01 13:38:25 +02:00
acp_modules.php [feature/ajax] Unify phpbb_json_response instantiation 2012-03-31 02:10:17 +02:00
acp_permission_roles.php [ticket/9916] Updating header license and removing Version $Id$ 2011-12-31 13:32:52 +00:00
acp_permissions.php [feature/class-prefix] Rename auth => phpbb_auth 2012-03-31 18:14:11 +02:00
acp_php_info.php [ticket/9916] Updating header license and removing Version $Id$ 2011-12-31 13:32:52 +00:00
acp_profile.php [feature/ajax] Send correct activate/deactivate JSON response in acp_profile 2012-03-31 02:10:17 +02:00
acp_prune.php [ticket/9916] Updating header license and removing Version $Id$ 2011-12-31 13:32:52 +00:00
acp_ranks.php [ticket/10271] AJAXified various deletions in the ACP. 2012-03-31 02:09:15 +02:00
acp_reasons.php [ticket/9916] Updating header license and removing Version $Id$ 2011-12-31 13:32:52 +00:00
acp_search.php [ticket/9916] Updating header license and removing Version $Id$ 2011-12-31 13:32:52 +00:00
acp_send_statistics.php [ticket/9916] Updating header license and removing Version $Id$ 2011-12-31 13:32:52 +00:00
acp_styles.php Merge branch 'develop-olympus' into develop 2012-05-31 15:46:23 +02:00
acp_update.php [ticket/9916] Updating header license and removing Version $Id$ 2011-12-31 13:32:52 +00:00
acp_users.php Merge remote-tracking branch 'github-dhruv/ticket/10308' into develop 2012-05-29 16:40:00 +02:00
acp_words.php [ticket/9916] Updating header license and removing Version $Id$ 2011-12-31 13:32:52 +00:00
auth.php [feature/class-prefix] Rename auth => phpbb_auth 2012-03-31 18:14:11 +02:00