Nathaniel Guse 193670d7a9 Merge branch 'develop-olympus' into develop ...

# By Andreas Fischer
# Via Andreas Fischer (1) and Nathaniel Guse (1)
* develop-olympus:
  [ticket/11662] Typos: occured -> occurred

Conflicts:
	tests/template/template_test.php

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

..

acp

Merge remote-tracking branch 'remotes/nickv/ticket/8319' into develop-olympus

2013-07-11 10:09:53 -05:00

auth

[feature/auth-refactor] Move auth providers to separate directory

2013-07-04 17:14:19 -04:00

avatar

[ticket/11010] Fixes for number input in acp

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

cache

…

captcha

…

config

…

controller

[feature/twig] Remove style dependency for controller helper

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

cron

…

db

[ticket/8319] Add migration file for update change

2013-07-10 17:25:27 +02: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/11437] avoid $start becoming negative when no search results are found

2013-06-19 02:14:04 +05:30

style

[ticket/11388] Fix typo

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

template

[ticket/11388] INCLUDECSS

2013-07-11 15:31:55 -05: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

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

2013-07-01 23:25:29 +05:30

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

[feature/bootstrap-dic] Bootstrap container from config.php

2013-07-11 18:04:40 -04: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/9341] remove PREV_PAGE tpl var used for backward compatability

2013-06-27 20:47:03 +05:30

index.htm

…

json_response.php

…

message_parser.php

…

session.php

[feature/auth-refactor] Refactor code to use services

2013-06-21 18:04:11 -04:00

sphinxapi.php

…

startup.php

…

user_loader.php

…

user.php

…