Oleg Pudeyev 03d3f9adb5 Merge PR #785 branch 'develop-olympus' into develop ...

* develop-olympus:
  [ticket/10835] changing "e-mail" to "email"
  [ticket/10835] changing CURRENT_CHANGE_PASSWORD_EXPLAIN language entry
  [ticket/10835] fixing misleading message in UCP

Conflicts:
	phpBB/language/en/ucp.php

2012-05-11 02:37:25 -04:00

..

adm

Merge branch 'develop-olympus' into develop

2012-05-06 18:39:32 +02:00

assets/javascript

[ticket/10784] Do not show ajax overlay unless needed

2012-04-12 21:03:47 +02:00

cache

…

develop

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

2012-05-10 14:43:14 -04:00

docs

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

2012-05-10 15:58:55 -04:00

download

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

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

files

…

images

…

includes

Merge branch 'develop-olympus' into develop

2012-05-09 12:55:58 +02:00

install

[ticket/10818] Global Announcements Update Dialog should call exit_handler()

2012-05-02 21:12:18 +02:00

language

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

2012-05-11 02:37:25 -04:00

store

…

styles

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

2012-05-11 02:37:25 -04: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 branch 'develop-olympus' into develop

2012-02-26 15:47:16 +01:00

ucp.php

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

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

viewforum.php

Merge branch 'develop-olympus' into develop

2012-02-11 05:48:03 -05:00

viewonline.php

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

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

viewtopic.php

[ticket/10847] fixing all misspelled "dependant" to "dependent"

2012-04-30 21:55:24 +02:00

web.config

…