Andreas Fischer 0d0338a55c Merge branch 'develop-olympus' into develop ...

* develop-olympus:
  [ticket/11548] Fix incorrect usage of array_map on acp groups page

Conflicts:
	tests/functional/common_groups_test.php
	tests/functional/ucp_groups_test.php

2013-07-12 20:09:22 +02:00

..

acp

Merge branch 'develop-olympus' into develop

2013-07-12 20:09:22 +02:00

auth

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

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

avatar

…

cache

…

captcha

…

config

…

controller

[feature/twig] Remove style dependency for controller helper

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

cron

…

db

[ticket/11662] Typos: occured -> occurred

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

di

…

diff

…

event

…

extension

…

feed

…

groupposition

…

hook

…

hooks

…

lock

…

log

…

mcp

…

notification

…

php

…

questionnaire

…

request

…

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

[ticket/11665] Can't change file names already sent to set_filenames

2013-07-12 11:47:34 -05:00

tree

…

ucp

Merge branch 'develop-olympus' into develop

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

utf

…

.htaccess

…

bbcode.php

…

class_loader.php

…

constants.php

…

datetime.php

…

error_collector.php

…

filesystem.php

…

functions_acp.php

…

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

…

functions_install.php

…

functions_jabber.php

Merge branch 'develop-olympus' into develop

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

functions_messenger.php

…

functions_module.php

[feature/twig] Spacing

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

functions_posting.php

…

functions_privmsgs.php

…

functions_profile_fields.php

…

functions_transfer.php

…

functions_upload.php

…

functions_url_matcher.php

…

functions_user.php

…

functions.php

…

index.htm

…

json_response.php

…

message_parser.php

…

session.php

…

sphinxapi.php

…

startup.php

…

user_loader.php

…

user.php

…