Rubén Calvo ef00bb4da5 [ticket/15276] Resolve conflicts ...

PHPBB3-15276

2017-08-25 15:31:58 +02:00

..

adm

Merge branch '3.2.x'

2017-07-26 13:09:30 +02:00

assets

Merge branch '3.2.x'

2017-04-18 23:43:03 +02:00

bin

[ticket/11150] Fix comments

2017-04-23 21:01:15 +02:00

cache

…

config

[ticket/15276] Resolve conflicts

2017-08-25 15:31:58 +02:00

develop

[ticket/15253] Use storage helper methods instead of filesystem methods

2017-07-20 19:55:52 +02:00

docs

[ticket/14972] replace all occurrences of sizeof() with the count()

2017-07-17 16:57:00 +07:00

download

[ticket/11150] Fix comments

2017-04-23 21:01:15 +02:00

ext

[ticket/11150] Fix CS

2017-04-23 21:01:11 +02:00

files

…

images

[ticket/15037] Optimize what can be

2017-01-24 17:15:41 -05:00

includes

[ticket/15253] Fix code

2017-07-20 19:55:52 +02:00

install

[ticket/15276] Use storage in avatars

2017-08-25 15:31:58 +02:00

language

[ticket/15305] Throw exception if stream_copy_to_stream() fail

2017-08-23 17:18:53 +02:00

phpbb

[ticket/15276] Resolve conflicts

2017-08-25 15:31:58 +02:00

store

…

styles

[ticket/15336] Fix travis fail in bidi.css

2017-08-23 04:17:33 -03:00

vendor-ext

[ticket/11150] Add composer-ext.* and vendor-ext/

2017-04-23 21:01:13 +02:00

.htaccess

[ticket/14458] Explicitly state RewriteBase into .htaccess root file

2016-02-07 14:46:45 +01:00

app.php

…

common.php

[ticket/15253] Move storage helper to filesystem

2017-07-20 19:55:52 +02:00

composer-ext.json

[ticket/11150] Fix comments

2017-04-23 21:01:15 +02:00

composer-ext.lock

[ticket/11150] Fix comments

2017-04-23 21:01:15 +02:00

composer.json

Merge branch '3.2.x'

2017-08-06 11:52:08 +02:00

composer.lock

Merge branch '3.2.x'

2017-08-06 11:52:08 +02:00

cron.php

[ticket/14542] Move cron to controller

2016-08-05 22:50:54 +02:00

faq.php

[ticket/15200] Allow extensions using custom templates for help/faq controllers

2017-04-27 16:22:03 +07:00

feed.php

[ticket/14688] Add core events to the feeds

2016-07-17 21:14:13 +07:00

index.php

Merge branch '3.1.x' into 3.2.x

2016-07-29 09:41:51 +02:00

mcp.php

[ticket/14972] replace all occurrences of sizeof() with the count()

2017-07-17 16:57:00 +07:00

memberlist.php

[ticket/14972] replace all occurrences of sizeof() with the count()

2017-07-17 16:57:00 +07:00

posting.php

[ticket/14972] replace all occurrences of sizeof() with the count()

2017-07-17 16:57:00 +07:00

report.php

…

search.php

[ticket/14972] replace all occurrences of sizeof() with the count()

2017-07-17 16:57:00 +07:00

ucp.php

Merge branch '3.2.x'

2017-04-19 23:09:05 +02:00

viewforum.php

[ticket/14972] replace all occurrences of sizeof() with the count()

2017-07-17 16:57:00 +07:00

viewonline.php

Merge branch '3.2.x'

2017-06-05 11:57:37 +02:00

viewtopic.php

[ticket/14972] replace all occurrences of sizeof() with the count()

2017-07-17 16:57:00 +07:00

web.config

[ticket/security-181] Port .htaccess changes to other webserver types

2016-11-13 11:50:23 +01:00