phpbb/phpBB/includes/acp
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
..
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 remote-tracking branch 'unknownbliss/ticket/9916' into develop 2012-01-02 17:54:54 +01: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 [ticket/9916] Updating header license and removing Version $Id$ 2011-12-31 13:32:52 +00: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/10328] Renamed the JSON class, also now using autoloading. 2012-03-31 02:09:14 +02:00
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 [ticket/10271] AJAXified buttons on acp_main. 2012-03-31 02:09:15 +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 [ticket/9916] Updating header license and removing Version $Id$ 2011-12-31 13:32:52 +00: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 [feature/ajax] Add entirely unrelated but nice newlines 2012-03-31 02:10:18 +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 [task/php54-ascraeus] Bring p_master#module_auth into PHP 5 era. 2012-03-16 04:56:41 -04:00
acp_words.php [ticket/9916] Updating header license and removing Version $Id$ 2011-12-31 13:32:52 +00:00
auth.php [ticket/9916] Updating header license and removing Version $Id$ 2011-12-31 13:32:52 +00:00