Marc Alexander 41d3cb0a18 Merge branch 'develop-ascraeus' into develop ...

* develop-ascraeus:
  [ticket/12099] Fix correction in path_helper test
  [ticket/12099] Prepend ./ to path to fix assets
  [ticket/12099] Deduplicate path generation
  [ticket/12099] Fix clean_path() ".." stripping when previous directory was "."
  [ticket/12099] Break clean_path tests with a simple test
  [ticket/12099] Clean paths in tests
  [ticket/12099] Correctly fix go back to root before prepending the root path
  [ticket/12099] Clean some paths before using them
  [ticket/12099] Fix several issues in path_helper test

2014-06-26 15:07:44 +02:00

..

adm

[ticket/12462] Do not use string "None" for different options

2014-06-25 22:14:33 +02:00

assets

Merge pull request #2514 from prototech/ticket/12553

2014-06-20 10:37:30 +02:00

bin

[ticket/12655] Run the shell when --shell is used

2014-06-04 14:46:40 +02:00

cache

…

config

[ticket/12730] Add Google+ profile field type

2014-06-21 03:29:31 +05:30

develop

[ticket/12763] Do not regenerate the *_schema.sql files

2014-06-23 21:39:34 +02:00

docs

[prep-release-3.1.0-RC1] Add changelog for 3.1.0-RC1

2014-06-24 23:21:58 +02:00

download

…

ext

…

files

…

images

…

includes

Merge branch 'develop-ascraeus' into develop

2014-06-25 19:38:58 +02:00

install

[prep-release-3.1.0-RC1] Update phpBB Version for RC2 development

2014-06-25 00:06:08 +02:00

language

[ticket/12462] Do not use string "None" for different options

2014-06-25 22:14:33 +02:00

phpbb

Merge remote-tracking branch 'nickvergessen/ticket/12099' into develop-ascraeus

2014-06-26 15:07:05 +02:00

store

…

styles

[ticket/12462] Do not use string "None" for different options

2014-06-25 22:14:33 +02:00

.htaccess

…

app.php

…

common.php

…

composer.json

[ticket/11528] Add behat/mink and mink-goutte-driver as dependency

2014-06-23 01:26:02 +05:30

composer.lock

[ticket/11528] Add behat/mink and mink-goutte-driver as dependency

2014-06-23 01:26:02 +05:30

cron.php

…

faq.php

…

feed.php

…

index.php

…

mcp.php

[ticket/12612] Prefix get_*_data() with phpbb_ and delete unused global

2014-06-23 22:58:41 +02:00

memberlist.php

[ticket/12612] Prefix _sort_last_active() with phpbb_

2014-06-23 22:38:58 +02:00

posting.php

[ticket/12612] Prefix upload_popup() with phpbb_

2014-06-23 22:49:00 +02:00

report.php

…

search.php

[ticket/12758] Add @changed to doc block

2014-06-22 10:23:41 +02:00

ucp.php

[ticket/12612] Move function from ucp.php to functions_user.php

2014-06-18 16:57:13 +02:00

viewforum.php

…

viewonline.php

…

viewtopic.php

Merge pull request #2567 from Crizz0/ticket/12680

2014-06-25 19:36:18 +02:00

web.config

…