makary/phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-06-08 12:28:52 +00:00
Code Issues Projects Releases Packages Wiki Activity
phpbb/phpBB/includes
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
..
acp Merge branch 'develop' into feature/merging-style-components 2012-03-31 10:43:06 +03:00
auth [ticket/9916] Updating header license and removing Version $Id$ 2011-12-31 13:32:52 +00:00
cache [ticket/9916] Updating header license and removing Version $Id$ 2011-12-31 13:32:52 +00:00
captcha [ticket/9916] Updating header license and removing Version $Id$ 2011-12-31 13:32:52 +00:00
config [ticket/9916] Updating header license and removing Version $Id$ 2011-12-31 13:32:52 +00:00
cron [ticket/9916] Updating header license and removing Version $Id$ 2011-12-31 13:32:52 +00:00
db Merge branch 'develop-olympus' into develop 2012-03-08 08:44:32 -05:00
diff [ticket/9916] Updating header license and removing Version $Id$ 2011-12-31 13:32:52 +00:00
event [feature/event-dispatcher] Fix copyright years 2012-03-30 14:22:20 +02:00
extension Merge pull request #662 from imkingdavid/ticket/10586 2012-03-30 10:59:46 -07:00
hooks [ticket/9916] Updating header license and removing Version $Id$ 2011-12-31 13:32:52 +00:00
lock [ticket/9916] Updating header license and removing Version $Id$ 2011-12-31 13:32:52 +00:00
mcp [ticket/10273] Fixed accepting / denying posts AJAX. 2012-03-31 02:10:16 +02:00
questionnaire [ticket/9916] Updating header license and removing Version $Id$ 2011-12-31 13:32:52 +00:00
request [ticket/10495] Update request/type_cast_helper for PHP 5.4 magic_quotes_gpc drop 2012-02-04 00:57:39 +01:00
search Merge branch 'develop-olympus' into develop 2012-03-08 08:44:32 -05:00
style [feature/merging-style-components] Changing style class 2012-03-15 21:09:49 +02:00
ucp [ticket/10328] Renamed the JSON class, also now using autoloading. 2012-03-31 02:09:14 +02:00
utf [ticket/9916] Updating header license and removing Version $Id$ 2011-12-31 13:32:52 +00:00
.htaccess [ticket/9698] Add .htaccess to the includes subdirectory. 2010-10-15 16:47:21 +02:00
auth.php [ticket/9916] Updating header license and removing Version $Id$ 2011-12-31 13:32:52 +00:00
bbcode.php [feature/merging-style-components] Updating style initialization 2012-03-15 21:11:34 +02:00
class_loader.php [ticket/9916] Updating header license and removing Version $Id$ 2011-12-31 13:32:52 +00:00
constants.php [ticket/9916] Updating header license and removing Version $Id$ 2011-12-31 13:32:52 +00:00
error_collector.php [ticket/9916] Updating header license and removing Version $Id$ 2011-12-31 13:32:52 +00:00
functions.php Merge branch 'develop' into feature/merging-style-components 2012-03-31 10:43:06 +03:00
functions_acp.php Merge remote-tracking branch 'unknownbliss/ticket/9916' into develop 2012-01-02 17:54:54 +01:00
functions_admin.php Merge remote-tracking branch 'bantu/ticket/10636' into develop 2012-02-10 13:25:46 -05:00
functions_compress.php [ticket/9916] Updating header license and removing Version $Id$ 2011-12-31 13:32:52 +00:00
functions_content.php [ticket/10510] Moved a $user->lang call into the function. 2012-03-17 18:06:46 +00:00
functions_convert.php Merge branch 'develop-olympus' into develop 2012-01-02 19:54:46 +01:00
functions_display.php [feature/ajax] Add entirely unrelated but nice newlines 2012-03-31 02:10:18 +02:00
functions_download.php Merge branch 'develop-olympus' into develop 2012-02-11 05:58:29 -05:00
functions_install.php [ticket/9916] Updating header license and removing Version $Id$ 2011-12-31 13:32:52 +00:00
functions_jabber.php [ticket/9916] Updating header license and removing Version $Id$ 2011-12-31 13:32:52 +00:00
functions_messenger.php [feature/merging-style-components] Updating style initialization 2012-03-15 21:11:34 +02:00
functions_module.php Merge remote-tracking branch 'dhruvgoel92/ticket/10704' into develop 2012-03-22 10:59:41 +01:00
functions_posting.php Merge branch 'develop-olympus' into develop 2012-03-22 18:15:10 +01:00
functions_privmsgs.php Merge branch 'develop-olympus' into develop 2012-03-22 18:15:10 +01:00
functions_profile_fields.php Merge branch 'develop-olympus' into develop 2012-03-09 05:55:56 -05:00
functions_transfer.php [ticket/9916] Updating header license and removing Version $Id$ 2011-12-31 13:32:52 +00:00
functions_upload.php [ticket/9916] Updating header license and removing Version $Id$ 2011-12-31 13:32:52 +00:00
functions_user.php Merge branch 'develop-olympus' into develop 2012-03-22 18:15:10 +01:00
group_positions.php [ticket/9916] Updating header license and removing Version $Id$ 2011-12-31 13:32:52 +00:00
index.htm Add blank indexes to stop nosey people being, erm, nosey 2001-11-21 13:06:56 +00:00
json_response.php [ticket/10328] Fixed the header of json_response.php. 2012-03-31 02:09:21 +02:00
message_parser.php [ticket/9916] Updating header license and removing Version $Id$ 2011-12-31 13:32:52 +00:00
session.php [feature/merging-style-components] Updating style initialization 2012-03-15 21:11:34 +02:00
startup.php [feature/event-dispatcher] Rename PHPBB_NO_AUTOLOAD=>PHPBB_NO_COMPOSER_AUTOLOAD 2012-03-28 21:48:46 +02:00