Tristan Darricau cd348b200a Merge branch '3.1.x' into 3.2.x ...

* 3.1.x:
  [ticket/11483] Add tests for generating user act key on force reactivate
  [ticket/11483] Generate user act key if database entry is empty

2016-11-06 15:41:59 +01:00

..

info

Merge branch 'develop-ascraeus' into develop

2014-10-01 10:34:42 +02:00

acp_attachments.php

Merge branch 'ticket/14577' into ticket/14577-3.2.x

2016-04-02 09:51:37 +02:00

acp_ban.php

[ticket/13454] Fix code sniffer complaints

2016-01-06 13:52:11 +01:00

acp_bbcodes.php

Merge branch '3.1.x'

2016-01-16 23:10:37 +01:00

acp_board.php

Merge branch '3.1.x' into 3.2.x

2016-07-06 19:24:02 +02:00

acp_bots.php

[ticket/13454] Remove unused variables

2016-01-06 13:51:19 +01:00

acp_captcha.php

[ticket/13454] Remove unused variables

2016-01-06 13:52:11 +01:00

acp_contact.php

[ticket/13844] FAQ in new controller format

2015-05-16 22:09:05 +02:00

acp_database.php

Merge branch '3.1.x' into 3.2.x

2016-10-02 17:18:32 +02:00

acp_disallow.php

[ticket/13454] Fix code sniffer complaints

2016-01-06 13:52:11 +01:00

acp_email.php

[ticket/13454] Remove unused variables

2016-01-06 13:51:19 +01:00

acp_extensions.php

Merge branch '3.1.x'

2016-01-12 04:31:15 +01:00

acp_forums.php

Merge branch '3.1.x' into 3.2.x

2016-09-17 12:59:56 +02:00

acp_groups.php

[ticket/10961] Send HTTP 403 when applicable

2016-09-01 08:48:37 +02:00

acp_icons.php

Merge branch '3.1.x' into 3.2.x

2016-10-02 17:18:32 +02:00

acp_inactive.php

[ticket/10961] Send HTTP 403 when applicable

2016-09-01 08:48:37 +02:00

acp_jabber.php

[ticket/13454] Remove unused variables

2016-01-06 13:51:19 +01:00

acp_language.php

Merge branch '3.1.x' into 3.2.x

2016-09-18 21:14:47 +02:00

acp_logs.php

[ticket/13454] Remove unused variables

2016-01-06 13:51:19 +01:00

acp_main.php

[ticket/10961] Send HTTP 403 when applicable

2016-09-01 08:48:37 +02:00

acp_modules.php

Merge branch '3.1.x' into 3.2.x

2016-09-18 21:14:47 +02:00

acp_permission_roles.php

Merge branch '3.1.x' into 3.2.x

2016-09-18 21:14:47 +02:00

acp_permissions.php

[ticket/10961] Send HTTP 403 when applicable

2016-09-01 08:48:37 +02:00

acp_php_info.php

[ticket/13454] Remove unused variables

2016-01-06 13:51:19 +01:00

acp_profile.php

Merge branch '3.1.x' into 3.2.x

2016-10-28 21:06:21 +02:00

acp_prune.php

[ticket/13454] Remove unused variables

2016-01-06 13:52:11 +01:00

acp_ranks.php

[ticket/13454] Remove unused variables

2016-01-06 13:51:19 +01:00

acp_reasons.php

Merge pull request #4265 from Senky/ticket/10809

2016-09-25 17:19:13 +02:00

acp_search.php

Merge branch '3.1.x' into 3.2.x

2016-10-28 21:06:21 +02:00

acp_send_statistics.php

Merge branch '3.1.x'

2015-10-14 10:17:04 +02:00

acp_styles.php

[ticket/13454] Remove unused variables

2016-01-06 13:52:11 +01:00

acp_update.php

[ticket/14764] Wrong link to database update script has been fixed

2016-09-02 22:05:37 +02:00

acp_users.php

Merge branch '3.1.x' into 3.2.x

2016-11-06 15:41:59 +01:00

acp_words.php

[ticket/13454] Remove unused variables

2016-01-06 13:51:19 +01:00

auth.php

[ticket/14315] Add back roles select for disable javascript

2016-02-16 18:21:04 +01:00