David King 3be753cd5c Merge branch 'develop' into ticket/11215 ...

* develop:
  [ticket/11647] Always use & for URLs
  [ticket/11647] Allow custom ports
  [ticket/11647] Use $config for assets_version
  [ticket/11647] Fix invalid variable name
  [ticket/11647] New assets handling
  [ticket/11647] Fix tests for INCLUDEJS

2013-07-13 11:49:06 -04:00

..

acp

Merge remote-tracking branch 'remotes/Hardolaf/ticket/11626' into develop

2013-07-12 14:59:43 -05:00

auth

[ticket/11626] Remove last reference to template in ldap

2013-07-12 15:57:35 -04:00

avatar

[ticket/11548] Check upload avatar URL the same way as in phpBB 3.0

2013-07-12 14:35:17 -04:00

cache

…

captcha

…

config

…

controller

[feature/twig] Remove style dependency for controller helper

2013-07-05 12:11:59 -05:00

cron

…

db

Merge remote-tracking branch 'EXreaction/ticket/11420' into develop

2013-07-13 11:15:53 -04:00

di

…

diff

…

event

…

extension

Merge remote-tracking branch 'EXreaction/ticket/11415' into develop

2013-05-18 11:20:47 -04:00

feed

[ticket/11481] Move prepended slash from calls into function

2013-06-06 20:35:38 +02:00

groupposition

…

hook

…

hooks

…

lock

…

log

…

mcp

…

notification

Merge remote-tracking branch 'EXreaction/ticket/11413' into develop

2013-05-20 11:54:39 -04:00

php

…

questionnaire

…

request

[feature/auth-refactor] Fix the actual cause of test failures

2013-07-01 22:40:49 -04:00

search

[ticket/11662] Typos: occured -> occurred

2013-07-12 17:51:29 +02:00

style

[ticket/11388] Fix typo

2013-07-11 11:27:15 -05:00

template

Merge pull request #1519 from cyberalien/ticket/11647

2013-07-13 08:46:46 -07:00

tree

…

ucp

Merge branch 'develop-olympus' into develop

2013-07-12 00:11:18 +02:00

utf

…

.htaccess

…

bbcode.php

[feature/twig] Fix BBCode parser

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

class_loader.php

…

constants.php

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

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

datetime.php

…

error_collector.php

…

filesystem.php

…

functions_acp.php

[ticket/11010] resolving latest comments

2013-05-21 11:55:45 +02:00

functions_admin.php

Merge branch 'develop-olympus' into develop

2013-07-05 18:21:38 -05:00

functions_compatibility.php

…

functions_compress.php

…

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

…

functions_convert.php

…

functions_database_helper.php

…

functions_display.php

…

functions_download.php

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

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

functions_install.php

…

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/11586] Move $filedata['thumbnail'] to where it might be returned.

2013-06-03 16:24:12 +02:00

functions_privmsgs.php

…

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

…

functions_url_matcher.php

…

functions_user.php

Merge branch 'develop-olympus' into develop

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

functions.php

[ticket/11215] Don't try to use when it isn't there

2013-07-13 11:43:38 -04:00

index.htm

…

json_response.php

…

message_parser.php

…

session.php

[feature/auth-refactor] Check that providers implement auth interface

2013-07-11 14:54:52 -04:00

sphinxapi.php

…

startup.php

…

user_loader.php

…

user.php

…