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
..
adm	Merge branch 'develop' into feature/merging-style-components	2012-03-31 10:43:06 +03:00
assets/javascript	[ticket/10272] Removed code that was prevent event propogation in AJAX.	2012-03-31 02:10:16 +02:00
cache	[ticket/9520] Removed per directory web.config files.	2010-05-03 19:31:40 +02:00
develop	Merge remote-tracking branch 'upstream/develop' into feature/merging-style-components	2012-03-29 22:38:07 +03:00
docs	Merge branch 'develop' into feature/merging-style-components	2012-03-31 10:43:06 +03:00
download	[feature/event-dispatcher] Add missing dispatcher to file.php	2012-03-28 21:45:21 +02:00
files	[ticket/9520] Removed per directory web.config files.	2010-05-03 19:31:40 +02:00
images	[ticket/9520] Removed per directory web.config files.	2010-05-03 19:31:40 +02:00
includes	Merge branch 'develop' into feature/merging-style-components	2012-03-31 10:43:06 +03:00
install	Merge branch 'develop' into feature/merging-style-components	2012-03-31 10:43:06 +03:00
language	Merge branch 'develop' into feature/merging-style-components	2012-03-31 10:43:06 +03:00
store	[ticket/9520] Removed per directory web.config files.	2010-05-03 19:31:40 +02:00
styles	Merge branch 'develop' into feature/merging-style-components	2012-03-31 10:43:06 +03:00
.htaccess	[Feature] Ability to use HTTP authentication in ATOM feeds by passing the GET parameter auth=http	2010-01-19 19:08:51 +00:00
common.php	Merge branch 'develop' into feature/merging-style-components	2012-03-31 10:43:06 +03:00
composer.json	[feature/event-dispatcher] Use real EventDispatcher through composer	2012-03-11 15:15:33 +01:00
composer.lock	[feature/event-dispatcher] Use real EventDispatcher through composer	2012-03-11 15:15:33 +01:00
cron.php	[ticket/9916] Updating header license and removing Version $Id$	2011-12-31 13:32:52 +00:00
faq.php	[ticket/9916] Updating header license and removing Version $Id$	2011-12-31 13:32:52 +00:00
feed.php	[ticket/10672] Fix total post count language string in statistics and feed	2012-02-27 19:13:31 +01:00
index.php	[ticket/10586] Moved some loading stuff below extension controller, updated tests	2012-03-28 16:48:16 -04:00
mcp.php	[ticket/9916] Updating header license and removing Version $Id$	2011-12-31 13:32:52 +00:00
memberlist.php	Merge branch 'develop-olympus' into develop	2012-03-16 06:06:56 -04:00
posting.php	[ticket/9916] Updating header license and removing Version $Id$	2011-12-31 13:32:52 +00:00
report.php	[feature/save-post-on-report] Changed the name of the column	2012-03-19 08:27:32 -04:00
search.php	Merge branch 'develop-olympus' into develop	2012-02-26 15:47:16 +01:00
ucp.php	[ticket/9916] Updating header license and removing Version $Id$	2011-12-31 13:32:52 +00:00
viewforum.php	Merge branch 'develop-olympus' into develop	2012-02-11 05:48:03 -05:00
viewonline.php	[ticket/9916] Updating header license and removing Version $Id$	2011-12-31 13:32:52 +00:00
viewtopic.php	[ticket/10270] Removed all the inline language and HTML from the JS.	2012-03-31 02:09:17 +02:00
web.config	[ticket/10219] Remove invalid and invisible character from web.config.	2011-06-14 23:18:33 +02:00