clones/friendica
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Commit Graph

  • 9c2e7a0c5c renamed general dev documentation to github documentation Silke Meyer 2014-12-28 16:39:19 +01:00
  • aa309ef063 updated help's table of content Silke Meyer 2014-12-28 16:38:19 +01:00
  • a72d60f481 Added h-card and functionality for IndieAuth/Web-sign-in hauke 2014-12-28 15:48:24 +01:00
  • 0b0c574385 Fixed a small typo Silke Meyer 2014-12-28 14:50:43 +01:00
  • 395be3dcde Merge branch 'develop' of https://github.com/friendica/friendica into develop hauke 2014-12-27 12:50:24 +01:00
  • ce12ec3054 Merge pull request #1259 from rabuzarus/issue_1258 fabrixxm 2014-12-26 19:52:57 +01:00
  • 3908b9172d Merge remote-tracking branch 'upstream/master' Michael Vogel 2014-12-26 18:08:08 +01:00
  • a357ebd101 Merge remote-tracking branch 'upstream/develop' into 1409-shadow-items Michael Vogel 2014-12-26 18:07:37 +01:00
  • 5939a8cea5 revert last commit f59e574, remove some html code Rabuzarus 2014-12-26 14:44:48 +01:00
  • f59e574068 removed Pagination Rabuzarus 2014-12-26 12:54:23 +01:00
  • d87323c2bb Merge branch 'master' into develop Fabio Comuni 2014-12-26 11:00:01 +01:00
  • d10c8ddf57 Update version in boot.php Fabio Comuni 2014-12-26 10:46:10 +01:00
  • fdf3163d29 merge changelist.txt into CHANGELOG Fabio Comuni 2014-12-26 10:44:23 +01:00
  • cb47fdfcb9 minor change: rel should not be part of the PHP Rabuzarus 2014-12-26 03:32:21 +01:00
  • 432cf6f2ce insert new line at the end Rabuzarus 2014-12-25 16:31:52 +01:00
  • 73f9d06e3e move some html code from photos.php to photo_album.tpl Rabuzarus 2014-12-25 16:20:55 +01:00
  • 0cafc59f1b Merge remote-tracking branch 'upstream/master' Michael Vogel 2014-12-25 01:56:40 +01:00
  • 709022ddee Merge branch 'release-3.3.2' Fabio Comuni 2014-12-24 10:17:50 +01:00
  • c15b7d8d04 Merge remote-tracking branch 'upstream/develop' into 1409-shadow-items Michael Vogel 2014-12-23 07:41:47 +01:00
  • c14fcf09d4 Merge pull request #1256 from annando/issue-1234 tobiasd 2014-12-23 06:56:36 +01:00
  • dc47ef65f9 Issue 1234: Add the account name to the notification mails. Michael Vogel 2014-12-23 00:55:36 +01:00
  • 41014735f1 Feeds are never public so the posts can never be duplicated. Michael Vogel 2014-12-22 07:32:04 +01:00
  • 2ab38de59c Additional check if the duplicated entry isn't from a hidden or blocked contact. Michael Vogel 2014-12-21 23:47:19 +01:00
  • 043c406091 Update function for creating the shadow entries. Michael Vogel 2014-12-21 21:19:37 +01:00
  • d054ac8d9c redone the changes I accidentally overwrote ... Me and GIT will never be in love ... Michael Vogel 2014-12-21 11:02:31 +01:00
  • 32926bc803 Merge remote-tracking branch 'upstream/develop' into 1409-shadow-items Michael Vogel 2014-12-21 10:59:56 +01:00
  • 57c3060855 Merge remote-tracking branch 'upstream/master' Michael Vogel 2014-12-21 10:58:43 +01:00
  • 4757bf5331 Applied a change to the community query that was already done in another branch. Michael Vogel 2014-12-21 10:55:15 +01:00
  • 546e2809e9 Merge pull request #1253 from annando/1412-performance-improvement tobiasd 2014-12-21 10:19:55 +01:00
  • 2c5281cbf1 reverted a change that wasn't intended to be published yet/Delete thread was missing at Diaspora items. Michael Vogel 2014-12-21 02:10:49 +01:00
  • 4fb059095f Performance stuff: Caching for getsiteinfo function, check before running onepoll.php Michael Vogel 2014-12-21 02:03:06 +01:00
  • 2ac42036fb Fix for error in delete function, improved query for community. Michael Vogel 2014-12-21 01:59:38 +01:00
  • 1a0a80c310 Merge remote-tracking branch 'upstream/develop' into 1409-shadow-items Michael Vogel 2014-12-20 09:37:33 +01:00
  • c86edd696f Merge pull request #1250 from annando/1412-preview-picture-from-feed-enclosure tobiasd 2014-12-17 22:21:14 +01:00
  • 15f43d8ca3 Generate preview pictures from enclosed data from feeds. Michael Vogel 2014-12-17 21:57:38 +01:00
  • 6109c666ab Merge pull request #1248 from kououken/patch-1 fabrixxm 2014-12-16 12:25:10 +01:00
  • 45f593070a Changed typo(?) in install.md Daniel Dupriest 2014-12-16 20:23:48 +09:00
  • 7fc501d6dc Merge pull request #1247 from annando/issue-1191-youtube tobiasd 2014-12-14 13:15:13 +01:00
  • bc5c470cac Fix for issue 1191 - Embedded Youtube video isn't playing when SSL is active Michael Vogel 2014-12-14 12:47:16 +01:00
  • dcd78603d3 Merge pull request #1243 from tobiasd/20141212 tobiasd 2014-12-14 07:56:18 +01:00
  • e730b6f261 Merge pull request #1246 from annando/1412-vier-new-style tobiasd 2014-12-14 07:55:50 +01:00
  • fb11e047ba Merge pull request #1245 from annando/1412-horizontal-ruler-libertree tobiasd 2014-12-14 07:55:26 +01:00
  • 8b433c2d11 Vier: New style "dark" Michael Vogel 2014-12-13 23:13:34 +01:00
  • 3d26e1d233 When converting bbcode for Libertree then an empty line has to be before a honrizontal ruler. Michael Vogel 2014-12-13 23:07:15 +01:00
  • cce534d25b Merge pull request #1244 from annando/1412-hidewall-clarification tobiasd 2014-12-13 08:06:42 +01:00
  • 086b3e30c6 Clarification for the hidewall property. Michael Vogel 2014-12-12 23:03:23 +01:00
  • f02435408c RO and FR: update to the core strings Tobias Diekershoff 2014-12-12 19:01:08 +01:00
  • 039e09dd5e Update CHANGELOG fabrixxm 2014-12-10 13:41:36 +01:00
  • 999ea5a79f Merge branch 'develop' into release-3.3.2 fabrixxm 2014-12-10 13:33:44 +01:00
  • 15d5e6cd45 Merge pull request #1242 from annando/1412-stale-gprobe tobiasd 2014-12-10 06:16:35 +01:00
  • 04106ff6f5 Moving the clean up code to a central place. Michael Vogel 2014-12-08 22:37:49 +01:00
  • 620ee6be0b Cleanup the HTML before parsing it. Michael Vogel 2014-12-08 14:26:44 +01:00
  • c398974918 Logging to analyse the stale gprobe processes Michael Vogel 2014-12-08 11:02:03 +01:00
  • f2d0baae84 Merge pull request #1236 from annando/1412-make-preview-picture-smaller tobiasd 2014-12-07 10:43:32 +01:00
  • e218c2470a Merge pull request #1235 from annando/1412-some-more-tracker-removed tobiasd 2014-12-07 10:42:42 +01:00
  • d0ddf00efe Merge pull request #1237 from annando/1412-added-hashtags-for-diaspora tobiasd 2014-12-07 10:42:00 +01:00
  • 3bf7c9c7a1 Merge pull request #1238 from annando/1412-prevent-span-problem tobiasd 2014-12-07 10:41:14 +01:00
  • c29ff719ec Merge pull request #1239 from annando/1412-prevent-parsing-problems tobiasd 2014-12-07 10:39:28 +01:00
  • a321da8511 Merge pull request #1240 from silke/breathe Michael Vogel 2014-12-06 20:22:45 +01:00
  • f493252ac8 Use a sans-serif font-family in breathe Silke Meyer 2014-12-06 20:05:30 +01:00
  • 0bfe57bb48 Merge remote-tracking branch 'upstream/develop' into 1409-shadow-items Michael Vogel 2014-12-01 23:32:23 +01:00
  • 8b5412068e When selecting forums there was an added "span" html element. Michael Vogel 2014-12-01 22:56:41 +01:00
  • 9124d922e9 In "parse_url" now links with [ or ] are replaced with shortened versions to avoid parsing problems. Michael Vogel 2014-12-01 22:54:01 +01:00
  • 0c60eb18f7 Some more typical tracking parameter is removed Michael Vogel 2014-12-01 22:52:51 +01:00
  • d2d3804e09 If a link contains BBCode stuff, make a short link out of this to avoid parsing problems Michael Vogel 2014-12-01 22:51:41 +01:00
  • e475cf131d When a post contains a picture then a picture in the added information is displayed only as a small preview picture. Michael Vogel 2014-12-01 22:49:35 +01:00
  • 7b26aa2b84 When exporting shared posts to diaspora now removed hashtags will be added again. Michael Vogel 2014-12-01 22:45:13 +01:00
  • 766915061c Merge pull request #1227 from annando/1411-api-throttling tobiasd 2014-11-22 07:38:06 +01:00
  • a3f7578085 Merge branch 'develop' of github.com:annando/friendica into 1409-shadow-items Michael Vogel 2014-11-19 00:19:30 +01:00
  • f8f7cc9292 API: Possibilty of throttling when posting limit is reached Michael Vogel 2014-11-18 23:55:45 +01:00
  • 2b65d77685 Updage CHANGELOG fabrixxm 2014-11-16 13:47:35 +01:00
  • 774ee9c8c7 Merge pull request #1226 from annando/1411-bugfix-dfrn-notify fabrixxm 2014-11-16 13:14:45 +01:00
  • 9a414cc4a0 Bugfix: There was a SQL error when trying to deliver friendica posts because of a parameter mismatch Michael Vogel 2014-11-15 19:21:54 +01:00
  • d24fd35473 Merge pull request #1225 from tobiasd/20141113a fabrixxm 2014-11-13 08:41:07 +01:00
  • efab6031d5 applying the removal of that host from the German /help as well Tobias Diekershoff 2014-11-13 08:28:49 +01:00
  • a3ae3c9156 Merge pull request #1224 from beardy-unixer/development tobiasd 2014-11-11 08:30:55 +01:00
  • ba2567fdf3 Move a hub that's no longer a Friendica hub from the doco. This is also listed in the German entries. I left it there for somebody German to fix because it can't be easily removed. Thomas Willingham 2014-11-11 00:43:04 +00:00
  • 1d512f3ba2 Merge pull request #1223 from fabrixxm/issue/1222 Michael Vogel 2014-11-10 16:01:13 +01:00
  • 2fee5966f1 fix #1222 Fabrixxm 2014-11-10 15:37:52 +01:00
  • 84e93602de small indentation fix Fabrixxm 2014-11-10 15:07:35 +01:00
  • fd61391e3e Merge pull request #1221 from annando/1411-default-value-type fabrixxm 2014-11-10 09:57:42 +01:00
  • 5379e07c4e Setting default values for all database fields. Michael Vogel 2014-11-09 13:29:27 +01:00
  • 3069e5eb1a Merge pull request #1219 from annando/1411-hostname tobiasd 2014-11-09 09:18:17 +01:00
  • 9172ea2246 Some more values that need to be set to avoid SQL warnings. Michael Vogel 2014-11-09 01:13:07 +01:00
  • 030784ad35 Fix for issue "Field 'type' doesn't have a default value" in the challenge table. Michael Vogel 2014-11-08 20:52:15 +01:00
  • 70ba1667e1 It is now possible to define the hostname from the admin page. This should definetely end the problem that the hostname couldn't be detected unter certain conditions. Michael Vogel 2014-11-08 00:07:21 +01:00
  • d81289c58b Merge branch 'master' into develop fabrixxm 2014-11-06 20:53:49 +01:00
  • ac29e831b2 Merge branch 'release-3.3.1' fabrixxm 2014-11-06 20:43:38 +01:00
  • 86c8362bb8 Bump version to 3.3.1. Add CHANGELOG file fabrixxm 2014-11-06 20:31:27 +01:00
  • 3c6bfe6033 Merge pull request #1217 from annando/1411-newlines-beyand-attachments fabrixxm 2014-11-03 14:18:25 +01:00
  • cd0bdd7dd2 Merge pull request #1216 from cpfeiffer/TinyMCE-resizable Michael Vogel 2014-11-03 01:00:05 +01:00
  • 3eed5bbd3e Further improvement for newlines after attachments Michael Vogel 2014-11-02 18:39:23 +01:00
  • 14ea4b972e BBCode: Newlines under attachments are now removed Michael Vogel 2014-11-02 17:35:49 +01:00
  • 00c16b387a Make TinyMCE editors resizable Carsten Pfeiffer 2014-11-01 22:18:42 +01:00
  • a32682d78c Merge branch 'develop' into release-3.3.1 Fabrixxm 2014-10-31 14:50:46 +01:00
  • a818ed2d49 Merge pull request #1213 from annando/1410-keyword-blacklist fabrixxm 2014-10-31 14:40:27 +01:00
  • 5e303f9905 Removed some more special characters from hashtags Michael Vogel 2014-10-30 11:33:33 +01:00
  • 691aa17025 fetch further information: it is now possible to define a blacklist for keywords for "fetch further information" Michael Vogel 2014-10-30 00:24:23 +01:00
  • ec4e3d76bc Merge pull request #1212 from annando/1410-remote-self tobiasd 2014-10-29 15:06:21 +01:00
  • 17f87ef9b2 Remote-self: It does only make sense to check for duplicates from friendica Michael Vogel 2014-10-29 08:24:05 +01:00