Marc Alexander 2265811cd1 Merge branch 'feature/avatars' of https://github.com/igorw/phpbb3 into feature/avatars ...

Conflicts:
	phpBB/adm/style/acp_groups.html
	phpBB/adm/style/acp_users_avatar.html
	phpBB/includes/acp/acp_groups.php
	phpBB/includes/acp/acp_users.php
	phpBB/includes/functions_display.php
	phpBB/install/database_update.php
	phpBB/install/schemas/mssql_schema.sql
	phpBB/styles/prosilver/template/ucp_avatar_options.html

2012-11-12 14:57:28 +01:00

..

add_permissions.php

Merge PR #799 branch 'develop-olympus' into develop

2012-05-10 14:43:14 -04:00

adjust_avatars.php

…

adjust_bbcodes.php

…

adjust_magic_urls.php

…

adjust_sizes.php

…

adjust_smilies.php

…

adjust_uids.php

…

adjust_usernames.php

…

benchmark.php

…

calc_email_hash.php

Merge PR #799 branch 'develop-olympus' into develop

2012-05-10 14:43:14 -04:00

change_smiley_ref.php

Merge PR #799 branch 'develop-olympus' into develop

2012-05-10 14:43:14 -04:00

check_flash_bbcodes.php

[ticket/10881] Replace old (and unify) file headers in develop files.

2012-05-10 11:53:54 +02:00

collect_cache_stats.sh

…

compile_template.php

…

create_schema_files.php

Merge branch 'feature/avatars' of https://github.com/igorw/phpbb3 into feature/avatars

2012-11-12 14:57:28 +01:00

create_search_index.php

Merge branch 'develop-olympus' into develop

2012-03-19 12:55:37 +01:00

create_variable_overview.php

Merge PR #799 branch 'develop-olympus' into develop

2012-05-10 14:43:14 -04:00

extensions.php

[ticket/10703] Added a condition to check if ext directory exists

2012-03-23 00:27:29 +05:30

fill.php

Merge PR #799 branch 'develop-olympus' into develop

2012-05-10 14:43:14 -04:00

fix_files.sh

…

generate_utf_casefold.php

Merge branch 'develop-olympus' into develop

2012-01-02 17:36:21 +01:00

generate_utf_confusables.php

Merge branch 'develop-olympus' into develop

2012-01-02 17:36:21 +01:00

generate_utf_tables.php

Merge branch 'develop-olympus' into develop

2012-01-02 17:36:21 +01:00

imageset_to_css.php

Merge remote-tracking branch 'cyberalien/ticket/10378' into develop

2012-02-17 14:08:03 +01:00

lang_duplicates.php

[ticket/9916] Updating header license and removing Version $Id$

2012-01-02 19:10:27 +01:00

merge_attachment_tables.php

Merge PR #799 branch 'develop-olympus' into develop

2012-05-10 14:43:14 -04:00

merge_post_tables.php

Merge PR #799 branch 'develop-olympus' into develop

2012-05-10 14:43:14 -04:00

mysql_upgrader.php

[feature/new-tz-handling] Remove appearances of board_dst and user_dst

2012-06-18 15:08:46 +02:00

nuke-db.php

…

regex.php

…

remove-php-end-tags.py

[ticket/9916] Updating header license and removing Version $Id$

2012-01-02 19:10:27 +01:00

repair_bots.php

[feature/new-tz-handling] Remove appearances of board_dst and user_dst

2012-06-18 15:08:46 +02:00

search_fill.php

[ticket/11052] update search backend constructor everywhere

2012-08-15 22:05:26 +05:30

set_permissions.sh

…

unicode_testing.php

…

update_email_hash.php

…

utf_normalizer_test.php

Merge branch 'develop-olympus' into develop

2012-01-02 17:36:21 +01:00