phpbb/phpBB/adm/style
Joas Schilling 0bbde4c122 Merge branch 'develop' of https://github.com/phpbb/phpbb3 into ticket/11166
* 'develop' of https://github.com/phpbb/phpbb3: (799 commits)
  [ticket/11402] Fix undefined index in post/topic_in_queue
  [ticket/11400] If email is disabled, disable it for notifications
  [ticket/11398] Correctly call permission_set method in permission tool
  [ticket/11394] Relax Migration Tools
  [ticket/11386] Fix missing ;
  [ticket/10714] Get log from container in install, update and download/file
  [feature/avatars] Update module_auth of ucp module and fix small issues
  [ticket/11396] Rename insert_migration to set_migration_state
  [ticket/11395] Prevent acp_modules::get_modules_info from reincluding files
  [ticket/11393] Give more information on database updater
  [ticket/11386] Send list of migrations instead of using load_migrations
  [feature/avatars] Add migrations data file for avatars
  [feature/avatars] Reduce module auth of ucp avatar settings
  [ticket/10714] Use $phpbb_adm_relative_path instead of hardcoded adm/
  [ticket/10714] Logs are disabled for this page call only
  [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
  ...

Conflicts:
	phpBB/assets/javascript/core.js
2013-03-06 07:35:47 +01:00
..
acp_attachments.html [ticket/10780] Replace colon usage in adm template output with {L_COLON} 2012-11-10 00:23:03 +01:00
acp_avatar_options_gravatar.html [feature/avatars] Add more consistency to codebase 2012-12-11 21:02:37 +01:00
acp_avatar_options_local.html [feature/avatars] Remove not needed inline style 2013-01-08 22:47:05 +01:00
acp_avatar_options_remote.html [feature/avatars] Add more consistency to codebase 2012-12-11 21:02:37 +01:00
acp_avatar_options_upload.html [feature/avatars] Remove unnecessary abbreviations 2012-11-25 00:54:34 +01:00
acp_ban.html [ticket/10780] Replace colon usage in adm template output with {L_COLON} 2012-11-10 00:23:03 +01:00
acp_bbcodes.html [ticket/10271] AJAXified various deletions in the ACP. 2012-03-31 02:09:15 +02:00
acp_board.html [ticket/10780] Replace colon usage in adm template output with {L_COLON} 2012-11-10 00:23:03 +01:00
acp_bots.html [ticket/10780] Replace colon usage in adm template output with {L_COLON} 2012-11-10 00:23:03 +01:00
acp_captcha.html [ticket/10780] Replace colon usage in adm template output with {L_COLON} 2012-11-10 00:23:03 +01:00
acp_database.html [ticket/10780] Replace colon usage in adm template output with {L_COLON} 2012-11-10 00:23:03 +01:00
acp_disallow.html [ticket/10780] Replace colon usage in adm template output with {L_COLON} 2012-11-10 00:23:03 +01:00
acp_email.html [ticket/10780] Replace colon usage in adm template output with {L_COLON} 2012-11-10 00:23:03 +01:00
acp_ext_details.html [ticket/10780] Replace colons in phpBB/adm/style/acp_ext_details.html. 2012-11-10 00:23:03 +01:00
acp_ext_disable.html [ticket/10631] Various front-end fixes (extensions manager) 2012-09-01 15:05:54 +01:00
acp_ext_enable.html [feature/migrations] Catch and display errors from the migrator 2013-02-09 21:09:29 -06:00
acp_ext_list.html [ticket/10631] Adjust prefixes to be easier to understand 2012-09-01 15:05:57 +01:00
acp_ext_purge.html [feature/migrations] Catch and display errors from the migrator 2013-02-09 21:09:29 -06:00
acp_forums.html [feature/events] Remove extraneous space 2012-12-17 18:16:39 -05:00
acp_forums_copy_perm.html [ticket/10780] Replace colon usage in adm template output with {L_COLON} 2012-11-10 00:23:03 +01:00
acp_groups.html [feature/avatars] Remove unnecessary abbreviations 2012-11-25 00:54:34 +01:00
acp_groups_position.html [ticket/10411] Remove ajax delete, so the page is refreshed 2013-03-01 12:45:49 +01:00
acp_icons.html [feature/pagination-as-list] Various fixes and improvements 2012-07-18 14:31:21 +01:00
acp_inactive.html [ticket/10780] Replace colon usage in adm template output with {L_COLON} 2012-11-10 00:23:03 +01:00
acp_jabber.html [ticket/10780] Replace colon usage in adm template output with {L_COLON} 2012-11-10 00:23:03 +01:00
acp_language.html [ticket/10780] Replace colon usage in adm template output with {L_COLON} 2012-11-10 00:23:03 +01:00
acp_logs.html [ticket/10780] Replace colon usage in adm template output with {L_COLON} 2012-11-10 00:23:03 +01:00
acp_main.html [feature/events] Fix names of events in adm/style/acp_main.html 2012-12-17 11:37:38 -05:00
acp_modules.html [ticket/10780] Replace colon usage in adm template output with {L_COLON} 2012-11-10 00:23:03 +01:00
acp_permission_roles.html [ticket/10780] Replace colon usage in adm template output with {L_COLON} 2012-11-10 00:23:03 +01:00
acp_permissions.html [ticket/10780] Replace colon usage in adm template output with {L_COLON} 2012-11-10 00:23:03 +01:00
acp_php_info.html [ticket/10362] HTML5 Fix - Replace name attribute with id in anchors 2011-09-11 17:04:47 -07:00
acp_profile.html [ticket/10780] Replace colon usage in adm template output with {L_COLON} 2012-11-10 00:23:03 +01:00
acp_prune_forums.html [ticket/10780] Replace colon usage in adm template output with {L_COLON} 2012-11-10 00:23:03 +01:00
acp_prune_users.html [ticket/10780] Replace colon usage in adm template output with {L_COLON} 2012-11-10 00:23:03 +01:00
acp_ranks.html [ticket/10780] Replace colon usage in adm template output with {L_COLON} 2012-11-10 00:23:03 +01:00
acp_reasons.html [ticket/10780] Replace colon usage in adm template output with {L_COLON} 2012-11-10 00:23:03 +01:00
acp_search.html [ticket/10780] Replace colon usage in adm template output with {L_COLON} 2012-11-10 00:23:03 +01:00
acp_send_statistics.html [ticket/10362] HTML5 Fix - Replace name attribute with id in anchors 2011-09-11 17:04:47 -07:00
acp_styles.html [ticket/10780] Replace colon usage in adm template output with {L_COLON} 2012-11-10 00:23:03 +01:00
acp_update.html [ticket/10362] HTML5 Fix - Replace name attribute with id in anchors 2011-09-11 17:04:47 -07:00
acp_users.html [ticket/10780] Replace colon usage in adm template output with {L_COLON} 2012-11-10 00:23:03 +01:00
acp_users_avatar.html [feature/avatars] Minor variable naming fixes 2012-12-04 00:49:37 +01:00
acp_users_feedback.html [ticket/10780] Replace colon usage in adm template output with {L_COLON} 2012-11-10 00:23:03 +01:00
acp_users_overview.html [feature/events] Append "_append" to acp_users_overview_options 2012-12-17 11:37:39 -05:00
acp_users_prefs.html [ticket/10780] Replace colon usage in adm template output with {L_COLON} 2012-11-10 00:23:03 +01:00
acp_users_profile.html [ticket/11201] Revert WLM dropping because it is still used in China. 2013-02-04 01:31:43 +01:00
acp_users_signature.html [ticket/10780] Replace colon usage in adm template output with {L_COLON} 2012-11-10 00:23:03 +01:00
acp_users_warnings.html Fix #51305 - User need a_clearlog to delete warnings 2009-09-15 09:45:05 +00:00
acp_words.html [ticket/10271] AJAXified various deletions in the ACP. 2012-03-31 02:09:15 +02:00
admin.css [ticket/11166] Add ajaxify support to normal ACP confirm_box() 2013-03-03 17:34:01 +01:00
ajax.js [ticket/10949] Converted missing code to new JS coding guidelines 2013-01-04 22:46:12 +01:00
avatars.js [feature/avatars] Change avatar javascript to conform to new coding guidelines 2013-01-04 18:13:49 +01:00
captcha_default_acp_demo.html [ticket/10780] Replace colon usage in adm template output with {L_COLON} 2012-11-10 00:23:03 +01:00
captcha_gd_acp.html [ticket/10780] Replace colon usage in adm template output with {L_COLON} 2012-11-10 00:23:03 +01:00
captcha_qa_acp.html [ticket/10780] Replace colon usage in adm template output with {L_COLON} 2012-11-10 00:23:03 +01:00
captcha_qa_acp_demo.html [ticket/10780] Replace colon usage in adm template output with {L_COLON} 2012-11-10 00:23:03 +01:00
captcha_recaptcha.html [ticket/9939] Fix JavaScript error in admin recaptcha template 2010-12-05 14:35:19 +01:00
captcha_recaptcha_acp.html [ticket/10780] Replace colon usage in adm template output with {L_COLON} 2012-11-10 00:23:03 +01:00
colour_swatch.html [ticket/10258] Add HTML5 meta charset tag 2011-07-29 16:32:22 +02:00
confirm_bbcode.html merge r10513 into 3.0 branch: propdel 2010-02-23 16:18:57 +00:00
confirm_body.html [ticket/11166] Add ajaxify support to normal ACP confirm_box() 2013-03-03 17:34:01 +01:00
confirm_body_prune.html [feature/prune-users] Add spaces inside brackets. 2012-04-19 20:35:13 -04:00
custom_profile_fields.html [ticket/10780] Replace colon usage in adm template output with {L_COLON} 2012-11-10 00:23:03 +01:00
editor.js Merge branch 'develop-olympus' into develop 2011-12-16 15:50:11 +01:00
install_convert.html [ticket/10780] Replace colon usage in adm template output with {L_COLON} 2012-11-10 00:23:03 +01:00
install_error.html [ticket/9556] Drop php closing tags, add trailing newline 2010-11-11 19:10:55 +01:00
install_footer.html Merge branch 'develop-olympus' into develop 2012-10-06 06:15:01 +02:00
install_header.html [ticket/11259] Make phpbb_admin_path available everywhere 2012-12-09 17:01:08 -06:00
install_install.html [ticket/10780] Replace colon usage in adm template output with {L_COLON} 2012-11-10 00:23:03 +01:00
install_main.html [ticket/9556] Drop php closing tags, add trailing newline 2010-11-11 19:10:55 +01:00
install_update.html [ticket/10780] Replace colon usage in adm template output with {L_COLON} 2012-11-10 00:23:03 +01:00
install_update_diff.html [ticket/11259] Make phpbb_admin_path available everywhere 2012-12-09 17:01:08 -06:00
message_body.html [ticket/9556] Drop php closing tags, add trailing newline 2010-11-11 19:10:55 +01:00
overall_footer.html Merge branch 'develop' of https://github.com/phpbb/phpbb3 into ticket/11166 2013-03-06 07:35:47 +01:00
overall_header.html [feature/events] Append "_append" to acp_overall_header_head 2012-12-17 11:37:42 -05:00
pagination.html [feature/pagination-as-list] Various fixes and improvements 2012-07-18 14:31:21 +01:00
permission_forum_copy.html [ticket/10780] Replace colon usage in adm template output with {L_COLON} 2012-11-10 00:23:03 +01:00
permission_mask.html [ticket/10780] Replace colon usage in adm template output with {L_COLON} 2012-11-10 00:23:03 +01:00
permission_roles_mask.html [ticket/10780] Replace colon usage in adm template output with {L_COLON} 2012-11-10 00:23:03 +01:00
permission_trace.html [ticket/10780] Replace colon usage in adm template output with {L_COLON} 2012-11-10 00:23:03 +01:00
permissions.js Trying to keep my sanity... begone evil underscored CSS class/id names 2007-03-05 23:13:50 +00:00
progress_bar.html [ticket/9556] Drop php closing tags, add trailing newline 2010-11-11 19:10:55 +01:00
simple_body.html [ticket/9556] Drop php closing tags, add trailing newline 2010-11-11 19:10:55 +01:00
simple_footer.html [feature/events] acp_simple_footer_end -> acp_simple_footer_after 2012-12-17 11:37:43 -05:00
simple_header.html [feature/events] Append "_append" to acp_simple_header_head 2012-12-17 11:37:44 -05:00
timezone.js [ticket/10949] Converted missing code to new JS coding guidelines 2013-01-04 22:46:12 +01:00
timezone_option.html [ticket/10780] Replace colon usage in adm template output with {L_COLON} 2012-11-10 00:23:03 +01:00
tooltip.js ok, this one is rather large... the most important change: 2006-06-06 20:53:46 +00:00
viewsource.html [ticket/9556] Drop php closing tags, add trailing newline 2010-11-11 19:10:55 +01:00