phpbb/phpBB/adm/style
Vjacheslav Trushkin 398a6c8045 Merge branch 'develop' into feature/merging-style-components
* develop: (175 commits)
  [feature/ajax] Remove strange non-breaking spaces from approve button
  [feature/ajax] Add entirely unrelated but nice newlines
  [feature/ajax] Unify phpbb_json_response instantiation
  [feature/ajax] Fix acp_styles activate_deactivate ajax callback name
  [feature/ajax] Send correct activate/deactivate JSON response in acp_profile
  [ticket/10270] Alter background colors for posts
  [feature/ajax] Remove not working module enable/disable ajax code
  [feature/ajax] Replace static call to phpbb_request with OO
  [feature/ajax] Remove quick-reply AJAX handling until we have something good
  [ticket/10270] Changing close button for ajax popups
  [ticket/10270] Disabling links in disappearing content
  [ticket/10291] Fixed an AJAX bug on quick reply form submit.
  [ticket/10273] Fixed accepting / denying posts AJAX.
  [ticket/10272] Removed code that was prevent event propogation in AJAX.
  [ticket/10291] Fixed a bug in the quick reply AJAX.
  [feature/ajax] Handle acp_modules error cases with JSON response
  [feature/ajax] Fix filter check, quick mod tools data-attribute
  [feature/ajax] Use the error handler
  [feature/ajax] Generic error handling with a phpbb.alert box
  [feature/ajax] Change filter semantics, some minor adjustments
  ...

Conflicts:
	phpBB/adm/style/acp_styles.html
	phpBB/includes/acp/acp_styles.php
