Merge branch 'master' of https://github.com/friendica/friendica

Browse source

Conflicts:
	include/config.php
	update.php

...

This commit is contained in:

Alexander Kampmann 2012-04-05 13:39:15 +02:00

parent cbf4544887 9b6e91086b

commit 355c42cb30

1809 changed files with 48790 additions and 7152 deletions

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download patch file Download diff file Expand all files Collapse all files

0

images/article.gif Executable file → Normal file

Unescape Escape View file

Side by side Swipe Overlay Before Width:  |  Height:  |  Size: 1 KiB After Width:  |  Height:  |  Size: 1 KiB

0

images/audio.gif Executable file → Normal file

Unescape Escape View file

Side by side Swipe Overlay Before Width:  |  Height:  |  Size: 559 B After Width:  |  Height:  |  Size: 559 B

0

images/b_block.gif Executable file → Normal file

Unescape Escape View file

Side by side Swipe Overlay Before Width:  |  Height:  |  Size: 83 B After Width:  |  Height:  |  Size: 83 B

0

images/b_drop.gif Executable file → Normal file

Unescape Escape View file

Side by side Swipe Overlay Before Width:  |  Height:  |  Size: 138 B After Width:  |  Height:  |  Size: 138 B

0

images/b_drop.png Executable file → Normal file

Unescape Escape View file

Side by side Swipe Overlay Before Width:  |  Height:  |  Size: 311 B After Width:  |  Height:  |  Size: 311 B

0

images/b_drophide.gif Executable file → Normal file

Unescape Escape View file

Side by side Swipe Overlay Before Width:  |  Height:  |  Size: 111 B After Width:  |  Height:  |  Size: 111 B

0

images/b_dropshow.gif Executable file → Normal file

Unescape Escape View file

Side by side Swipe Overlay Before Width:  |  Height:  |  Size: 138 B After Width:  |  Height:  |  Size: 138 B

0

images/b_edit.gif Executable file → Normal file

Unescape Escape View file

Side by side Swipe Overlay Before Width:  |  Height:  |  Size: 311 B After Width:  |  Height:  |  Size: 311 B

0

images/b_edit.png Executable file → Normal file

Unescape Escape View file

Side by side Swipe Overlay Before Width:  |  Height:  |  Size: 451 B After Width:  |  Height:  |  Size: 451 B

BIN

images/blank.png Normal file

View file

Binary file not shown.

Side by side After Width:  |  Height:  |  Size: 1.3 KiB

0

images/calendar.png Executable file → Normal file

Unescape Escape View file

Side by side Swipe Overlay Before Width:  |  Height:  |  Size: 853 B After Width:  |  Height:  |  Size: 853 B

0

images/camera-icon.gif Executable file → Normal file

Unescape Escape View file

Side by side Swipe Overlay Before Width:  |  Height:  |  Size: 1,015 B After Width:  |  Height:  |  Size: 1,015 B

0

images/connect-bg.png Executable file → Normal file

Unescape Escape View file

Side by side Swipe Overlay Before Width:  |  Height:  |  Size: 689 B After Width:  |  Height:  |  Size: 689 B

0

images/content-types.png Executable file → Normal file

Unescape Escape View file

Side by side Swipe Overlay Before Width:  |  Height:  |  Size: 3.8 KiB After Width:  |  Height:  |  Size: 3.8 KiB

0

images/default-group-mm.png Executable file → Normal file

Unescape Escape View file

Side by side Swipe Overlay Before Width:  |  Height:  |  Size: 598 B After Width:  |  Height:  |  Size: 598 B

0

images/default-profile-mm.jpg Executable file → Normal file

Unescape Escape View file

Side by side Swipe Overlay Before Width:  |  Height:  |  Size: 322 B After Width:  |  Height:  |  Size: 322 B

0

images/default-profile-sm.jpg Executable file → Normal file

Unescape Escape View file

Side by side Swipe Overlay Before Width:  |  Height:  |  Size: 346 B After Width:  |  Height:  |  Size: 346 B

0

images/default-profile.jpg Executable file → Normal file

Unescape Escape View file

Side by side Swipe Overlay Before Width:  |  Height:  |  Size: 490 B After Width:  |  Height:  |  Size: 490 B

0

images/diaspora.png Executable file → Normal file

Unescape Escape View file

Side by side Swipe Overlay Before Width:  |  Height:  |  Size: 461 B After Width:  |  Height:  |  Size: 461 B

0

images/dislike.gif Executable file → Normal file

Unescape Escape View file

