Browse Source

Merge branch 'pull'

pull/209/head
friendica 10 years ago
parent
commit
4bee1859be
  1. 0
      .gitignore
  2. 0
      .htaccess
  3. 0
      INSTALL.txt
  4. 0
      LICENSE
  5. 2
      boot.php
  6. 14
      database.sql
  7. 0
      doc/Account-Basics.md
  8. 0
      doc/Bugs-and-Issues.md
  9. 0
      doc/Connectors.md
  10. 0
      doc/Developers.md
  11. 0
      doc/Home.md
  12. 0
      doc/Install.md
  13. 0
      doc/Installing-Connectors.md
  14. 0
      doc/Making-Friends.md
  15. 0
      doc/Message-Flow.md
  16. 0
      doc/Pages.md
  17. 0
      doc/Plugins.md
  18. 0
      doc/Profiles.md
  19. 0
      doc/Remove-Account.md
  20. 0
      doc/Settings.md
  21. 0
      doc/Tags-and-Mentions.md
  22. 0
      htconfig.php
  23. 0
      images/article.gif
  24. 0
      images/audio.gif
  25. 0
      images/b_block.gif
  26. 0
      images/b_drop.gif
  27. 0
      images/b_drop.png
  28. 0
      images/b_drophide.gif
  29. 0
      images/b_dropshow.gif
  30. 0
      images/b_edit.gif
  31. 0
      images/b_edit.png
  32. 0
      images/calendar.png
  33. 0
      images/camera-icon.gif
  34. 0
      images/connect-bg.png
  35. 0
      images/content-types.png
  36. 0
      images/default-group-mm.png
  37. 0
      images/default-profile-mm.jpg
  38. 0
      images/default-profile-sm.jpg
  39. 0
      images/default-profile.jpg
  40. 0
      images/diaspora.png
  41. 0
      images/dislike.gif
  42. 0
      images/document.gif
  43. 0
      images/ff-128.jpg
  44. 0
      images/ff-16.jpg
  45. 0
      images/ff-256.jpg
  46. 0
      images/ff-32.jpg
  47. 0
      images/ff-64.jpg
  48. 0
      images/ff.xcf
  49. 0
      images/friendica-128.jpg
  50. 0
      images/friendica-128.png
  51. 0
      images/friendica-16.jpg
  52. 0
      images/friendica-16.png
  53. 0
      images/friendica-1600.png
  54. 0
      images/friendica-256.jpg
  55. 0
      images/friendica-256.png
  56. 0
      images/friendica-32.jpg
  57. 0
      images/friendica-32.png
  58. 0
      images/friendica-48.png
  59. 0
      images/friendica-64.jpg
  60. 0
      images/friendica-64.png
  61. 0
      images/friendica-96.png
  62. 0
      images/friendica.svg
  63. 0
      images/friendika-128.jpg
  64. 0
      images/friendika-128.png
  65. 0
      images/friendika-16.jpg
  66. 0
      images/friendika-16.png
  67. 0
      images/friendika-1600.png
  68. 0
      images/friendika-256.jpg
  69. 0
      images/friendika-256.png
  70. 0
      images/friendika-32.jpg
  71. 0
      images/friendika-32.png
  72. 0
      images/friendika-48.png
  73. 0
      images/friendika-64.jpg
  74. 0
      images/friendika-64.png
  75. 0
      images/friendika-96.png
  76. 0
      images/friendika.svg
  77. 0
      images/globe.gif
  78. 0
      images/hide_off.png
  79. 0
      images/hide_on.png
  80. 0
      images/icons.png
  81. 0
      images/icons/10/add.png
  82. 0
      images/icons/10/delete.png
  83. 0
      images/icons/10/edit.png
  84. 0
      images/icons/10/feed.png
  85. 0
      images/icons/10/gear.png
  86. 0
      images/icons/10/group.png
  87. 0
      images/icons/10/info.png
  88. 0
      images/icons/10/link.png
  89. 0
      images/icons/10/lock.png
  90. 0
      images/icons/10/menu.png
  91. 0
      images/icons/10/notice.png
  92. 0
      images/icons/10/notify_off.png
  93. 0
      images/icons/10/notify_on.png
  94. 0
      images/icons/10/play.png
  95. 0
      images/icons/10/plugin.png
  96. 0
      images/icons/10/star.png
  97. 0
      images/icons/10/unlock.png
  98. 0
      images/icons/10/user.png
  99. 0
      images/icons/16/add.png
  100. 0
      images/icons/16/delete.png
  101. Some files were not shown because too many files have changed in this diff Show More