2012-03-31 10:43:06 +03:00
..
acp_attachments.html [ticket/10271] AJAXified various deletions in the ACP. 2012-03-31 02:09:15 +02:00
acp_ban.html [ticket/10362] HTML5 Fix - Replace name attribute with id in anchors 2011-09-11 17:04:47 -07:00
acp_bbcodes.html [ticket/10271] AJAXified various deletions in the ACP. 2012-03-31 02:09:15 +02:00
acp_board.html [ticket/10362] HTML5 Fix - Replace name attribute with id in anchors 2011-09-11 17:04:47 -07:00
acp_bots.html [ticket/10272] Renamed AJAX callback act_deact to activate_deactivate. 2012-03-31 02:09:22 +02:00
acp_captcha.html [ticket/10362] HTML5 Fix - Replace name attribute with id in anchors 2011-09-11 17:04:47 -07:00
acp_database.html [ticket/10362] HTML5 Fix - Replace name attribute with id in anchors 2011-09-11 17:04:47 -07:00
acp_disallow.html [ticket/10362] HTML5 Fix - Replace name attribute with id in anchors 2011-09-11 17:04:47 -07:00
acp_email.html [ticket/10362] HTML5 Fix - Replace name attribute with id in anchors 2011-09-11 17:04:47 -07:00
acp_forums.html [feature/ajax] Do not hard-code sorting images of acp_forums ordering 2012-03-31 02:09:25 +02:00
acp_forums_copy_perm.html update acp forums copy style to look like the rest of the ACP 2009-09-30 14:50:49 +00:00
acp_groups.html [ticket/10271] AJAXified various deletions in the ACP. 2012-03-31 02:09:15 +02:00
acp_groups_position.html [ticket/10410] Add option to display users in their first teampage group 2011-10-28 22:55:26 +02:00
acp_icons.html [ticket/10271] AJAXified various deletions in the ACP. 2012-03-31 02:09:15 +02:00
acp_inactive.html [ticket/10362] HTML5 Fix - Replace name attribute with id in anchors 2011-09-11 17:04:47 -07:00
acp_jabber.html [ticket/10362] HTML5 Fix - Replace name attribute with id in anchors 2011-09-11 17:04:47 -07:00
acp_language.html [ticket/10362] HTML5 Fix - Replace name attribute with id in anchors 2011-09-11 17:04:47 -07:00
acp_logs.html [ticket/10362] HTML5 Fix - Replace name attribute with id in anchors 2011-09-11 17:04:47 -07:00
acp_main.html [ticket/10271] AJAXified buttons on acp_main. 2012-03-31 02:09:15 +02:00
acp_modules.html [feature/ajax] Remove not working module enable/disable ajax code 2012-03-31 02:10:17 +02:00
acp_permission_roles.html [ticket/10271] AJAXified various deletions in the ACP. 2012-03-31 02:09:15 +02:00
acp_permissions.html [ticket/10362] HTML5 Fix - Replace name attribute with id in anchors 2011-09-11 17:04:47 -07: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/10272] Renamed AJAX callback act_deact to activate_deactivate. 2012-03-31 02:09:22 +02:00
acp_prune_forums.html [ticket/10362] HTML5 Fix - Replace name attribute with id in anchors 2011-09-11 17:04:47 -07:00
acp_prune_users.html [ticket/10362] HTML5 Fix - Replace name attribute with id in anchors 2011-09-11 17:04:47 -07:00
acp_ranks.html [ticket/10271] AJAXified various deletions in the ACP. 2012-03-31 02:09:15 +02:00
acp_reasons.html [ticket/10271] AJAXified various deletions in the ACP. 2012-03-31 02:09:15 +02:00
acp_search.html [ticket/10362] HTML5 Fix - Replace name attribute with id in anchors 2011-09-11 17:04:47 -07: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 [feature/ajax] Fix acp_styles activate_deactivate ajax callback name 2012-03-31 02:10:17 +02: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 Merge branch 'develop-olympus' into develop 2011-10-30 16:12:22 +01:00
acp_users_avatar.html [ticket/9556] Drop php closing tags, add trailing newline 2010-11-11 19:10:55 +01:00
acp_users_feedback.html [ticket/9556] Drop php closing tags, add trailing newline 2010-11-11 19:10:55 +01:00
acp_users_overview.html [ticket/10535] Removed email confirm field from acp_users module 2011-12-23 21:55:49 +00:00
acp_users_prefs.html [ticket/9556] Drop php closing tags, add trailing newline 2010-11-11 19:10:55 +01:00
acp_users_profile.html [ticket/9556] Drop php closing tags, add trailing newline 2010-11-11 19:10:55 +01:00
acp_users_signature.html Merge branch 'develop-olympus' into develop 2011-07-30 19:37:24 -04: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 Merge branch 'develop' into feature/merging-style-components 2012-03-31 10:43:06 +03:00
ajax.js [feature/ajax] Remove not working module enable/disable ajax code 2012-03-31 02:10:17 +02:00
captcha_default_acp_demo.html Set some svn properties. Cleanup. 2009-07-19 22:21:50 +00:00
captcha_gd_acp.html [ticket/10362] HTML5 Fix - Replace name attribute with id in anchors 2011-09-11 17:04:47 -07:00
captcha_qa_acp.html [ticket/10362] HTML5 Fix - Replace name attribute with id in anchors 2011-09-11 17:04:47 -07:00
captcha_qa_acp_demo.html ACP usability 2010-01-26 10:57:00 +00: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/10362] HTML5 Fix - Replace name attribute with id in anchors 2011-09-11 17:04:47 -07: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 some language-specific adjustements 2007-05-03 14:29:22 +00:00
confirm_body_prune.html some language-specific adjustements 2007-05-03 14:29:22 +00:00
custom_profile_fields.html some bugs fixed 2007-08-15 17:32:48 +00:00
editor.js Merge branch 'develop-olympus' into develop 2011-12-16 15:50:11 +01:00
install_convert.html [ticket/9556] Drop php closing tags, add trailing newline 2010-11-11 19:10:55 +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 [ticket/10390] Revert back to escaped script tags inside document.write 2011-10-05 21:24:34 -07:00
install_header.html [ticket/10258] Add HTML5 meta charset tag 2011-07-29 16:32:22 +02:00
install_install.html removed executable props [Bug #6464] 2008-06-04 15:37:06 +00: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/9914] Add backup warning to updater. 2012-02-03 16:14:48 +00:00
install_update_diff.html [ticket/10258] Add HTML5 meta charset tag 2011-07-29 16:32:22 +02:00
message_body.html [ticket/9556] Drop php closing tags, add trailing newline 2010-11-11 19:10:55 +01:00
overall_footer.html [ticket/10270] Changing close button for ajax popups 2012-03-31 02:10:16 +02:00
overall_header.html [ticket/10258] Add HTML5 meta charset tag 2011-07-29 16:32:22 +02:00
permission_forum_copy.html [ticket/10362] HTML5 Fix - Replace name attribute with id in anchors 2011-09-11 17:04:47 -07:00
permission_mask.html [ticket/9535] Fix some more rtl margin issues. 2010-05-16 18:50:25 +02:00
permission_roles_mask.html [ticket/9556] Drop php closing tags, add trailing newline 2010-11-11 19:10:55 +01:00
permission_trace.html do not get too excited 2007-07-26 15:51:11 +00: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 [ticket/10390] Revert back to escaped script tags inside document.write 2011-10-05 21:24:34 -07:00
simple_header.html [ticket/10258] Add HTML5 meta charset tag 2011-07-29 16:32:22 +02: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