Side by side Swipe Overlay Before Width:  |  Height:  |  Size: 119 B After Width:  |  Height:  |  Size: 119 B

0

images/document.gif Executable file → Normal file

Unescape Escape View file

Side by side Swipe Overlay Before Width:  |  Height:  |  Size: 1.3 KiB After Width:  |  Height:  |  Size: 1.3 KiB

0

images/ff-128.jpg Executable file → Normal file

Unescape Escape View file

Side by side Swipe Overlay Before Width:  |  Height:  |  Size: 4.4 KiB After Width:  |  Height:  |  Size: 4.4 KiB

0

images/ff-16.jpg Executable file → Normal file

Unescape Escape View file

Side by side Swipe Overlay Before Width:  |  Height:  |  Size: 644 B After Width:  |  Height:  |  Size: 644 B

0

images/ff-256.jpg Executable file → Normal file

Unescape Escape View file

Side by side Swipe Overlay Before Width:  |  Height:  |  Size: 2.7 KiB After Width:  |  Height:  |  Size: 2.7 KiB

0

images/ff-32.jpg Executable file → Normal file

Unescape Escape View file

Side by side Swipe Overlay Before Width:  |  Height:  |  Size: 1.6 KiB After Width:  |  Height:  |  Size: 1.6 KiB

0

images/ff-64.jpg Executable file → Normal file

Unescape Escape View file

Side by side Swipe Overlay Before Width:  |  Height:  |  Size: 2.8 KiB After Width:  |  Height:  |  Size: 2.8 KiB

0

images/ff.xcf Executable file → Normal file

Unescape Escape View file

0

images/friendica-128.jpg Executable file → Normal file

Unescape Escape View file

Side by side Swipe Overlay Before Width:  |  Height:  |  Size: 8.2 KiB After Width:  |  Height:  |  Size: 8.2 KiB

0

images/friendica-128.png Executable file → Normal file

Unescape Escape View file

Side by side Swipe Overlay Before Width:  |  Height:  |  Size: 6.3 KiB After Width:  |  Height:  |  Size: 6.3 KiB

0

images/friendica-16.jpg Executable file → Normal file

Unescape Escape View file

Side by side Swipe Overlay Before Width:  |  Height:  |  Size: 659 B After Width:  |  Height:  |  Size: 659 B

0

images/friendica-16.png Executable file → Normal file

Unescape Escape View file

Side by side Swipe Overlay Before Width:  |  Height:  |  Size: 756 B After Width:  |  Height:  |  Size: 756 B

0

images/friendica-1600.png Executable file → Normal file

Unescape Escape View file

Side by side Swipe Overlay Before Width:  |  Height:  |  Size: 280 KiB After Width:  |  Height:  |  Size: 280 KiB

0

images/friendica-256.jpg Executable file → Normal file

Unescape Escape View file

Side by side Swipe Overlay Before Width:  |  Height:  |  Size: 17 KiB After Width:  |  Height:  |  Size: 17 KiB

0

images/friendica-256.png Executable file → Normal file

Unescape Escape View file

Side by side Swipe Overlay Before Width:  |  Height:  |  Size: 10 KiB After Width:  |  Height:  |  Size: 10 KiB

0

images/friendica-32.jpg Executable file → Normal file

Unescape Escape View file

Side by side Swipe Overlay Before Width:  |  Height:  |  Size: 1.5 KiB After Width:  |  Height:  |  Size: 1.5 KiB

0

images/friendica-32.png Executable file → Normal file

Unescape Escape View file

Side by side Swipe Overlay Before Width:  |  Height:  |  Size: 1.6 KiB After Width:  |  Height:  |  Size: 1.6 KiB

0

images/friendica-48.png Executable file → Normal file

Unescape Escape View file

Side by side Swipe Overlay Before Width:  |  Height:  |  Size: 2.3 KiB After Width:  |  Height:  |  Size: 2.3 KiB

0

images/friendica-64.jpg Executable file → Normal file

Unescape Escape View file

Side by side Swipe Overlay Before Width:  |  Height:  |  Size: 3.4 KiB After Width:  |  Height:  |  Size: 3.4 KiB

0

images/friendica-64.png Executable file → Normal file

Unescape Escape View file

Side by side Swipe Overlay Before Width:  |  Height:  |  Size: 3.2 KiB After Width:  |  Height:  |  Size: 3.2 KiB

0

images/friendica-96.png Executable file → Normal file

Unescape Escape View file

Side by side Swipe Overlay Before Width:  |  Height:  |  Size: 5.4 KiB After Width:  |  Height:  |  Size: 5.4 KiB