0
.gitignore vendored

0
INSTALL.txt

2
boot.php

@ -11,7 +11,7 @@ require_once('include/cache.php');
define ( 'FRIENDICA_PLATFORM', 'Friendica');
define ( 'FRIENDICA_VERSION', '2.3.1303' );
define ( 'DFRN_PROTOCOL_VERSION', '2.23' );
define ( 'DB_UPDATE_VERSION', 1134 );
define ( 'DB_UPDATE_VERSION', 1135 );
define ( 'EOL', "<br />\r\n" );
define ( 'ATOM_TIME', 'Y-m-d\TH:i:s\Z' );

14
database.sql

@ -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

0
doc/Bugs-and-Issues.md

0
doc/Connectors.md

0
doc/Developers.md

0
doc/Home.md

0
doc/Install.md

0
doc/Installing-Connectors.md

0
doc/Making-Friends.md

0
doc/Message-Flow.md

0
doc/Pages.md

0
doc/Plugins.md

0
doc/Profiles.md

0
doc/Remove-Account.md

0
doc/Settings.md

0
doc/Tags-and-Mentions.md

0
htconfig.php

0
images/article.gif

Before

Width:  |  Height:  |  Size: 1.0 KiB

After

Width:  |  Height:  |  Size: 1.0 KiB

0
images/audio.gif

Before

Width:  |  Height:  |  Size: 559 B

After

Width:  |  Height:  |  Size: 559 B

0
images/b_block.gif

Before

Width:  |  Height:  |  Size: 83 B

After

Width:  |  Height:  |  Size: 83 B

0
images/b_drop.gif

Before

Width:  |  Height:  |  Size: 138 B

After

Width:  |  Height:  |  Size: 138 B

0
images/b_drop.png

Before

Width:  |  Height:  |  Size: 311 B

After

Width:  |  Height:  |  Size: 311 B

0
images/b_drophide.gif

Before

Width:  |  Height:  |  Size: 111 B

After

Width:  |  Height:  |  Size: 111 B

0
images/b_dropshow.gif

Before

Width:  |  Height:  |  Size: 138 B

After

Width:  |  Height:  |  Size: 138 B

0
images/b_edit.gif

Before

Width:  |  Height:  |  Size: 311 B

After

Width:  |  Height:  |  Size: 311 B

0
images/b_edit.png

Before

Width:  |  Height:  |  Size: 451 B

After

Width:  |  Height:  |  Size: 451 B

0
images/calendar.png

Before

Width:  |  Height:  |  Size: 853 B

After

Width:  |  Height:  |  Size: 853 B

0
images/camera-icon.gif

Before

Width:  |  Height:  |  Size: 1015 B

After

Width:  |  Height:  |  Size: 1015 B

0
images/connect-bg.png

Before

Width:  |  Height:  |  Size: 689 B

After

Width:  |  Height:  |  Size: 689 B

0
images/content-types.png

Before

Width:  |  Height:  |  Size: 3.8 KiB

After

Width:  |  Height:  |  Size: 3.8 KiB

0
images/default-group-mm.png

Before

Width:  |  Height:  |  Size: 598 B

After

Width:  |  Height:  |  Size: 598 B

0
images/default-profile-mm.jpg

Before

Width:  |  Height:  |  Size: 322 B

After

Width:  |  Height:  |  Size: 322 B

0
images/default-profile-sm.jpg

Before

Width:  |  Height:  |  Size: 346 B

After

Width:  |  Height:  |  Size: 346 B

0
images/default-profile.jpg

Before

Width:  |  Height:  |  Size: 490 B

After

Width:  |  Height:  |  Size: 490 B

0
images/diaspora.png

Before

Width:  |  Height:  |  Size: 461 B

After

Width:  |  Height:  |  Size: 461 B

0
images/dislike.gif

Before

Width:  |  Height:  |  Size: 119 B

After

Width:  |  Height:  |  Size: 119 B

0
images/document.gif

Before

Width:  |  Height:  |  Size: 1.3 KiB

After

Width:  |  Height:  |  Size: 1.3 KiB

0
images/ff-128.jpg

Before

Width:  |  Height:  |  Size: 4.4 KiB

After

Width:  |  Height:  |  Size: 4.4 KiB

0
images/ff-16.jpg

Before

