Joas Schilling ca07be9c57 Merge branch 'develop-olympus' into develop ...

* develop-olympus:
  [ticket/10037] Fix table in subsilver2
  [ticket/10037] Apply attached patch with a few changes

2013-07-31 23:40:35 +02:00

..

acp

Merge pull request #1513 from nickvergessen/ticket/11582

2013-07-22 11:28:55 -07:00

captcha

[ticket/11731] Remove static calls to captcha garbage collector

2013-07-22 15:04:30 -07:00

db

[ticket/11696] Move file to new directory

2013-07-14 10:16:15 -04:00

diff

…

hooks

…

mcp

Merge pull request #1586 from brunoais/ticket/11654

2013-07-29 07:26:15 -07:00

questionnaire

Merge remote-tracking branch 'upstream/develop' into ticket/11015

2012-12-06 21:49:24 -05:00

ucp

Merge branch 'develop-olympus' into develop

2013-07-31 23:40:35 +02:00

utf

…

.htaccess

…

bbcode.php

[feature/twig] Fix BBCode parser

2013-07-02 11:29:32 -05:00

constants.php

[develop-olympus] Increment version number to 3.0.13-dev.

2013-07-12 21:10:05 +02:00

functions_acp.php

[ticket/10999] Fix assets_version in ACP

2013-07-13 13:30:33 -04:00

functions_admin.php

Merge remote-tracking branch 'phpbb/develop' into feature/softdelete-1-permission

2013-07-11 11:41:48 +02:00

functions_compatibility.php

[feature/avatars] Use deprecated for compatibility function

2013-02-03 23:06:30 +01:00

functions_compress.php

[ticket/11159] Static public is the currently approved order.

2012-11-06 16:43:48 -05:00

functions_container.php

[ticket/11660] Fix bugs from bugs in #11651 (missing vars, db->sql_connect)

2013-07-12 09:37:24 -05:00

functions_content.php

Merge PR #786 branch 'brunoais/ticket/10845' into develop

2012-11-06 16:23:33 -05:00

functions_convert.php

[feature/soft-delete] Lay the groundwork for a soft-delete feature

2012-08-29 17:49:37 +02:00

functions_database_helper.php

[ticket/11162] Chase dbal autoloading changes in develop.

2012-12-13 21:27:30 -05:00

functions_display.php

[ticket/9649] Display information on index for moderators on unapproved posts

2013-07-13 14:57:31 -04:00

functions_download.php

Merge branch 'ticket/10820' into ticket/10820-develop

2013-06-14 00:32:23 +05:30

functions_install.php

[ticket/11696] Rename db_tools.php so it can be autoloaded

2013-07-14 10:10:05 -04:00

functions_jabber.php

Merge branch 'develop-olympus' into develop

2013-07-12 10:37:52 -05:00

functions_messenger.php

[feature/twig] Should have been else

2013-07-01 21:32:10 -05:00

functions_module.php

[feature/twig] Spacing

2013-07-04 15:24:42 -05:00

functions_posting.php

[ticket/11717] Add 'has' to boolean variable and reduce line length

2013-07-22 10:42:46 +02:00

functions_privmsgs.php

[ticket/11640] removed the space that I wonder what it was doing there.

2013-07-29 16:55:58 +01:00

functions_profile_fields.php

[ticket/11010] dealing with dimensions problem, removing extra code

2013-05-20 18:42:06 +02:00

functions_transfer.php

…

functions_upload.php

[ticket/10763] Use self when calling get_extension() in filespec class

2012-12-17 19:17:32 +01:00

functions_url_matcher.php

[ticket/11335] (kernel request subscriber) Make php_ext 'php' not '.php'

2013-04-24 17:45:41 -05:00

functions_user.php

Merge branch 'develop-olympus' into develop

2013-06-11 18:46:30 +02:00

functions.php

Merge pull request #1541 from nickvergessen/ticket/11684

2013-07-13 10:38:24 -07:00

index.htm

…

message_parser.php

[ticket/11250] Move quote special cases from class to unit tests

2012-12-14 12:58:57 +01:00

sphinxapi.php

[ticket/11248] Convert line endings to LF - develop edition.

2012-12-07 21:57:33 -05:00

startup.php

…