Andreas Fischer a1e31f4389 Merge branch 'ticket/12582' into ticket/12582-ascraeus ...

* ticket/12582:
  [ticket/12582] Strip away copyrighted ICC profile
  [ticket/12582] Change strip_icc_profiles.sh to only take a single file.
  [ticket/12582] Run strip_icc_profiles.sh on Travis CI.
  [ticket/12582] Overwrite inplace instead of creating _original files.
  [ticket/12582] Add script for strippping ICC profiles from images.

Conflicts:
	.travis.yml

2014-05-27 20:38:20 +02:00

..

adm

Merge branch 'ticket/12582' into ticket/12582-ascraeus

2014-05-27 20:38:20 +02:00

assets

[ticket/12155] Make the buttons bigger on touch devices.

2014-05-27 07:17:47 -07:00

bin

…

cache

…

config

[ticket/12600] Add @log to the dependencies of extension:show

2014-05-27 15:35:10 +02:00

develop

Merge branch 'ticket/12582' into ticket/12582-ascraeus

2014-05-27 20:38:20 +02:00

docs

[ticket/12603] Remove hook system documentation.

2014-05-27 09:28:23 -07:00

download

…

ext

[ticket/11163] Add ext/index.htm

2014-05-15 14:11:11 +02:00

files

…

images

…

includes

Merge pull request #2440 from nickvergessen/ticket/12527

2014-05-27 17:34:50 +02:00

install

[ticket/12547] Rename jquery.js to jquery.min.js in assets directory

2014-05-15 01:18:26 +03:00

language

Merge pull request #2440 from nickvergessen/ticket/12527

2014-05-27 17:34:50 +02:00

phpbb

[ticket/12570] Keep MySQLi procedural

2014-05-26 21:43:40 +02:00

store

…

styles

[ticket/12155] Remove use of !important and move reddish color back to .button

2014-05-27 07:35:49 -07:00

.htaccess

…

app.php

…

common.php

[ticket/12576] Remove cron from common.php

2014-05-22 12:45:03 +02:00

composer.json

Merge branch 'task/sami' into task/sami-ascraeus

2014-05-16 18:13:45 +02:00

composer.lock

Merge branch 'task/sami' into task/sami-ascraeus

2014-05-16 18:13:45 +02:00

cron.php

[ticket/12576] Retrieve the cron_manager in cron.php if needed

2014-05-22 13:47:37 +02:00

faq.php

…

feed.php

…

index.php

…

mcp.php

…

memberlist.php

Merge pull request #2468 from nickvergessen/ticket/12555

2014-05-23 03:06:42 +02:00

posting.php

[ticket/12518] Apply De Morgan to make the conditions easier to read

2014-05-11 22:52:09 +02:00

report.php

…

search.php

Merge pull request #2437 from rxu/ticket/12524

2014-05-11 10:42:46 +02:00

ucp.php

…

viewforum.php

[ticket/12555] Add canonical URL for viewforum

2014-05-16 11:34:04 +02:00

viewonline.php

…

viewtopic.php

[ticket/12555] Add canonical URL for viewtopic

2014-05-16 11:38:37 +02:00

web.config

…