Nils Adermann fb34a7aa64 Merge remote-tracking branch 'github-exreaction/ticket/7598' into develop ...

* github-exreaction/ticket/7598:
  [ticket/7598] Use $user->lang['COMMA_SEPARATOR']
  [ticket/7598] Inactive users action notification (ACP)

2012-07-17 20:32:07 +02:00

..

adm

Merge branch 'develop-olympus' into develop

2012-07-01 00:20:04 +02:00

assets/javascript

[ticket/10811] Make toogle_subscribe more generic so it can toogle all links

2012-07-05 01:03:19 +02:00

cache

…

develop

Merge branch 'develop-olympus' into develop

2012-06-28 23:11:08 +02:00

docs

Merge branch 'develop-olympus' into develop

2012-06-20 10:31:35 +02:00

download

[feature/event-dispatcher] Add missing dispatcher to file.php

2012-03-28 21:45:21 +02:00

files

…

images

…

includes

Merge remote-tracking branch 'github-exreaction/ticket/7598' into develop

2012-07-17 20:32:07 +02:00

install

Merge PR #856 branch 'develop-olympus' into develop

2012-07-07 16:43:30 -04:00

language

Merge PR #854 branch 'dhruvgoel92/ticket/10943' into develop

2012-07-07 21:30:42 -04:00

store

…

styles

Merge branch 'develop-olympus' into develop

2012-07-12 18:19:58 +02:00

.htaccess

…

common.php

[ticket/10756] Renaming phpbb_style_template to phpbb_template

2012-04-19 04:25:25 +02:00

composer.json

[feature/event-dispatcher] Use real EventDispatcher through composer

2012-03-11 15:15:33 +01:00

composer.lock

[feature/event-dispatcher] Use real EventDispatcher through composer

2012-03-11 15:15:33 +01:00

cron.php

[ticket/9916] Updating header license and removing Version $Id$

2011-12-31 13:32:52 +00:00

faq.php

[ticket/9916] Updating header license and removing Version $Id$

2011-12-31 13:32:52 +00:00

feed.php

[ticket/10672] Fix total post count language string in statistics and feed

2012-02-27 19:13:31 +01:00

index.php

[ticket/10586] Moved some loading stuff below extension controller, updated tests

2012-03-28 16:48:16 -04:00

mcp.php

[ticket/9916] Updating header license and removing Version $Id$

2011-12-31 13:32:52 +00:00

memberlist.php

Merge branch 'develop-olympus' into develop

2012-04-03 20:57:31 -04:00

posting.php

[feature/qrpreview] Do not error or show preview if no text is entered

2012-03-31 15:52:16 -04:00

report.php

[feature/save-post-on-report] Changed the name of the column

2012-03-19 08:27:32 -04:00

search.php

Merge PR #854 branch 'dhruvgoel92/ticket/10943' into develop

2012-07-07 21:30:42 -04:00

ucp.php

[ticket/9916] Updating header license and removing Version $Id$

2011-12-31 13:32:52 +00:00

viewforum.php

[ticket/10811] Make toogle_subscribe more generic so it can toogle all links

2012-07-05 01:03:19 +02:00

viewonline.php

[ticket/9916] Updating header license and removing Version $Id$

2011-12-31 13:32:52 +00:00

viewtopic.php

Merge PR #759 branch 'nickvergessen/ticket/10811' into develop

2012-07-05 10:44:48 -04:00

web.config

…