0

images/friendica.svg Executable file → Normal file

Unescape Escape View file

Side by side Swipe Overlay Before Width:  |  Height:  |  Size: 7.2 KiB After Width:  |  Height:  |  Size: 7.2 KiB

0

images/friendika-128.jpg Executable file → Normal file

Unescape Escape View file

Side by side Swipe Overlay Before Width:  |  Height:  |  Size: 8.2 KiB After Width:  |  Height:  |  Size: 8.2 KiB

0

images/friendika-128.png Executable file → Normal file

Unescape Escape View file

Side by side Swipe Overlay Before Width:  |  Height:  |  Size: 6.3 KiB After Width:  |  Height:  |  Size: 6.3 KiB

0

images/friendika-16.jpg Executable file → Normal file

Unescape Escape View file

Side by side Swipe Overlay Before Width:  |  Height:  |  Size: 659 B After Width:  |  Height:  |  Size: 659 B

0

images/friendika-16.png Executable file → Normal file

Unescape Escape View file

Side by side Swipe Overlay Before Width:  |  Height:  |  Size: 756 B After Width:  |  Height:  |  Size: 756 B

0

images/friendika-1600.png Executable file → Normal file

Unescape Escape View file

Side by side Swipe Overlay Before Width:  |  Height:  |  Size: 280 KiB After Width:  |  Height:  |  Size: 280 KiB

0

images/friendika-256.jpg Executable file → Normal file

Unescape Escape View file

Side by side Swipe Overlay Before Width:  |  Height:  |  Size: 17 KiB After Width:  |  Height:  |  Size: 17 KiB

0

images/friendika-256.png Executable file → Normal file

Unescape Escape View file

Side by side Swipe Overlay Before Width:  |  Height:  |  Size: 10 KiB After Width:  |  Height:  |  Size: 10 KiB

0

images/friendika-32.jpg Executable file → Normal file

Unescape Escape View file

Side by side Swipe Overlay Before Width:  |  Height:  |  Size: 1.5 KiB After Width:  |  Height:  |  Size: 1.5 KiB

0

images/friendika-32.png Executable file → Normal file

Unescape Escape View file

Side by side Swipe Overlay Before Width:  |  Height:  |  Size: 1.6 KiB After Width:  |  Height:  |  Size: 1.6 KiB

0

images/friendika-48.png Executable file → Normal file

Unescape Escape View file

Side by side Swipe Overlay Before Width:  |  Height:  |  Size: 2.3 KiB After Width:  |  Height:  |  Size: 2.3 KiB

0

images/friendika-64.jpg Executable file → Normal file

Unescape Escape View file

Side by side Swipe Overlay Before Width:  |  Height:  |  Size: 3.4 KiB After Width:  |  Height:  |  Size: 3.4 KiB

0

images/friendika-64.png Executable file → Normal file

Unescape Escape View file

Side by side Swipe Overlay Before Width:  |  Height:  |  Size: 3.2 KiB After Width:  |  Height:  |  Size: 3.2 KiB

0

images/friendika-96.png Executable file → Normal file

Unescape Escape View file

Side by side Swipe Overlay Before Width:  |  Height:  |  Size: 5.4 KiB After Width:  |  Height:  |  Size: 5.4 KiB

0

images/friendika.svg Executable file → Normal file

Unescape Escape View file

Side by side Swipe Overlay Before Width:  |  Height:  |  Size: 7.2 KiB After Width:  |  Height:  |  Size: 7.2 KiB

0

images/globe.gif Executable file → Normal file

Unescape Escape View file

Side by side Swipe Overlay Before Width:  |  Height:  |  Size: 1 KiB After Width:  |  Height:  |  Size: 1 KiB

0

images/hide_off.png Executable file → Normal file

Unescape Escape View file

Side by side Swipe Overlay Before Width:  |  Height:  |  Size: 281 B After Width:  |  Height:  |  Size: 281 B

0

images/hide_on.png Executable file → Normal file

Unescape Escape View file

Side by side Swipe Overlay Before Width:  |  Height:  |  Size: 277 B After Width:  |  Height:  |  Size: 277 B

0

images/icons.png Executable file → Normal file

Unescape Escape View file

Side by side Swipe Overlay Before Width:  |  Height:  |  Size: 12 KiB After Width:  |  Height:  |  Size: 12 KiB

0

images/icons/10/add.png Executable file → Normal file

Unescape Escape View file

Side by side Swipe Overlay Before Width:  |  Height:  |  Size: 2.9 KiB After Width:  |  Height:  |  Size: 2.9 KiB