Width:  |  Height:  |  Size: 644 B

After

Width:  |  Height:  |  Size: 644 B

0
images/ff-256.jpg

Before

Width:  |  Height:  |  Size: 2.7 KiB

After

Width:  |  Height:  |  Size: 2.7 KiB

0
images/ff-32.jpg

Before

Width:  |  Height:  |  Size: 1.6 KiB

After

Width:  |  Height:  |  Size: 1.6 KiB

0
images/ff-64.jpg

Before

Width:  |  Height:  |  Size: 2.8 KiB

After

Width:  |  Height:  |  Size: 2.8 KiB

0
images/ff.xcf

0
images/friendica-128.jpg

Before

Width:  |  Height:  |  Size: 8.2 KiB

After

Width:  |  Height:  |  Size: 8.2 KiB

0
images/friendica-128.png

Before

Width:  |  Height:  |  Size: 6.3 KiB

After

Width:  |  Height:  |  Size: 6.3 KiB

0
images/friendica-16.jpg

Before

Width:  |  Height:  |  Size: 659 B

After

Width:  |  Height:  |  Size: 659 B

0
images/friendica-16.png

Before

Width:  |  Height:  |  Size: 756 B

After

Width:  |  Height:  |  Size: 756 B

0
images/friendica-1600.png

Before

Width:  |  Height:  |  Size: 280 KiB

After

Width:  |  Height:  |  Size: 280 KiB

0
images/friendica-256.jpg

Before

Width:  |  Height:  |  Size: 17 KiB

After

Width:  |  Height:  |  Size: 17 KiB

0
images/friendica-256.png

Before

Width:  |  Height:  |  Size: 10 KiB

After

Width:  |  Height:  |  Size: 10 KiB

0
images/friendica-32.jpg

Before

Width:  |  Height:  |  Size: 1.5 KiB

After

Width:  |  Height:  |  Size: 1.5 KiB

0
images/friendica-32.png

Before

Width:  |  Height:  |  Size: 1.6 KiB

After

Width:  |  Height:  |  Size: 1.6 KiB

0
images/friendica-48.png

Before

Width:  |  Height:  |  Size: 2.3 KiB

After

Width:  |  Height:  |  Size: 2.3 KiB

0
images/friendica-64.jpg

Before

Width:  |  Height:  |  Size: 3.4 KiB

After

Width:  |  Height:  |  Size: 3.4 KiB

0
images/friendica-64.png

Before

Width:  |  Height:  |  Size: 3.2 KiB

After

Width:  |  Height:  |  Size: 3.2 KiB

0
images/friendica-96.png

Before

Width:  |  Height:  |  Size: 5.4 KiB

After

Width:  |  Height:  |  Size: 5.4 KiB

0
images/friendica.svg

Before

Width:  |  Height:  |  Size: 7.2 KiB

After

Width:  |  Height:  |  Size: 7.2 KiB

0
images/friendika-128.jpg

Before

Width:  |  Height:  |  Size: 8.2 KiB

After

Width:  |  Height:  |  Size: 8.2 KiB

0
images/friendika-128.png

Before

Width:  |  Height:  |  Size: 6.3 KiB

After

Width:  |  Height:  |  Size: 6.3 KiB

0
images/friendika-16.jpg

Before

Width:  |  Height:  |  Size: 659 B

After

Width:  |  Height:  |  Size: 659 B

0
images/friendika-16.png

Before

Width:  |  Height:  |  Size: 756 B

After

Width:  |  Height:  |  Size: 756 B

0
images/friendika-1600.png

Before

Width:  |  Height:  |  Size: 280 KiB

After

Width:  |  Height:  |  Size: 280 KiB

0
images/friendika-256.jpg

Before

Width:  |  Height:  |  Size: 17 KiB

After

Width:  |  Height:  |  Size: 17 KiB

0
images/friendika-256.png

Before

Width:  |  Height:  |  Size: 10 KiB

After

Width:  |  Height:  |  Size: 10 KiB

0
images/friendika-32.jpg

Before

Width:  |  Height:  |  Size: 1.5 KiB

After

Width:  |  Height:  |  Size: 1.5 KiB

0
images/friendika-32.png

Before

Width:  |  Height:  |  Size: 1.6 KiB

After

Width:  |  Height:  |  Size: 1.6 KiB

0
images/friendika-48.png

Before

Width:  |  Height:  |  Size: 2.3 KiB

After

Width:  |  Height:  |  Size: 2.3 KiB

