Oleg Pudeyev 8b464e87f0 Merge PR #1298 branch 'nickvergessen/ticket/11438' into develop ...

# By Joas Schilling
# Via Joas Schilling
* nickvergessen/ticket/11438:
  [ticket/11438] Add spaces after # comment start and before \ line breaks
  [ticket/11438] Add helpful comments from sample config to ACP output
  [ticket/11438] Add empty sql_query_pre to delta-source
  [ticket/11438] Move backslash to concatenate the query strings correctly
  [ticket/11438] Update sphinx.sample.conf to one provided by config_generate()

2013-03-20 11:43:14 -04:00

..

adm

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

2013-03-06 07:35:47 +01:00

assets/javascript

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

2013-03-06 07:35:47 +01:00

cache

…

config

[ticket/11455] Restore alphabetic order (underscore first) in config/tables.yml

2013-03-17 18:31:49 +01:00

develop

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

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

docs

[ticket/11438] Add spaces after # comment start and before \ line breaks

2013-03-16 01:18:15 +01:00

download

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

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

files

…

images

…

includes

Merge PR #1298 branch 'nickvergessen/ticket/11438' into develop

2013-03-20 11:43:14 -04:00

install

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

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

language

Merge remote-tracking branch 'EXreaction/ticket/11394' into develop

2013-03-04 15:10:48 -05:00

store

…

styles

[ticket/11433] Rename CSS class "jalert" to "phpbb_alert"

2013-03-12 15:15:21 +01:00

.htaccess

…

app.php

…

common.php

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

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

composer.json

…

composer.lock

…

cron.php

…

faq.php

…

feed.php

…

index.php

[ticket/11103] Instantiate $phpbb_notifications as needed

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

mcp.php

…

memberlist.php

Merge remote-tracking branch 'remotes/marc/feature/avatars' into develop

2013-03-04 13:33:42 -06: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

…

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

…