0

images/icons/10/delete.png Executable file → Normal file

Unescape Escape View file

Side by side Swipe Overlay Before Width:  |  Height:  |  Size: 2.9 KiB After Width:  |  Height:  |  Size: 2.9 KiB

0

images/icons/10/edit.png Executable file → Normal file

Unescape Escape View file

Side by side Swipe Overlay Before Width:  |  Height:  |  Size: 2.9 KiB After Width:  |  Height:  |  Size: 2.9 KiB

0

images/icons/10/feed.png Executable file → Normal file

Unescape Escape View file

Side by side Swipe Overlay Before Width:  |  Height:  |  Size: 535 B After Width:  |  Height:  |  Size: 535 B

0

images/icons/10/gear.png Executable file → Normal file

Unescape Escape View file

Side by side Swipe Overlay Before Width:  |  Height:  |  Size: 3 KiB After Width:  |  Height:  |  Size: 3 KiB

0

images/icons/10/group.png Executable file → Normal file

Unescape Escape View file

Side by side Swipe Overlay Before Width:  |  Height:  |  Size: 543 B After Width:  |  Height:  |  Size: 543 B

0

images/icons/10/info.png Executable file → Normal file

Unescape Escape View file

Side by side Swipe Overlay Before Width:  |  Height:  |  Size: 488 B After Width:  |  Height:  |  Size: 488 B

0

images/icons/10/link.png Executable file → Normal file

Unescape Escape View file

Side by side Swipe Overlay Before Width:  |  Height:  |  Size: 410 B After Width:  |  Height:  |  Size: 410 B

0

images/icons/10/lock.png Executable file → Normal file

Unescape Escape View file

Side by side Swipe Overlay Before Width:  |  Height:  |  Size: 463 B After Width:  |  Height:  |  Size: 463 B

0

images/icons/10/menu.png Executable file → Normal file

Unescape Escape View file

Side by side Swipe Overlay Before Width:  |  Height:  |  Size: 2.9 KiB After Width:  |  Height:  |  Size: 2.9 KiB

0

images/icons/10/notice.png Executable file → Normal file

Unescape Escape View file

Side by side Swipe Overlay Before Width:  |  Height:  |  Size: 471 B After Width:  |  Height:  |  Size: 471 B

0

images/icons/10/notify_off.png Executable file → Normal file

Unescape Escape View file

Side by side Swipe Overlay Before Width:  |  Height:  |  Size: 478 B After Width:  |  Height:  |  Size: 478 B

0

images/icons/10/notify_on.png Executable file → Normal file

Unescape Escape View file

Side by side Swipe Overlay Before Width:  |  Height:  |  Size: 369 B After Width:  |  Height:  |  Size: 369 B

0

images/icons/10/play.png Executable file → Normal file

Unescape Escape View file

Side by side Swipe Overlay Before Width:  |  Height:  |  Size: 420 B After Width:  |  Height:  |  Size: 420 B

0

images/icons/10/plugin.png Executable file → Normal file

Unescape Escape View file

Side by side Swipe Overlay Before Width:  |  Height:  |  Size: 471 B After Width:  |  Height:  |  Size: 471 B

0

images/icons/10/star.png Executable file → Normal file

Unescape Escape View file

Side by side Swipe Overlay Before Width:  |  Height:  |  Size: 3.2 KiB After Width:  |  Height:  |  Size: 3.2 KiB

0

images/icons/10/unlock.png Executable file → Normal file

Unescape Escape View file

Side by side Swipe Overlay Before Width:  |  Height:  |  Size: 398 B After Width:  |  Height:  |  Size: 398 B

0

images/icons/10/user.png Executable file → Normal file

Unescape Escape View file

Side by side Swipe Overlay Before Width:  |  Height:  |  Size: 534 B After Width:  |  Height:  |  Size: 534 B

0

images/icons/16/add.png Executable file → Normal file

Unescape Escape View file

Side by side Swipe Overlay Before Width:  |  Height:  |  Size: 3 KiB After Width:  |  Height:  |  Size: 3 KiB

0

images/icons/16/delete.png Executable file → Normal file

Unescape Escape View file

Side by side Swipe Overlay Before Width:  |  Height:  |  Size: 3.1 KiB After Width:  |  Height:  |  Size: 3.1 KiB

0

images/icons/16/edit.png Executable file → Normal file

Unescape Escape View file

Side by side Swipe Overlay Before Width:  |  Height:  |  Size: 3.1 KiB After Width:  |  Height:  |  Size: 3.1 KiB

0

images/icons/16/feed.png Executable file → Normal file

