Nils Adermann b3497d955f Merge branch 'develop-olympus' into develop ...

* develop-olympus:
  [ticket/9975] Translate missing style error message

Conflicts:
	phpBB/includes/session.php

2013-04-24 19:13:47 +02:00

..

adm

Merge branch 'develop' of https://github.com/phpbb/phpbb3 into ticket/11314

2013-03-26 13:18:54 +01:00

assets/javascript

Merge branch 'develop' of https://github.com/phpbb/phpbb3 into ticket/11314

2013-03-26 13:18:54 +01:00

cache

…

config

Merge pull request #1324 from nickvergessen/ticket/10844-2

2013-04-24 09:52:57 -07:00

develop

[ticket/10202] Upgrade TEXT to the bigger MTEXT.

2013-03-05 22:59:57 +01:00

docs

Merge pull request #1311 from VSEphpbb/ticket/11461

2013-03-31 14:57:51 -07:00

download

Merge remote-tracking branch 'remotes/nickv/ticket/10714' into develop

2013-03-04 18:11:42 -06:00

files

…

images

…

includes

Merge branch 'develop-olympus' into develop

2013-04-24 19:13:47 +02:00

install

Merge pull request #1323 from t-backoff/ticket/11477

2013-03-31 15:57:26 -07:00

language

Merge branch 'develop-olympus' into develop

2013-04-24 19:13:47 +02:00

store

…

styles

Merge remote-tracking branch 'hjpotter92/ticket/11225' into develop

2013-04-13 00:23:22 -04:00

.htaccess

[feature/controller] Remove url rewriting until we use pathinfo in controllers

2012-11-18 13:32:54 -05:00

app.php

[feature/controller] Check for proper status codes from controllers

2012-11-19 12:37:20 -05:00

common.php

[ticket/11362] Replace other calls to phpbb_clean_path

2013-04-17 17:53:44 +02:00

composer.json

[ticket/11238] Set goutte version to 0.1.0.

2012-12-02 23:44:49 -05:00

composer.lock

[ticket/11238] Set goutte version to 0.1.0.

2012-12-02 23:44:49 -05:00

cron.php

[ticket/11189] Replace DEBUG_EXTRA with DEBUG

2012-11-10 10:45:02 -06:00

faq.php

…

feed.php

[ticket/11077] Remove code from old global announcements system

2012-11-11 13:04:14 +01:00

index.php

[ticket/11103] Instantiate $phpbb_notifications as needed

2012-12-13 19:19:40 -06:00

mcp.php

…

memberlist.php

[ticket/11492] Initialize $user_ids and $group_users arrays

2013-04-11 16:38:14 +02:00

posting.php

Merge branch 'develop-olympus' into develop

2012-12-20 14:28:01 +01:00

report.php

Merge branch 'develop' of github.com:phpbb/phpbb3 into ticket/11103

2013-01-15 11:31:39 -06:00

search.php

[ticket/11023] Fix additional whitespaces that were added by PHPBB3-10968

2012-10-17 23:34:37 +02:00

ucp.php

[ticket/10679] Use module_auth to limit access to the module

2012-12-06 16:33:12 +01:00

viewforum.php

[ticket/10954] Change behavior of marking topics/forums

2012-12-14 15:46:45 +01:00

viewonline.php

[ticket/11259] adm_relative_path -> phpbb_adm_relative_path

2012-12-09 19:29:51 -06:00

viewtopic.php

[ticket/11201] Revert WLM dropping because it is still used in China.

2013-02-04 01:31:43 +01:00

web.config

[feature/controller] Remove URL rewriting by default

2012-11-16 17:06:02 -05:00