Andreas Fischer bc98118f92 Merge branch 'develop-olympus' into develop ...

* develop-olympus:
  [ticket/12146] Added a missing # to inline css-style of <span>

Conflicts:
	phpBB/styles/prosilver/template/ucp_groups_manage.html

2014-02-02 17:20:07 +01:00

..

adm

[ticket/12125] Specify nth-child selectors separately - IE8 does not like them

2014-01-24 04:30:14 -08:00

assets

Merge remote-tracking branch 'prototech/ticket/12135' into develop

2014-02-02 13:39:44 +01:00

bin

…

cache

…

config

Merge remote-tracking branch 'github-nickvergessen/ticket/11201' into develop

2014-02-02 16:34:55 +01:00

develop

…

docs

Merge branch 'develop-olympus' into develop

2014-01-23 14:13:34 -08:00

download

…

files

…

images

…

includes

Merge remote-tracking branch 'github-nickvergessen/ticket/11201' into develop

2014-02-02 16:34:55 +01:00

install

Merge remote-tracking branch 'github-nickvergessen/ticket/11201' into develop

2014-02-02 16:34:55 +01:00

language

[ticket/11915] Remove unused language string.

2014-01-17 19:20:37 -08:00

phpbb

Merge remote-tracking branch 'github-nickvergessen/ticket/11201' into develop

2014-02-02 16:34:55 +01:00

store

…

styles

Merge branch 'develop-olympus' into develop

2014-02-02 17:20:07 +01:00

.htaccess

…

app.php

…

common.php

…

composer.json

…

composer.lock

…

cron.php

…

faq.php

…

feed.php

…

index.php

Adding 'forgot password' link to index page

2014-01-22 12:42:33 +05:30

mcp.php

…

memberlist.php

[ticket/11201] Rename profilefields class to manager

2014-02-02 12:53:29 +01:00

posting.php

[ticket/11915] Pass the data to the template instead of scraping HTML for it.

2014-01-17 19:25:12 -08:00

report.php

…

search.php

[ticket/11849] Update search and memberlist

2013-12-18 18:35:47 +01:00

ucp.php

…

viewforum.php

[ticket/12104] Update the event's doc block to reflect new variable

2014-01-09 15:48:32 -08:00

viewonline.php

[ticket/11849] Update pagination in viewonline.php

2013-12-18 18:35:40 +01:00

viewtopic.php

[ticket/11201] Rename profilefields class to manager

2014-02-02 12:53:29 +01:00

web.config

…