0
images/friendika-64.jpg

Before

Width:  |  Height:  |  Size: 3.4 KiB

After

Width:  |  Height:  |  Size: 3.4 KiB

0
images/friendika-64.png

Before

Width:  |  Height:  |  Size: 3.2 KiB

After

Width:  |  Height:  |  Size: 3.2 KiB

0
images/friendika-96.png

Before

Width:  |  Height:  |  Size: 5.4 KiB

After

Width:  |  Height:  |  Size: 5.4 KiB

0
images/friendika.svg

Before

Width:  |  Height:  |  Size: 7.2 KiB

After

Width:  |  Height:  |  Size: 7.2 KiB

0
images/globe.gif

Before

Width:  |  Height:  |  Size: 1.0 KiB

After

Width:  |  Height:  |  Size: 1.0 KiB

0
images/hide_off.png

Before

Width:  |  Height:  |  Size: 281 B

After

Width:  |  Height:  |  Size: 281 B

0
images/hide_on.png

Before

Width:  |  Height:  |  Size: 277 B

After

Width:  |  Height:  |  Size: 277 B

0
images/icons.png

Before

Width:  |  Height:  |  Size: 12 KiB

After

Width:  |  Height:  |  Size: 12 KiB

0
images/icons/10/add.png

Before

Width:  |  Height:  |  Size: 2.9 KiB

After

Width:  |  Height:  |  Size: 2.9 KiB

0
images/icons/10/delete.png

Before

Width:  |  Height:  |  Size: 2.9 KiB

After

Width:  |  Height:  |  Size: 2.9 KiB

0
images/icons/10/edit.png

Before

Width:  |  Height:  |  Size: 2.9 KiB

After

Width:  |  Height:  |  Size: 2.9 KiB

0
images/icons/10/feed.png

Before

Width:  |  Height:  |  Size: 535 B

After

Width:  |  Height:  |  Size: 535 B

0
images/icons/10/gear.png

Before

Width:  |  Height:  |  Size: 3.0 KiB

After

Width:  |  Height:  |  Size: 3.0 KiB

0
images/icons/10/group.png

Before

Width:  |  Height:  |  Size: 543 B

After

Width:  |  Height:  |  Size: 543 B

0
images/icons/10/info.png

Before

Width:  |  Height:  |  Size: 488 B

After

Width:  |  Height:  |  Size: 488 B

0
images/icons/10/link.png

Before

Width:  |  Height:  |  Size: 410 B

After

Width:  |  Height:  |  Size: 410 B

0
images/icons/10/lock.png

Before

Width:  |  Height:  |  Size: 463 B

After

Width:  |  Height:  |  Size: 463 B

0
images/icons/10/menu.png

Before

Width:  |  Height:  |  Size: 2.9 KiB

After

Width:  |  Height:  |  Size: 2.9 KiB

0
images/icons/10/notice.png

Before

Width:  |  Height:  |  Size: 471 B

After

Width:  |  Height:  |  Size: 471 B

0
images/icons/10/notify_off.png

Before

Width:  |  Height:  |  Size: 478 B

After

Width:  |  Height:  |  Size: 478 B

0
images/icons/10/notify_on.png

Before

Width:  |  Height:  |  Size: 369 B

After

Width:  |  Height:  |  Size: 369 B

0
images/icons/10/play.png

Before

Width:  |  Height:  |  Size: 420 B

After

Width:  |  Height:  |  Size: 420 B

0
images/icons/10/plugin.png

Before

Width:  |  Height:  |  Size: 471 B

After

Width:  |  Height:  |  Size: 471 B

0
images/icons/10/star.png

Before

Width:  |  Height:  |  Size: 3.2 KiB

After

Width:  |  Height:  |  Size: 3.2 KiB

0
images/icons/10/unlock.png

Before

Width:  |  Height:  |  Size: 398 B

After

Width:  |  Height:  |  Size: 398 B

0
images/icons/10/user.png

Before

Width:  |  Height:  |  Size: 534 B

After

Width:  |  Height:  |  Size: 534 B

0
images/icons/16/add.png

Before

Width:  |  Height:  |  Size: 3.0 KiB

After

Width:  |  Height:  |  Size: 3.0 KiB

0
images/icons/16/delete.png

Before

Width:  |  Height:  |  Size: 3.1 KiB

After

Width:  |  Height:  |  Size: 3.1 KiB

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

Loading…
Cancel
Save