makary/phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-06-10 05:18:52 +00:00
Code Issues Projects Releases Packages Wiki Activity
phpbb/phpBB/language/en/acp
History
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
..
attachments.php [ticket/9916] Updating header license and removing Version $Id$ 2011-12-31 13:32:52 +00:00
ban.php [ticket/9916] Updating header license and removing Version $Id$ 2011-12-31 13:32:52 +00:00
board.php [ticket/9916] Updating header license and removing Version $Id$ 2011-12-31 13:32:52 +00:00
bots.php [ticket/9916] Updating header license and removing Version $Id$ 2011-12-31 13:32:52 +00:00
common.php Merge branch 'develop' into feature/merging-style-components 2012-03-31 10:43:06 +03:00
database.php [ticket/9916] Updating header license and removing Version $Id$ 2011-12-31 13:32:52 +00:00
email.php [ticket/9916] Updating header license and removing Version $Id$ 2011-12-31 13:32:52 +00:00
forums.php [ticket/9916] Updating header license and removing Version $Id$ 2011-12-31 13:32:52 +00:00
groups.php [ticket/9916] Updating header license and removing Version $Id$ 2011-12-31 13:32:52 +00:00
index.htm some bugfixes 2006-10-26 10:58:58 +00:00
language.php [ticket/9916] Updating header license and removing Version $Id$ 2011-12-31 13:32:52 +00:00
modules.php [ticket/9916] Updating header license and removing Version $Id$ 2011-12-31 13:32:52 +00:00
permissions.php Merge branch 'develop-olympus' into develop 2012-03-29 20:43:03 -04:00
permissions_phpbb.php [ticket/9916] Updating header license and removing Version $Id$ 2011-12-31 13:32:52 +00:00
posting.php [ticket/10271] AJAXified various deletions in the ACP. 2012-03-31 02:09:15 +02:00
profile.php [ticket/9916] Updating header license and removing Version $Id$ 2011-12-31 13:32:52 +00:00
prune.php [ticket/9916] Updating header license and removing Version $Id$ 2011-12-31 13:32:52 +00:00
search.php [ticket/9916] Updating header license and removing Version $Id$ 2011-12-31 13:32:52 +00:00
styles.php Merge branch 'develop' into feature/merging-style-components 2012-03-31 10:43:06 +03:00
users.php [ticket/9916] Updating header license and removing Version $Id$ 2011-12-31 13:32:52 +00:00