Merge commit 'upstream/master'
0
.gitignore
vendored
Executable file → Normal file
0
INSTALL.txt
Executable file → Normal file
4
boot.php
Executable file → Normal file
|
@ -9,9 +9,9 @@ require_once('include/nav.php');
|
|||
require_once('include/cache.php');
|
||||
|
||||
define ( 'FRIENDICA_PLATFORM', 'Friendica');
|
||||
define ( 'FRIENDICA_VERSION', '2.3.1302' );
|
||||
define ( 'FRIENDICA_VERSION', '2.3.1304' );
|
||||
define ( 'DFRN_PROTOCOL_VERSION', '2.23' );
|
||||
define ( 'DB_UPDATE_VERSION', 1134 );
|
||||
define ( 'DB_UPDATE_VERSION', 1137 );
|
||||
|
||||
define ( 'EOL', "<br />\r\n" );
|
||||
define ( 'ATOM_TIME', 'Y-m-d\TH:i:s\Z' );
|
||||
|
|
14
database.sql
Executable file → Normal file
|
@ -34,10 +34,11 @@ CREATE TABLE IF NOT EXISTS `challenge` (
|
|||
|
||||
CREATE TABLE IF NOT EXISTS `config` (
|
||||
`id` int(10) unsigned NOT NULL AUTO_INCREMENT,
|
||||
`cat` char(255) NOT NULL,
|
||||
`k` char(255) NOT NULL,
|
||||
`cat` char(255) CHARACTER SET ascii COLLATE ascii_general_ci NOT NULL,
|
||||
`k` char(255) CHARACTER SET ascii COLLATE ascii_general_ci NOT NULL,
|
||||
`v` text NOT NULL,
|
||||
PRIMARY KEY (`id`)
|
||||
PRIMARY KEY (`id`),
|
||||
UNIQUE KEY `access`(`cat`,`k`)
|
||||
) ENGINE=MyISAM DEFAULT CHARSET=utf8;
|
||||
|
||||
|
||||
|
@ -542,9 +543,10 @@ INDEX ( `batch` )
|
|||
CREATE TABLE IF NOT EXISTS `pconfig` (
|
||||
`id` INT NOT NULL AUTO_INCREMENT PRIMARY KEY ,
|
||||
`uid` INT NOT NULL DEFAULT '0',
|
||||
`cat` CHAR( 255 ) NOT NULL ,
|
||||
`k` CHAR( 255 ) NOT NULL ,
|
||||
`v` MEDIUMTEXT NOT NULL
|
||||
`cat` CHAR( 255 ) CHARACTER SET ascii COLLATE ascii_general_ci NOT NULL ,
|
||||
`k` CHAR( 255 ) CHARACTER SET ascii COLLATE ascii_general_ci NOT NULL ,
|
||||
`v` MEDIUMTEXT NOT NULL,
|
||||
UNIQUE KEY `access`(`cat`, `k`)
|
||||
) ENGINE = MyISAM DEFAULT CHARSET=utf8;
|
||||
|
||||
|
||||
|
|
0
doc/Account-Basics.md
Executable file → Normal file
0
doc/Bugs-and-Issues.md
Executable file → Normal file
0
doc/Connectors.md
Executable file → Normal file
0
doc/Developers.md
Executable file → Normal file
0
doc/Home.md
Executable file → Normal file
0
doc/Install.md
Executable file → Normal file
0
doc/Installing-Connectors.md
Executable file → Normal file
0
doc/Making-Friends.md
Executable file → Normal file
0
doc/Message-Flow.md
Executable file → Normal file
0
doc/Pages.md
Executable file → Normal file
0
doc/Plugins.md
Executable file → Normal file
0
doc/Profiles.md
Executable file → Normal file
0
doc/Remove-Account.md
Executable file → Normal file
0
doc/Settings.md
Executable file → Normal file
0
doc/Tags-and-Mentions.md
Executable file → Normal file
0
htconfig.php
Executable file → Normal file
0
images/article.gif
Executable file → Normal file
Before Width: | Height: | Size: 1 KiB After Width: | Height: | Size: 1 KiB |
0
images/audio.gif
Executable file → Normal file
Before Width: | Height: | Size: 559 B After Width: | Height: | Size: 559 B |
0
images/b_block.gif
Executable file → Normal file
Before Width: | Height: | Size: 83 B After Width: | Height: | Size: 83 B |
0
images/b_drop.gif
Executable file → Normal file
Before Width: | Height: | Size: 138 B After Width: | Height: | Size: 138 B |
0
images/b_drop.png
Executable file → Normal file
Before Width: | Height: | Size: 311 B After Width: | Height: | Size: 311 B |
0
images/b_drophide.gif
Executable file → Normal file
Before Width: | Height: | Size: 111 B After Width: | Height: | Size: 111 B |
0
images/b_dropshow.gif
Executable file → Normal file
Before Width: | Height: | Size: 138 B After Width: | Height: | Size: 138 B |
0
images/b_edit.gif
Executable file → Normal file
Before Width: | Height: | Size: 311 B After Width: | Height: | Size: 311 B |
0
images/b_edit.png
Executable file → Normal file
Before Width: | Height: | Size: 451 B After Width: | Height: | Size: 451 B |
0
images/calendar.png
Executable file → Normal file
Before Width: | Height: | Size: 853 B After Width: | Height: | Size: 853 B |
0
images/camera-icon.gif
Executable file → Normal file
Before Width: | Height: | Size: 1,015 B After Width: | Height: | Size: 1,015 B |
0
images/connect-bg.png
Executable file → Normal file
Before Width: | Height: | Size: 689 B After Width: | Height: | Size: 689 B |
0
images/content-types.png
Executable file → Normal file
Before Width: | Height: | Size: 3.8 KiB After Width: | Height: | Size: 3.8 KiB |
0
images/default-group-mm.png
Executable file → Normal file
Before Width: | Height: | Size: 598 B After Width: | Height: | Size: 598 B |
0
images/default-profile-mm.jpg
Executable file → Normal file
Before Width: | Height: | Size: 322 B After Width: | Height: | Size: 322 B |
0
images/default-profile-sm.jpg
Executable file → Normal file
Before Width: | Height: | Size: 346 B After Width: | Height: | Size: 346 B |
0
images/default-profile.jpg
Executable file → Normal file
Before Width: | Height: | Size: 490 B After Width: | Height: | Size: 490 B |
0
images/diaspora.png
Executable file → Normal file
Before Width: | Height: | Size: 461 B After Width: | Height: | Size: 461 B |
0
images/dislike.gif
Executable file → Normal file
Before Width: | Height: | Size: 119 B After Width: | Height: | Size: 119 B |
0
images/document.gif
Executable file → Normal file
Before Width: | Height: | Size: 1.3 KiB After Width: | Height: | Size: 1.3 KiB |
0
images/ff-128.jpg
Executable file → Normal file
Before Width: | Height: | Size: 4.4 KiB After Width: | Height: | Size: 4.4 KiB |
0
images/ff-16.jpg
Executable file → Normal file
Before Width: | Height: | Size: 644 B After Width: | Height: | Size: 644 B |
0
images/ff-256.jpg
Executable file → Normal file
Before Width: | Height: | Size: 2.7 KiB After Width: | Height: | Size: 2.7 KiB |
0
images/ff-32.jpg
Executable file → Normal file
Before Width: | Height: | Size: 1.6 KiB After Width: | Height: | Size: 1.6 KiB |
0
images/ff-64.jpg
Executable file → Normal file
Before Width: | Height: | Size: 2.8 KiB After Width: | Height: | Size: 2.8 KiB |
0
images/ff.xcf
Executable file → Normal file
0
images/friendica-128.jpg
Executable file → Normal file
Before Width: | Height: | Size: 8.2 KiB After Width: | Height: | Size: 8.2 KiB |
0
images/friendica-128.png
Executable file → Normal file
Before Width: | Height: | Size: 6.3 KiB After Width: | Height: | Size: 6.3 KiB |
0
images/friendica-16.jpg
Executable file → Normal file
Before Width: | Height: | Size: 659 B After Width: | Height: | Size: 659 B |
0
images/friendica-16.png
Executable file → Normal file
Before Width: | Height: | Size: 756 B After Width: | Height: | Size: 756 B |
0
images/friendica-1600.png
Executable file → Normal file
Before Width: | Height: | Size: 280 KiB After Width: | Height: | Size: 280 KiB |
0
images/friendica-256.jpg
Executable file → Normal file
Before Width: | Height: | Size: 17 KiB After Width: | Height: | Size: 17 KiB |
0
images/friendica-256.png
Executable file → Normal file
Before Width: | Height: | Size: 10 KiB After Width: | Height: | Size: 10 KiB |
0
images/friendica-32.jpg
Executable file → Normal file
Before Width: | Height: | Size: 1.5 KiB After Width: | Height: | Size: 1.5 KiB |
0
images/friendica-32.png
Executable file → Normal file
Before Width: | Height: | Size: 1.6 KiB After Width: | Height: | Size: 1.6 KiB |
0
images/friendica-48.png
Executable file → Normal file
Before Width: | Height: | Size: 2.3 KiB After Width: | Height: | Size: 2.3 KiB |
0
images/friendica-64.jpg
Executable file → Normal file
Before Width: | Height: | Size: 3.4 KiB After Width: | Height: | Size: 3.4 KiB |
0
images/friendica-64.png
Executable file → Normal file
Before Width: | Height: | Size: 3.2 KiB After Width: | Height: | Size: 3.2 KiB |
0
images/friendica-96.png
Executable file → Normal file
Before Width: | Height: | Size: 5.4 KiB After Width: | Height: | Size: 5.4 KiB |
0
images/friendica.svg
Executable file → Normal file
Before Width: | Height: | Size: 7.2 KiB After Width: | Height: | Size: 7.2 KiB |
0
images/friendika-128.jpg
Executable file → Normal file
Before Width: | Height: | Size: 8.2 KiB After Width: | Height: | Size: 8.2 KiB |
0
images/friendika-128.png
Executable file → Normal file
Before Width: | Height: | Size: 6.3 KiB After Width: | Height: | Size: 6.3 KiB |
0
images/friendika-16.jpg
Executable file → Normal file
Before Width: | Height: | Size: 659 B After Width: | Height: | Size: 659 B |
0
images/friendika-16.png
Executable file → Normal file
Before Width: | Height: | Size: 756 B After Width: | Height: | Size: 756 B |
0
images/friendika-1600.png
Executable file → Normal file
Before Width: | Height: | Size: 280 KiB After Width: | Height: | Size: 280 KiB |
0
images/friendika-256.jpg
Executable file → Normal file
Before Width: | Height: | Size: 17 KiB After Width: | Height: | Size: 17 KiB |
0
images/friendika-256.png
Executable file → Normal file
Before Width: | Height: | Size: 10 KiB After Width: | Height: | Size: 10 KiB |
0
images/friendika-32.jpg
Executable file → Normal file
Before Width: | Height: | Size: 1.5 KiB After Width: | Height: | Size: 1.5 KiB |
0
images/friendika-32.png
Executable file → Normal file
Before Width: | Height: | Size: 1.6 KiB After Width: | Height: | Size: 1.6 KiB |
0
images/friendika-48.png
Executable file → Normal file
Before Width: | Height: | Size: 2.3 KiB After Width: | Height: | Size: 2.3 KiB |
0
images/friendika-64.jpg
Executable file → Normal file
Before Width: | Height: | Size: 3.4 KiB After Width: | Height: | Size: 3.4 KiB |
0
images/friendika-64.png
Executable file → Normal file
Before Width: | Height: | Size: 3.2 KiB After Width: | Height: | Size: 3.2 KiB |
0
images/friendika-96.png
Executable file → Normal file
Before Width: | Height: | Size: 5.4 KiB After Width: | Height: | Size: 5.4 KiB |
0
images/friendika.svg
Executable file → Normal file
Before Width: | Height: | Size: 7.2 KiB After Width: | Height: | Size: 7.2 KiB |
0
images/globe.gif
Executable file → Normal file
Before Width: | Height: | Size: 1 KiB After Width: | Height: | Size: 1 KiB |
0
images/hide_off.png
Executable file → Normal file
Before Width: | Height: | Size: 281 B After Width: | Height: | Size: 281 B |
0
images/hide_on.png
Executable file → Normal file
Before Width: | Height: | Size: 277 B After Width: | Height: | Size: 277 B |
0
images/icons.png
Executable file → Normal file
Before Width: | Height: | Size: 12 KiB After Width: | Height: | Size: 12 KiB |
0
images/icons/10/add.png
Executable file → Normal file
Before Width: | Height: | Size: 2.9 KiB After Width: | Height: | Size: 2.9 KiB |
0
images/icons/10/delete.png
Executable file → Normal file
Before Width: | Height: | Size: 2.9 KiB After Width: | Height: | Size: 2.9 KiB |
0
images/icons/10/edit.png
Executable file → Normal file
Before Width: | Height: | Size: 2.9 KiB After Width: | Height: | Size: 2.9 KiB |
0
images/icons/10/feed.png
Executable file → Normal file
Before Width: | Height: | Size: 535 B After Width: | Height: | Size: 535 B |
0
images/icons/10/gear.png
Executable file → Normal file
Before Width: | Height: | Size: 3 KiB After Width: | Height: | Size: 3 KiB |
0
images/icons/10/group.png
Executable file → Normal file
Before Width: | Height: | Size: 543 B After Width: | Height: | Size: 543 B |
0
images/icons/10/info.png
Executable file → Normal file
Before Width: | Height: | Size: 488 B After Width: | Height: | Size: 488 B |
0
images/icons/10/link.png
Executable file → Normal file
Before Width: | Height: | Size: 410 B After Width: | Height: | Size: 410 B |
0
images/icons/10/lock.png
Executable file → Normal file
Before Width: | Height: | Size: 463 B After Width: | Height: | Size: 463 B |
0
images/icons/10/menu.png
Executable file → Normal file
Before Width: | Height: | Size: 2.9 KiB After Width: | Height: | Size: 2.9 KiB |
0
images/icons/10/notice.png
Executable file → Normal file
Before Width: | Height: | Size: 471 B After Width: | Height: | Size: 471 B |
0
images/icons/10/notify_off.png
Executable file → Normal file
Before Width: | Height: | Size: 478 B After Width: | Height: | Size: 478 B |
0
images/icons/10/notify_on.png
Executable file → Normal file
Before Width: | Height: | Size: 369 B After Width: | Height: | Size: 369 B |
0
images/icons/10/play.png
Executable file → Normal file
Before Width: | Height: | Size: 420 B After Width: | Height: | Size: 420 B |
0
images/icons/10/plugin.png
Executable file → Normal file
Before Width: | Height: | Size: 471 B After Width: | Height: | Size: 471 B |
0
images/icons/10/star.png
Executable file → Normal file
Before Width: | Height: | Size: 3.2 KiB After Width: | Height: | Size: 3.2 KiB |
0
images/icons/10/unlock.png
Executable file → Normal file
Before Width: | Height: | Size: 398 B After Width: | Height: | Size: 398 B |
0
images/icons/10/user.png
Executable file → Normal file
Before Width: | Height: | Size: 534 B After Width: | Height: | Size: 534 B |
0
images/icons/16/add.png
Executable file → Normal file
Before Width: | Height: | Size: 3 KiB After Width: | Height: | Size: 3 KiB |
0
images/icons/16/delete.png
Executable file → Normal file
Before Width: | Height: | Size: 3.1 KiB After Width: | Height: | Size: 3.1 KiB |