phpbb/tests
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
..
bbcode [ticket/9916] Updating license in non-distributed files 2012-01-02 19:10:36 +01:00
cache [ticket/9916] Updating license in non-distributed files 2012-01-02 19:10:36 +01:00
class_loader [ticket/9916] Updating license in non-distributed files 2012-01-02 19:10:36 +01:00
config [ticket/9916] Updating license in non-distributed files 2012-01-02 19:10:36 +01:00
cron [ticket/9916] Updating license in non-distributed files 2012-01-02 19:10:36 +01:00
dbal [feature/merging-style-components] Adjusting unit tests 2012-03-14 23:45:02 +02:00
download [ticket/9916] Updating license in non-distributed files 2012-01-02 19:10:36 +01:00
event [feature/event-dispatcher] Fix copyright years 2012-03-30 14:22:20 +02:00
extension Merge remote-tracking branch 'naderman/ticket/10663' into develop 2012-02-24 13:55:36 +01:00
functional [ticket/10586] Removed incorrect method call 2012-03-28 20:21:54 -04:00
functions_acp [ticket/9916] Updating license in non-distributed files 2012-01-02 19:10:36 +01:00
group_positions [ticket/10667] Fix tests under MySQL 5.5 strict mode 2012-02-21 18:51:08 +01:00
lock [ticket/9916] Updating license in non-distributed files 2012-01-02 19:10:36 +01:00
mock [ticket/9916] Updating license in non-distributed files 2012-01-02 19:10:36 +01:00
network [ticket/9916] Updating license in non-distributed files 2012-01-02 19:10:36 +01:00
profile [ticket/9916] Updating License in the header 2012-01-02 16:18:32 +00:00
random [ticket/9916] Updating License in the header 2012-01-02 16:18:32 +00:00
regex [ticket/9916] Updating License in the header 2012-01-02 16:18:32 +00:00
request [ticket/9916] Updating license in non-distributed files 2012-01-02 19:10:36 +01:00
security Merge branch 'develop-olympus' into develop 2012-01-02 17:36:21 +01:00
session Merge branch 'develop-olympus' into develop 2012-01-02 17:36:21 +01:00
template [feature/merging-style-components] Updating test cases 2012-03-15 21:12:13 +02:00
test_framework [ticket/10586] Tests finally work (thanks naderman) 2012-03-19 09:56:48 -04:00
text_processing [ticket/9916] Updating License in the header 2012-01-02 16:18:32 +00:00
tmp [ticket/10309] Update .gitignore and move .gitkeep. 2011-08-20 14:34:02 -04:00
user Merge branch 'develop-olympus' into develop 2012-01-02 17:36:21 +01:00
utf [ticket/9916] Updating License in the header 2012-01-02 16:18:32 +00:00
wrapper [ticket/9916] Updating License in the header 2012-01-02 16:18:32 +00:00
bootstrap.php [ticket/10719] Revert "Skip functional tests on PHP 5.2" 2012-03-22 15:32:18 +00:00
error_collector_test.php [ticket/9916] Updating License in the header 2012-01-02 16:18:32 +00:00
mock_user.php [ticket/9916] Updating License in the header 2012-01-02 16:18:32 +00:00
RUNNING_TESTS.txt [ticket/9990] Add docs for running slow tests 2011-01-12 02:22:37 +01:00