Unescape Escape View file

Side by side Swipe Overlay Before Width:  |  Height:  |  Size: 828 B After Width:  |  Height:  |  Size: 828 B

0

images/icons/16/gear.png Executable file → Normal file

Unescape Escape View file

Side by side Swipe Overlay Before Width:  |  Height:  |  Size: 3.1 KiB After Width:  |  Height:  |  Size: 3.1 KiB

0

images/icons/16/group.png Executable file → Normal file

Unescape Escape View file

Side by side Swipe Overlay Before Width:  |  Height:  |  Size: 852 B After Width:  |  Height:  |  Size: 852 B

0

images/icons/16/info.png Executable file → Normal file

Unescape Escape View file

Side by side Swipe Overlay Before Width:  |  Height:  |  Size: 854 B After Width:  |  Height:  |  Size: 854 B

0

images/icons/16/link.png Executable file → Normal file

Unescape Escape View file

Side by side Swipe Overlay Before Width:  |  Height:  |  Size: 579 B After Width:  |  Height:  |  Size: 579 B

0

images/icons/16/lock.png Executable file → Normal file

Unescape Escape View file

Side by side Swipe Overlay Before Width:  |  Height:  |  Size: 593 B After Width:  |  Height:  |  Size: 593 B

0

images/icons/16/menu.png Executable file → Normal file

Unescape Escape View file

Side by side Swipe Overlay Before Width:  |  Height:  |  Size: 3.2 KiB After Width:  |  Height:  |  Size: 3.2 KiB

0

images/icons/16/notice.png Executable file → Normal file

Unescape Escape View file

Side by side Swipe Overlay Before Width:  |  Height:  |  Size: 591 B After Width:  |  Height:  |  Size: 591 B

0

images/icons/16/notify_off.png Executable file → Normal file

Unescape Escape View file

Side by side Swipe Overlay Before Width:  |  Height:  |  Size: 835 B After Width:  |  Height:  |  Size: 835 B

0

images/icons/16/notify_on.png Executable file → Normal file

Unescape Escape View file

Side by side Swipe Overlay Before Width:  |  Height:  |  Size: 542 B After Width:  |  Height:  |  Size: 542 B

0

images/icons/16/play.png Executable file → Normal file

Unescape Escape View file

Side by side Swipe Overlay Before Width:  |  Height:  |  Size: 508 B After Width:  |  Height:  |  Size: 508 B

0

images/icons/16/plugin.png Executable file → Normal file

Unescape Escape View file

Side by side Swipe Overlay Before Width:  |  Height:  |  Size: 649 B After Width:  |  Height:  |  Size: 649 B

0

images/icons/16/star.png Executable file → Normal file

Unescape Escape View file

Side by side Swipe Overlay Before Width:  |  Height:  |  Size: 3.4 KiB After Width:  |  Height:  |  Size: 3.4 KiB

0

images/icons/16/unlock.png Executable file → Normal file

Unescape Escape View file

Side by side Swipe Overlay Before Width:  |  Height:  |  Size: 547 B After Width:  |  Height:  |  Size: 547 B

0

images/icons/16/user.png Executable file → Normal file

Unescape Escape View file

Side by side Swipe Overlay Before Width:  |  Height:  |  Size: 794 B After Width:  |  Height:  |  Size: 794 B

0

images/icons/22/add.png Executable file → Normal file

Unescape Escape View file

Side by side Swipe Overlay Before Width:  |  Height:  |  Size: 3.1 KiB After Width:  |  Height:  |  Size: 3.1 KiB

0

images/icons/22/delete.png Executable file → Normal file

Unescape Escape View file

Side by side Swipe Overlay Before Width:  |  Height:  |  Size: 3.2 KiB After Width:  |  Height:  |  Size: 3.2 KiB

0

images/icons/22/edit.png Executable file → Normal file

Unescape Escape View file

Side by side Swipe Overlay Before Width:  |  Height:  |  Size: 3.2 KiB After Width:  |  Height:  |  Size: 3.2 KiB

0

images/icons/22/feed.png Executable file → Normal file

Unescape Escape View file

Side by side Swipe Overlay Before Width:  |  Height:  |  Size: 1.1 KiB After Width:  |  Height:  |  Size: 1.1 KiB

0

images/icons/22/gear.png Executable file → Normal file

Unescape Escape View file

Side by side Swipe Overlay Before Width:  |  Height:  |  Size: 3.3 KiB After Width:  |  Height:  |  Size: 3.3 KiB

Some files were not shown because too many files have changed in this diff Show more