Nathan Guse 778658f787 Merge remote-tracking branch 'remotes/cyberalien/feature/editor-code-tabs' into develop ...

# By Vjacheslav Trushkin
# Via Vjacheslav Trushkin
* remotes/cyberalien/feature/editor-code-tabs:
  [feature/editor-code-tabs] Adjust code style to match guidelines
  [feature/editor-code-tabs] Correctly calculate end tag location
  [feature/editor-code-tabs] Allow tabs when typing code

2013-05-20 11:57:32 -05:00

..

adm

[ticket/11442] Do not suggest an option on ajax confirm box

2013-05-08 00:07:13 +02:00

assets/javascript

Merge remote-tracking branch 'remotes/cyberalien/ticket/10741' into develop

2013-05-11 20:15:53 -05:00

cache

…

config

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

2013-05-20 11:54:39 -04:00

develop

[ticket/11413] Undo editing the user_notifications table

2013-04-29 21:22:07 -05:00

docs

Merge branch 'develop-olympus' into develop

2013-05-06 22:11:33 +02:00

download

[ticket/11144] Add missing {FORUM_NAME} variable

2013-05-06 21:31:16 +02:00

files

…

images

…

includes

Merge remote-tracking branch 'remotes/upstream/develop-olympus' into develop

2013-05-20 11:55:33 -05:00

install

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

2013-05-20 11:54:39 -04:00

language

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

2013-05-20 11:54:39 -04:00

store

…

styles

Merge remote-tracking branch 'remotes/cyberalien/feature/editor-code-tabs' into develop

2013-05-20 11:57:32 -05: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/11335] Replace "$phpEx" with $phpEx

2013-04-24 20:39:24 -05:00

composer.json

Merge branch 'develop-olympus' into develop

2013-05-09 19:42:13 +02:00

composer.lock

Merge branch 'develop-olympus' into develop

2013-05-09 19:42:13 +02: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

[ticket/9975] Moved a few E_USER_ERROR errors to /language

2013-04-23 09:55:36 -07:00

memberlist.php

[ticket/11454] Use set_addresses in other applicable areas

2013-04-24 15:34:12 -05:00

posting.php

Merge branch 'develop-olympus' into develop

2013-05-06 22:11:33 +02: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